Commit graph

66099 commits

Author SHA1 Message Date
Juan Linietsky
544ce2a1db -Initial working(?) implementation of shaders for 2D. Lighting still not there though.
Check for reference:
https://github.com/okamstudio/godot/wiki/shader
2015-01-12 10:19:09 -03:00
hurikhan
067a0d0e64 osx support for llvm coloring added 2015-01-12 14:04:25 +08:00
hurikhan
f9a4e6890b SCons: colored compilation 2015-01-12 12:54:17 +08:00
hurikhan
6b6c526048 Merge branch 'master' into x11-window-management 2015-01-12 11:30:19 +08:00
reduz
f3dc51fc69 2D shader progress 2015-01-11 20:52:42 -03:00
Juan Linietsky
66afddb3e8 -Initial (untested) implementation of 2D shaders. Probably broken, will be fixed later.
-fixed issue of opacity not working
2015-01-11 11:43:31 -03:00
hurikhan
c464cd4460 Merge branch 'master' into x11-window-management 2015-01-11 22:22:30 +08:00
hurikhan
16cf16da7e Update README.md 2015-01-11 22:02:18 +08:00
hurikhan
107d2a373a Demo misc/window_management added 2015-01-11 20:30:57 +08:00
Juan Linietsky
336d9ce5d7 Merge pull request #1184 from sketchyfun/master
Fixes #1160 - Path2D curve handle drag issue
2015-01-11 09:30:52 -03:00
BenH
fc4d6765f1 Fixes #1160
Fixed curve handles not taking current zoom level into consideration
when being dragged
2015-01-11 12:18:10 +00:00
hurikhan
f9d0de0d2a get_screen_size() added 2015-01-11 19:35:53 +08:00
hurikhan
3c8b047b11 get_screen_count() added 2015-01-11 18:52:42 +08:00
hurikhan
466e251abe get_window_size() + set_window_size() added 2015-01-11 17:36:56 +08:00
hurikhan
ac558c15ea get_window_position() + set_window_position() added 2015-01-11 15:47:27 +08:00
Dana Olson
9bbc3f0c94 fix naming of duplicated nodes, closes #1161, adds separator character preferences 2015-01-11 00:08:32 -05:00
marynate
bb6daaa02e Fix compile compile error on windows platform 2015-01-11 11:05:45 +08:00
hurikhan
291d7992ce Merge branch 'master' into x11-fullscreen 2015-01-11 08:06:31 +08:00
Bil Bas (Spooner)
7a41f8c604 Added basic sprintf functionality (e.g. "fish %d %s" % [12, Vector2(1, 2)]) 2015-01-10 20:44:20 +00:00
Bil Bas (Spooner)
d6d85a23c9 Ignored more generated files. 2015-01-10 20:42:28 +00:00
Juan Linietsky
d30f4e52f6 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-10 17:37:56 -03:00
Juan Linietsky
8997084831 2D Rewrite Step [1]
-=-=-=-=-=-=-=-=-=-

-Moved drawing code to a single function that takes linked list (should make it easier to optimize in the future).
-Implemented Z ordering of 2D nodes. Node2D and those that inherit have a visibility/Z property that affects drawing order (besides the tree order)
-Removed OpenGL ES 1.x support. Good riddance!
2015-01-10 17:35:26 -03:00
Anton Yabchinskiy
b6c5cb1064 Merge branch 'master' of github.com:okamstudio/godot 2015-01-10 22:29:17 +03:00
Dana Olson
6c4e1650fb add option to automatically reload changed scripts 2015-01-10 12:55:12 -05:00
hurikhan
a8e3c5c0b7 First attempt of restoring the window at the old position 2015-01-11 01:07:23 +08:00
yg2f
75c3090e9f fix_environment_ressource_cubemap_support
this fix goes hands in hands with #1170.
Cubemap ressources can be loaded and created into an Environment
ressource.
2015-01-10 15:50:27 +01:00
yg2f
5e3a4c13da fixes cubemap ressource editor bug
this fixes the cubemap ressource editor bug described in issue #908.

