Commit graph

1497 commits

Author SHA1 Message Date
James McLean
2f33f820e9 Fixed compilation error on MacOS X. 2015-06-22 00:56:49 -04:00
James McLean
8edf4a56f1 Merge branch 'master' of github.com:okamstudio/godot into development 2015-06-22 00:33:52 -04:00
James McLean
4e3ec18f7e Merge branch 'master' of github.com:okamstudio/godot into development 2015-06-21 23:15:58 -04:00
Juan Linietsky
e9bbb97acc Multiple scene editing *POTENTIALLY UNSTABLE*
-ability to edit multiple scenes at the same time
-resource internal IDs are now persistent, this makes multiple scene
editing possible but maaaaay result in file corruption bugs (tested and
could not find anything but possibility exists because core code
changed, report immediately if you find this).
-properly save settings, layout, etc when edited
-script editing is independent from scene editing now
-show a yellow box when a script belongs to the scene
2015-06-22 00:04:15 -03:00
Juan Linietsky
37af8b4136 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-16 16:39:20 -03:00
Juan Linietsky
669f5c994b fix "v" pivot adjust function 2015-06-16 16:15:01 -03:00
Juan Linietsky
f2a29aadc6 fixed small refresh issue when moving docks 2015-06-14 01:09:58 -03:00
Juan Linietsky
7674bad6c4 fixes for dock motion 2015-06-14 00:41:08 -03:00
Juan Linietsky
8228fea02f missing changes 2015-06-14 02:13:47 -03:00
Juan Linietsky
edf1f27118 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-13 22:14:36 -03:00
Juan Linietsky
9a58960d28 some editor window changes
-ability to make dock position configurable, and it gets saved
-editor starts maximized default
2015-06-13 22:12:53 -03:00
James McLean
86c87ee66a Merge branch 'master' of github.com:okamstudio/godot into development 2015-06-12 20:31:00 -04:00
Juan Linietsky
4e46143499 some optimizations in godot memory handling 2015-06-12 18:27:48 -03:00
Juan Linietsky
89300b70e7 added ability for Area (3D) to detect other areas 2015-06-12 15:52:21 -03:00
Juan Linietsky
8945670bc0 made changing pivot simpler in 2D nodes (just press v with mouse over position) 2015-06-12 13:53:18 -03:00
Juan Linietsky
4b35654a02 Update rasterizer_gles2.cpp
fixed camera plane
2015-06-12 09:54:19 -03:00
James McLean
2e6d3b7fad Changed floats to 'real_t'. 2015-06-11 21:37:54 -04:00
James McLean
c2181285eb Changed 'scale' to 'scale_basis' in 'interpolate_with'. 2015-06-11 13:44:04 -04:00
James McLean
237d6afa16 Merge branch 'master' of github.com:okamstudio/godot 2015-06-11 10:46:59 -04:00
James McLean
b19ed63eb6 Implemented interpolation for affine transformations (Matrix32::interpolate_with) 2015-06-11 10:43:48 -04:00
Juan Linietsky
c845c2a827 added icon 2015-06-11 10:03:33 -03:00
Juan Linietsky
9e479065f5 new space shooter demo
ortho camera sort fix, closes #2063
2015-06-11 10:00:48 -03:00
James McLean
bb659fa875 Added rot/pos constructor for Matrix32 variant. 2015-06-09 10:55:23 -04:00
Juan Linietsky
bc6d91c897 Merge pull request #2051 from jrimclean/master
oops, thanks
2015-06-08 14:23:54 -03:00
James McLean
45b453169a Fixed get_packet/put_packet bindings in PacketPeer. 2015-06-08 13:18:18 -04:00
Juan Linietsky
c76900beb8 draw button focus before text and icon
closes #2047
2015-06-08 10:36:27 -03:00
Juan Linietsky
7590f3db21 grid container supports separate h and v spacing
closes #2049
2015-06-08 10:36:26 -03:00
Juan Linietsky
ade337c340 Delete godot.creator.user.RG2068 2015-06-08 01:35:33 -03:00
Juan Linietsky
f0681d3632 logo in svg curves & license 2015-06-08 01:33:46 -03:00
Juan Linietsky
f052153983 Added Node.find_node(mask) function
by popular request
2015-06-08 00:33:10 -03:00
Juan Linietsky
798b55df30 Merge pull request #2044 from est31/fix-win
Complete fix for windows compilability
2015-06-07 11:25:14 -03:00
est31
ddba217109 Complete fix for windows compilability
Thanks @volzhs for testing :)
2015-06-07 16:12:03 +02:00
Juan Linietsky
a30b2bf5df Merge pull request #2042 from est31/fix-win
Fix windows compilability
2015-06-07 10:40:04 -03:00
est31
64704ecbc5 Fix windows compilability 2015-06-07 15:36:14 +02:00
Juan Linietsky
8d61817293 Merge pull request #2037 from est31/use-local-win
Time zone support
2015-06-07 00:32:29 -03:00
Juan Linietsky
efbe877005 Merge pull request #2029 from est31/rawarray
Add String.to_utf8() and String.to_ascii()
2015-06-07 00:30:37 -03:00
Juan Linietsky
0351e3ae17 Merge pull request #2023 from TheJosh/dae-exporter-assimp
Fix Blender DAE exporter - files are unreadable by Assimp
2015-06-07 00:30:07 -03:00
Juan Linietsky
dac398ba58 Merge pull request #2017 from Razzlegames/multitouch_fix_1908
Additional Fix for Multi-touch release problem
2015-06-07 00:29:46 -03:00
Juan Linietsky
c7af3146c8 Merge pull request #2007 from Krzycho666/master
Fixed ui_accept problem
2015-06-07 00:29:35 -03:00
Juan Linietsky
e4434fe70e Merge pull request #1977 from choikwa/master
fix typo error in Color::invert, fixes #1967
2015-06-07 00:28:50 -03:00
Juan Linietsky
143265d4cb Merge pull request #1973 from Biliogadafr/ColorRamp
Replace color phases with color ramp for Particles2D. (need some review/guidance)
2015-06-07 00:26:35 -03:00
Juan Linietsky
5064cc5006 Merge pull request #1932 from Faless/gravity_distance_full
Calculate gravity based on distance from body to gravity point
2015-06-07 00:25:37 -03:00
Juan Linietsky
b524b40fdc -fixed many memory initialization issues
-fixed deadlock on previews thread
-fixed compilation errors on unix
2015-06-06 22:06:58 -03:00
Juan Linietsky
14c4c1b568 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-06 11:09:41 -03:00
Juan Linietsky
954256268a Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	demos/2d/motion/engine.cfg
2015-06-06 11:09:00 -03:00
Juan Linietsky
6974823288 Merge remote-tracking branch 'origin/master'
Conflicts:
	tools/editor/io_plugins/editor_texture_import_plugin.cpp
2015-06-06 10:12:09 -03:00
Juan Linietsky
9acab32daa new file dialog!
-ItemList control for easier lists/thumbnails
-New file dialog, with support for thumbnails, favorites, recent places,
etc
-Moved .fscache out of the project, no more bugs due to committed/pulled
.fscache!
-Dir dialog now sorts directories
2015-06-06 09:44:38 -03:00
est31
c5338fd6c4 Add OS.get_time_zone_info function
The returned dictionary maps "name" to the
name of the current time zone, and "bias" to
a bias from UTC in minutes.
2015-06-06 05:57:33 +02:00
est31
803069886e Add utc param to get_time and get_date methods
If utc == false, we return the local time, like before.
Otherwise, we return UTC time.
utc defaults to false to not break behaviour.
2015-06-06 05:55:28 +02:00
est31
26ea12a873 Use local time for both time and date on win
On unix and nacl, both date and time are expressed in local time.
2015-06-06 03:23:34 +02:00