godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,164 Commits 15 Branches 59 Tags 2.2 GiB
Commit Graph

191 Commits

Author SHA1 Message Date
Juan Linietsky 3b35bcc955 -fix resolver erase query to avoid running out of slots, fixes #1621 2015-04-07 22:45:33 -03:00
Juan Linietsky 963845eea9 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-07 21:21:06 -03:00
Juan Linietsky 22997294fa -Concatenating arrays keeps the shared property if any of the arrays is shared. Fixes #1646 2015-04-07 21:18:46 -03:00
Juan Linietsky e336306e91 Merge pull request #1554 from NateWardawg/inspectorupdate 
Camel casing being capitalized only happens in the inspector now.
 2015-04-07 20:22:09 -03:00
Juan Linietsky 219fce737c Merge pull request #1564 from Faless/area_combine-1 
Implement combine mode for area
 2015-04-07 20:21:11 -03:00
Juan Linietsky 7b75658bb2 Merge pull request #1585 from UsernameIsAReservedWord/add_is_queued_for_deletion_in_objects 
add : bool Object.is_queued_for_deletion()
 2015-04-07 20:14:51 -03:00
Juan Linietsky 7978245784 Merge pull request #1614 from hurikhan/pr_parameter_names 
wm api -- set screen parameter names for gdscript
 2015-04-07 20:11:53 -03:00
Juan Linietsky b36e41cb71 Added a PVRTC encoder for iOS 2015-04-06 21:48:20 -03:00
hurikhan af368b7e1a set screen parameter names for gdscript 2015-04-03 15:00:55 -04:00
Juan Linietsky 1572238adb merging okam changes 2015-04-02 07:22:17 -03:00
UsernameIsAReservedWord 9cca88eb92 Update object.h 2015-03-28 18:42:01 +01:00
yg2f 3c67e22c3d add : bool Object.is_queued_for_deletion() 
`object.is_queued_for_deletion()` return true if the object was
`object.queue_free()` or `SceneTree.queue_delete(object)`.
 2015-03-28 18:34:28 +01:00
Fabio Alessandrelli 4b3b5eba86 Use Vector for storing areas 2015-03-24 18:46:26 +00:00
Nathan Warden 21eb3b2a83 Camel casing being capitalized only happens in the inspector now. 2015-03-23 00:08:07 -05:00
Juan Linietsky 0dcca688d2 Revert "Camelcased script variables will now capitalize in the inspector." 2015-03-22 19:06:13 -03:00
Juan Linietsky 23e13ce3c2 fixes to new window management API 
-needs testing on Linux
-needs testing on Windows
-NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
 2015-03-22 19:00:50 -03:00
Juan Linietsky 15bee515e6 Merge pull request #1487 from hurikhan/x11-window-management 
X11 window management
 2015-03-22 15:10:50 -03:00
Juan Linietsky f706e3e5d1 Merge pull request #1380 from ElectricSolstice/wparentheses_removal 
Changed code to remove gcc -Wparentheses warnings.
 2015-03-22 15:05:47 -03:00
Juan Linietsky 0302ea5b82 Merge pull request #1396 from Spooner/fix_sprintf_errors 
Fix sprintf errors
 2015-03-22 15:03:32 -03:00
Juan Linietsky 7436f0bb37 Merge pull request #1401 from NateWardawg/inspectorupdate 
Camelcased script variables will now capitalize in the inspector.
 2015-03-22 15:02:42 -03:00
Juan Linietsky 3aed92e5b1 Merge pull request #1450 from theuserbl/master 
Making ToolButton and KEY_MASK_CMD accessable in GDScript and the IDE
 2015-03-22 14:58:42 -03:00
Juan Linietsky 4069dc7891 Merge pull request #1521 from codx/master 
Fix for InputEvent::set_as_action
 2015-03-22 14:48:54 -03:00
