maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
808 commits 10 branches 35 tags 1.1 GiB
Commit graph

808 commits

This branch
This branch
All branches
Author SHA1 Message Date
Juan Linietsky 11c1756257 Visual Shader Editing for 2D 
Editing 2D shaders with visual editor seems to work now.
 2015-01-20 20:36:25 -03:00
Juan Linietsky 79af805710 Merge pull request #1280 from sanikoyes/Pr-InputEvent-Fix 
Pr-InputEvent-Fix
 2015-01-20 09:44:09 -03:00
sanikoyes 317c496f5c Add InputEvent::ACTION get/set support for variant 
Add action_press/action_release method bind
 2015-01-20 20:01:02 +08:00
Juan Linietsky a0511ed59a Color Ramp and Curve Map added to visual shader editing. 
Added Color Ramp and Curve Map to shader nodes.
Fixed an issue that crashed Godot Editor right when opened.
 2015-01-19 02:39:58 -03:00
Juan Linietsky e0c0aef615 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-18 09:52:10 -03:00
Juan Linietsky 6f3c09047e -intentional breakage of shader graph to fix issues, existing graphs will be broken, sorry :( 2015-01-18 09:51:11 -03:00
Juan Linietsky 2b22aba39e Merge pull request #1250 from marynate/PR-fix-mingw-win-build 
Fix mingw windows build error
 2015-01-17 15:41:25 -03:00
marynate 9f61a4881e Fix mingw windows build error 2015-01-18 02:08:26 +08:00
Juan Linietsky 91faf8e218 Merge pull request #1138 from sanikoyes/Pr-tween-call-deferred 
Pr-tween-call-deferred
 2015-01-17 09:58:57 -03:00
Juan Linietsky 7a1307f96a Merge pull request #1172 from UsernameIsAReservedWord/fix_environment_ressource_interface_to_handle_cubemap_ressource 
fix_environment_ressource_cubemap_support, complete PR #1170
 2015-01-17 09:56:20 -03:00
Juan Linietsky cdf3c5b0eb Merge pull request #1181 from adolson/duplicate-node-naming-prefs 
fix naming of duplicated nodes, closes #1161
 2015-01-17 09:48:11 -03:00
Juan Linietsky 7ac7956baf Merge pull request #1188 from hurikhan/scons_colored 
Scons colored
 2015-01-17 09:47:02 -03:00
Juan Linietsky 938c6d0df3 Merge pull request #1204 from marynate/PR-new-default-theme 
new default theme
 2015-01-17 09:45:19 -03:00
Juan Linietsky 8075512bc5 Merge pull request #1206 from ScyDev/feature/polygonpathfinder_demo 
- how to use PolygonPathFinder from GD Script
 2015-01-17 09:44:49 -03:00
Juan Linietsky cce0d50516 Merge pull request #1217 from sanikoyes/Pr-canvas-shader-disable-3d 
Pr-canvas-shader-disable-3d
 2015-01-17 09:44:22 -03:00
Juan Linietsky 8df47f59d5 Merge pull request #1221 from wvdschel/patch-1 
Cleaned up formatting in gd_compiler.h
 2015-01-17 09:43:34 -03:00
Juan Linietsky 07e63c3dc1 Merge pull request #1223 from NateWardawg/master 
1: File path in save dialog automatically appended with correct extension if not manually added by the user.  2: Removed .bin as default extension for Linux exports as it causes problems for common file managers.
 2015-01-17 09:43:00 -03:00
Juan Linietsky be7d8a182c Merge pull request #1225 from marynate/PR-script-editor-close-tab 
Only show Close Tab confirmation when script has unsaved change
 2015-01-17 09:42:06 -03:00
Juan Linietsky 9ce885ccd8 Merge pull request #1227 from marynate/PR-editor-line-color 
Add current_line_color editor setting for script and shader editor
 2015-01-17 09:41:47 -03:00
Juan Linietsky bf4f439ae1 Merge pull request #1230 from ndee85/export_manager_additions 
Export Manager Fixes
 2015-01-17 09:41:24 -03:00
Juan Linietsky 53b952f351 Merge pull request #1231 from quabug/commit 
Fix bug in curve.cpp
 2015-01-17 09:40:51 -03:00
Juan Linietsky 06738f9286 Merge pull request #1244 from not-surt/master 
Wrapped CellOp generation code in a function and added TileMap tile picking
 2015-01-17 09:32:40 -03:00
Carl Olsson 9bfb08830b Wrapped duplicated CellOp generation code in a function and added TileMap tile picking with Ctrl+LMB. 2015-01-17 16:48:21 +10:00
Juan Linietsky 3e7d475b59 Merge pull request #1241 from the-mech/master 
added nvidia optimus enablement Issue #1120
 2015-01-16 23:02:13 -03:00
the_mech 726d379775 added nvidia optimus enablement 2015-01-17 02:48:35 +01:00
Nathan Warden cac555dc78 When overwriting a file with an auto added extension the file name is now set correctly. 2015-01-16 07:48:28 -05:00
quabug 341ea429db remove useless code 2015-01-16 15:16:58 +08:00
quabug 5823f90c53 fix bug 
running into infinite loop if distance between two adjacent points in curve are too short.
 2015-01-16 15:16:41 +08:00
Andreas Esau 904770fb91 Export Manager Fixes 
- fixed a bug where it could happen that objects did not get exported
- fixed some script errors
- added the feature to export particle dupliobjects. Now you can add objects with the particle system and get them directly exported.
 2015-01-15 22:22:12 +01:00
Nathan Warden c2ffdb05d4 Set the default Linux extension to nothing. 2015-01-15 13:00:33 -05:00
marynate d0055a751b Add current_line_color ediotr setting for script and shader editor 2015-01-15 16:59:07 +08:00
marynate d2a0f86d9f Only show Close Tab confirmation when script has unsaved change;Update Close Tab message to emphasize the fact script will be saved when closing tab;Stop dumping 'applying code' message to console 2015-01-15 15:55:18 +08:00
marynate 7c430d52e9 Restore checkbutton margin to origin value, fixed issue in code search dialog 2015-01-15 13:30:00 +08:00
marynate 2ca8b2683e Minor code formatting 2015-01-15 13:30:00 +08:00
Ralf Hölzemer 7f20b864cd Tweak Button margins & small fix for ToolButton 2015-01-15 13:29:59 +08:00
Ralf Hölzemer e7893b404e fix background alpha in dropdown arrows 2015-01-15 13:29:58 +08:00
Ralf Hölzemer 5fc787abd8 Fixed the progressbar to only require 16px in height 2015-01-15 13:29:58 +08:00
Ralf Hölzemer 6983cb80ea More desaturated icons 2015-01-15 13:29:57 +08:00
Ralf Hölzemer d8f453cb39 Missing files and Tab changes 2015-01-15 13:29:56 +08:00
Ralf Hölzemer df41418677 More Theme fixes 
- some color tweaks
- many margin fixes
- overall nicer look

Conflicts:
	scene/resources/default_theme/default_theme.cpp
 2015-01-15 13:29:56 +08:00
Ralf Hölzemer 4b70bc1f35 Fix visual glitch in Progressbar 2015-01-15 13:29:55 +08:00
Ralf Hölzemer ae70108883 New iteration of the theme 
- try to implement ndee's mockup from the forum
- new color palette
- get rid of most gradients

probably needs some more tweaks
 2015-01-15 13:29:54 +08:00
Ralf Hölzemer 7b9f5e65c9 New neutral default theme 
- desaturated UI elements to grey
- desaturated all near-white icons to grey
- changed some hardcoded colors
 2015-01-15 13:29:53 +08:00
Nathan Warden 7d2f359a0c File path in save dialog automatically appended with correct extension if not manually added by the user. 2015-01-14 18:05:57 -05:00
Wim Vander Schelden 3d3b1937dd Cleaned up formating in gd_compiler.h 2015-01-14 16:37:24 +01:00
Juan Linietsky 04af74596d -fix shader param names broken issue on code completion 
-fix z order issue in new 2D engine
 2015-01-14 09:05:33 -03:00
Juan Linietsky 250188e1aa Merge pull request #1215 from Qwertie-/PR-GUI 
Fixed typo in error message
 2015-01-14 08:25:18 -03:00
sanikoyes b882836184 Fix canvas shader not registered when disabled_3d=yes 2015-01-14 14:49:54 +08:00
Luke Picciau b734c838db Fixed typo in message 2015-01-14 12:02:55 +10:30
Juan Linietsky 9012cd408e -Add support for one-way collision in 2D (only works for kinematic body so far) 
-Solve drawing order bug introduced in previous commit: solves #1214
 2015-01-13 21:19:11 -03:00