some other littles fixes will be required to allow the Environment
ressource to create and load Cubemap Ressources more easily
2015-01-10 15:11:44 +01:00
hurikhan
5d9de48d8d Make fullscreen-switching is working with LXDE/Openbox 2015-01-10 21:50:31 +08:00
Juan Linietsky
f97582b5e9 Merge pull request #1166 from adolson/fix-texture-flag-bug
fix saving texture flags to *.png.flags file, closes #399
2015-01-10 07:47:00 -03:00
hurikhan
0d2ec19082 API change to set_fullscreen(enabled,screen) 2015-01-10 18:38:30 +08:00
hurikhan
cd90215cec Make GDScript-Function ( bool OS.is_fullscreen() ) work 2015-01-10 16:01:01 +08:00
hurikhan
97d290e466 x11-fullscreen support through GDScript( OS.set_fullscreen(bool) ) 2015-01-10 15:47:34 +08:00
Dana Olson
88591af4ac fix saving texture flags to *.png.flags file, closes #399 2015-01-10 02:37:00 -05:00
Juan Linietsky
0a6f409323 Merge pull request #1156 from marynate/PR-fix-compile-tools-no
Fix compile error when tools=no
2015-01-09 08:40:07 -03:00
Juan Linietsky
bfd0d1448e Merge pull request #1159 from adolson/ndee-blender-exporter
Better Collada fixes & ndee's Blender Export Manager
2015-01-09 08:34:44 -03:00
Dana Olson
66a2adbf4b mergable version of ndee's pull request 2015-01-09 01:36:38 -05:00
marynate
e2f5cf3ef0 Fix compile error when tools=no 2015-01-09 11:20:02 +08:00
Juan Linietsky
0c2222188e Merge pull request #945 from adolson/color-contrasted-fix
avoid potential stack overflow by recursive function call
2015-01-08 21:59:39 -03:00
Juan Linietsky
a6c2400b24 Merge pull request #946 from adolson/uint64-fix
wrong typedef - closes #270
2015-01-08 21:59:25 -03:00
Juan Linietsky
fe63e6a0a8 Merge pull request #958 from adolson/bind-set_window_title
added GDScript binding for OS.set_window_title()
2015-01-08 21:58:43 -03:00
Juan Linietsky
3b5fcebeb7 Merge pull request #1114 from rraallvv/vanilla
Fix issue #1113
2015-01-08 21:58:09 -03:00
Juan Linietsky
2e33c4c02b Merge pull request #1129 from xodene/master
Some polishes to editor UI
2015-01-08 21:57:30 -03:00
Juan Linietsky
8131891695 Merge pull request #1151 from rraallvv/master
OS X: Add keyboard layout detection and fix build
2015-01-08 21:56:28 -03:00
Maximillian
5b7b817c9b Merge branch 'fix_debug_process_exited_alert' 2015-01-08 09:33:40 -07:00
Maximillian
41b3a1fea3 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-08 09:30:13 -07:00
Maximillian
f1b9994cbc Fix process being debugged has exited pop up #1128 2015-01-08 09:14:56 -07:00
Rhody Lugo
08cfad00dd Create the test string to detect kb layouts directly from the unicode chars 2015-01-08 10:31:10 -04:30
Rhody Lugo
d046bd88ad OS X: Add keyboard layout detection and fix build 2015-01-08 02:56:27 -04:30
Juan Linietsky
78f4b93703 Fixes to GraphEdit:
-Working area is bigger now, solves #1148
-Using Position now works, fixes #1141
-RGB ops now work, fixes #1139
-Missing bindings to GraphEdit and GraphNode added
-Shader Graph Editor Shows errors on cyclic links and missing connections
2015-01-08 00:41:34 -03:00
Juan Linietsky
3f1dd9c57f -Fixed matrix and vec+scalar multiplication issues, fixes #1143 2015-01-07 20:29:05 -03:00