rollenrolm db0a71fc58 New option to show/hide hidden files 2015-03-21 18:33:32 +01:00
Alex Bonfim 2d4cad7057 Fix for InputEvent::set_as_action 2015-03-15 23:17:48 -03:00
hurikhan 87be945d49 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-03-08 15:10:48 +08:00
Juan Linietsky 2c2894ceb6 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	modules/gdscript/gd_tokenizer.cpp
	scene/resources/shader_graph.h
 2015-03-03 14:41:36 -03:00
Juan Linietsky 4d2198110b merges from okam repo 2015-03-03 14:39:13 -03:00
Juan Linietsky a1f715a4da support for 2D shadow casters 
Added support for 2D shadow casters.

*DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a
CanvasItem and pull this, you will lose them. Shaders now work through a
2D material system similar to 3D. If you don't want to lose the 2D
shader code, save the shader as a .shd, then create a material in
CanvasItem and re-assign the shader.
 2015-03-02 00:54:43 -03:00
theuserbl e2c0caf41e Update global_constants.cpp 
Making KEY_MASK_CMD usable in GDScript
 2015-02-27 11:19:55 +01:00
Nathan Warden 8f5bf2a2ef Camelcased script variables will now capitalize in the inspector. 2015-02-19 19:35:04 -05:00
Bil Bas (Spooner) db2381de7a Correctly halt on error in sprintf parsing (fixes #1393) 2015-02-19 15:45:49 +00:00
Juan Linietsky 5ef3f7392f support for light and normal mapping in 2D 2015-02-18 19:40:02 -03:00
ElectricSolstice 0e1f34b49d Changed code to remove gcc -Wparentheses warnings. 2015-02-16 18:58:41 -08:00
Felix Laurie von Massenbach 2478935f96 Fix a shadow declaration. 2015-02-15 18:09:11 +00:00
Juan Linietsky 4333aa240c Godot UI is quick and snappy again! 
Changed linked listed sort to use auxiliary memory
this fixes user interface performance issues.
 2015-02-15 12:38:25 -03:00
Juan Linietsky 2d4cec0cb6 fix return value of slide and reflect 
closes #1311
 2015-02-15 11:26:31 -03:00
hurikhan f5d2e1f42c Renamed EXPERIMENTAL_WM_API to NEW_WM_API 2015-02-15 18:26:49 +08:00
hurikhan ee81d4b359 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-15 17:49:34 +08:00
Juan Linietsky 2185c018f6 begin new serialization framework 
also got rid of STL dependency on triangulator
 2015-02-15 01:21:26 -03:00
Juan Linietsky c5f509f238 New Navigation & Pathfinding support for 2D 
-Added Navigation & NavigationPolygon nodes
-Added corresponding visual editor
-New pathfinding algorithm is modern and fast!
-Similar API to 3D Pathfinding (more coherent)
 2015-02-14 12:10:15 -03:00
hurikhan a13e180052 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-12 15:58:29 +01:00
Juan Linietsky 78a268c2eb fixes to HTTPClient 
-small unchunked files should work properly
-blocking mode should work properly
 2015-02-11 07:57:51 -03:00
Juan Linietsky 7f88df73be Merge pull request #1346 from Nulifier/import-plugin 
Added the ability to add and remove editor import plugins.
 2015-02-11 07:07:59 -03:00
Jeffrey Steward 84be16758e Added the default arguments to the binding for ResourceImportMetadata::add_source to match the c++ version 2015-02-10 14:23:49 -07:00
Bil Bas (Spooner) 2c1a3dfed6 Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf 2015-02-01 20:29:11 +00:00
Bil Bas (Spooner) af7c8bdf23 Completed more complex formatting. 2015-02-01 20:18:38 +00:00
Bil Bas (Spooner) 6306254d37 Completed implementing standard formatting. 2015-02-01 18:42:36 +00:00
hurikhan c5080e23b8 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-20 23:39:53 +09: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
hurikhan 716971655e added the following methods: 
* set_minimized(bool)
 * bool is_minimized()
 * set_maximized(bool)
 * bool is_maximized()
 2015-01-17 00:18:45 +09:00