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

238 commits

Author SHA1 Message Date
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
hurikhan d269344bbd WIP -- set_resizable() + is_resizable added 2015-01-15 22:50:23 +09:00
hurikhan 8a30feebbe Merge remote-tracking branch 'upstream/master' into x11-window-management 
Conflicts:
	platform/x11/detect.py
 2015-01-14 13:31:16 +08:00
hurikhan 790d8ecbb9 get_screen() + set_screen() added 2015-01-14 12:02:59 +08:00
Juan Linietsky 7c7ab30c4e fixes 2015-01-13 11:22:56 -03:00
hurikhan ce7c7a862e get_screen_position() added 2015-01-13 17:25:50 +08:00
hurikhan c0d3632667 introduced the scons experimental_wm_api switch: 
================================================

Usage:
    scons p=x11 experimental_wm_api=yes
 2015-01-13 15:44:39 +08: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
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
hurikhan a8e3c5c0b7 First attempt of restoring the window at the old position 2015-01-11 01:07:23 +08:00
hurikhan 0d2ec19082 API change to set_fullscreen(enabled,screen) 2015-01-10 18:38:30 +08:00
hurikhan 97d290e466 x11-fullscreen support through GDScript( OS.set_fullscreen(bool) ) 2015-01-10 15:47:34 +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 1ff0d5c4e5 -attempt to be friendlier on non english keyboards 2015-01-04 22:39:21 -03:00
Juan Linietsky 8c4dd8de39 -WIP to add proper key swapping according to keyboard layout 
-fix with non working removal of collision exception in 3D physics
 2015-01-04 21:16:40 -03:00
Juan Linietsky a8bcb96ad4 -Fix shortcuts for OSX code completion, fixes #1111 
-Fixed how translation fallbacks works, fixes #1011
 2015-01-04 11:03:31 -03:00
Juan Linietsky ddf7457894 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-03 16:53:39 -03:00
Juan Linietsky fbdd925d9b -Work in progress visual shader editor *DOES NOT WORK YET* 2015-01-03 16:52:37 -03:00
Juan Linietsky 507736690d removed print 2015-01-03 16:00:37 -03:00
Juan Linietsky 6b5b95bb4e -added new code completion guess locations, closes #1032 
-moved commandline fix to mingw-only, should fix #1064
 2015-01-03 13:03:13 -03:00
Juan Linietsky cef3bd026f -fixed issue with denormals in half precission, closes #1073 
-added h_offset and v_offset to 3D Camera, should allow to do the same as in #1102
 2015-01-03 11:06:53 -03:00
Juan Linietsky 2144648a3d -fix assignment to vector types in script using integer indices crash (#978) 2015-01-02 15:53:02 -03:00
Juan Linietsky 28daf19744 -assignment of ord to string index made valid #1072 2015-01-02 13:17:46 -03:00
Juan Linietsky bc492c0bca Merge pull request #1087 from adolson/connect-fix 
change parameter name from ip to port
 2015-01-02 11:54:10 -03:00
Muresan Vlad aka Mury 9ee218ac9b Fix for bug 1088 2015-01-02 13:31:25 +02:00
Dana Olson b0509bf8f0 change parameter name from ip to port 2015-01-01 22:22:24 -05:00
Juan Linietsky 530d717a67 -fix get_as_text (#1022 ) 2014-12-21 12:12:59 -03:00
Juan Linietsky 78e7777cf5 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	modules/gdscript/gd_editor.cpp

Improved code completion for InputEvent (shows members by type)
 2014-12-21 11:46:28 -03:00
Juan Linietsky a36a774897 Fixes 
-=-=-=

-Added missing quaternion constructor
-code completion fixes
-winrt fixes
 2014-12-20 15:30:06 -03:00
Juan Linietsky 9f5bbfc322 -improved completion options for InputEvent, shows all event types now 2014-12-18 00:56:33 -03:00
Juan Linietsky 0c3f14087c Merge pull request #984 from orbitcowboy/master 
xml_parser: check array length index before accessing the array.
 2014-12-17 10:18:08 -02:00
Juan Linietsky 8347e008c2 -removed annoying pragma 2014-12-17 09:14:25 -03:00
Juan Linietsky d55f95e0d2 Merge branch 'master' of https://github.com/okamstudio/godot 2014-12-16 22:33:35 -03:00
Juan Linietsky bcf27feb98 New Code Completion 
-=-=-=-=-=-=-=-=-=-

-Massive improvement to code completion
-Argument hinting for functions

If you manage to out-smart the code-completion in a situation where completion
should be possible to guess, let me know.

 Please enter the commit message for your changes. Lines starting
 2014-12-16 22:31:57 -03:00
orbitcowboy 378fb0bace xml_parser: check array length index before accessing the array. 2014-12-16 21:16:48 +01:00
Juan Linietsky 089d7fa171 Small batch of fixes 
-=-=-=-=-=-=-=-=-=-=
-Fixed looping error in AudioStreamResampled
-winrt port progress
-fixes in material in ambient light
 2014-12-15 15:42:58 -03:00
Dana Olson e168d43b4a added GDScript binding for set_window_title 2014-12-10 16:50:43 -05:00
Dana Olson 792d675d81 wrong typedef - closes #270 2014-12-08 23:53:55 -05:00
Dana Olson b874205119 closes #163 2014-12-08 23:26:19 -05:00
Juan Linietsky 6851f9bfae Small Fixes 
-=-=-=-=-=-

-Bug in navmesh demo fixed
-Bug in variant
-Better Collada Exporter supports proper names of exported shapekeys
 2014-12-08 15:47:45 -03:00
Juan Linietsky 10b371516b More Fixes 
-=-=-=-=-=

-Bug in saving multinline text in xml fixed. #925
-typo in android export fixed. #930
 2014-12-07 11:33:57 -03:00
Juan Linietsky e361e8539c -Ability to ask for documents/pictures/etc system dirs. 
-Fixes to animationplayer
-fixes to collada importer
 2014-12-02 14:02:41 -03:00
Juan Linietsky 9d5a2cb847 Merge pull request #863 from JIghtuse/master 
Fix CppCheck 'duplicateExpression' warning
 2014-12-01 21:45:26 -02:00
Juan Linietsky d5cb758d36 NavMesh 
-=-=-=-

-Fixed NavMesh API
-New NavMesh demo
-Support for animated Particles2D
-Fixes for native video playback on iOS
 2014-11-17 07:46:11 -03:00
Juan Linietsky abbea4d945 UDP Fixes 
-=-=-=-=-

Curse the day I decided to port UDP code, as it ended up
being two nights of work.  At least It's done now (I hope).

-Fixed UDP Support, API seems stable
-Added UDP Chat demo (chat that can lose your packets, heh)
-Added helpers to areas and bodies to get list of collided bodies and contained bodies.
-Sped up screen/viewport capture code.
-Added code to save an image as PNG
-Small fix so scripts register their singletons after modules did.
 2014-11-13 00:53:12 -03:00
Juan Linietsky d02953c596 oops 2014-11-12 11:29:22 -03:00
Juan Linietsky 12f3bc83b3 missing bind 2014-11-12 11:28:23 -03:00
Juan Linietsky 6dd8768811 3D Import Import & UDP 
-=-=-=-=-=-=-=-=-=-=-

-Animation Import filter support
-Animation Clip import support
-Animation Optimizer Fixes, Improvements and Visibile Options
-Extremely Experimental UDP support.
 2014-11-12 11:23:23 -03:00
Boris Egorov 1ce14e3321 Fix CppCheck 'duplicateExpression' warning 
BTW, all three cases looks similar. It would be nice to refactor it
to avoid repeating code.
 2014-11-07 05:26:41 +00:00