Commit graph

2393 commits

Author SHA1 Message Date
Juan Linietsky
db43b9bcf0 Merge pull request #2080 from bojidar-bg/patch-1
Fix to #2079
2015-06-22 23:56:38 -03:00
Juan Linietsky
68443a649d Merge pull request #2088 from KillerJaguar/setter-fix
Fixed variables being set before calling the setter method
2015-06-22 23:55:55 -03:00
Juan Linietsky
74081cdaaa Merge pull request #2090 from volzhs/pmr_virtual
fix register Physics2DTestMotionResult not virtual
2015-06-22 23:54:24 -03:00
Juan Linietsky
6154cff93f Merge pull request #2101 from sanikoyes/Pr-script-editor-save-state
Pr-Script editor
2015-06-22 23:54:04 -03:00
Juan Linietsky
8f9f03e374 Merge pull request #2132 from gber/master
Fix typo that produced invalid markup for images
2015-06-22 23:45:21 -03:00
Juan Linietsky
0805e83e59 small in place fixes 2015-06-22 23:44:13 -03:00
Juan Linietsky
29e644c20a Merge pull request #2144 from Krzycho666/UndoRedo_fix
added GDscript bidings for UndoRedo class
2015-06-22 23:42:13 -03:00
Juan Linietsky
d5550e9b7c Merge pull request #2145 from PeaceSells50/More_VS_Scons_Changes
More vs scons changes
2015-06-22 23:39:00 -03:00
Juan Linietsky
cfa7fe3c14 Merge pull request #2149 from TheHX/item_list_palette
Grid/Tile map editor new item palette
2015-06-22 23:38:12 -03:00
Juan Linietsky
229f607d8a Merge pull request #2150 from guilhermefelipecgs/add_editor_config
Add .editorconfig
2015-06-22 23:37:40 -03:00
James McLean
2f882abb65 Merge branch 'master' of github.com:okamstudio/godot into development 2015-06-22 21:54:37 -04:00
Juan Linietsky
ae28305d7c ability to set process on parent nodes on visibility notifier 2015-06-22 15:43:13 -03:00
Guilherme Felipe
956e0a8564 Add .editorconfig 2015-06-22 14:07:26 -03:00
Franklin Sobrinho
0159cecd69 Small fixes for Grid/Tile map editor palette 2015-06-22 11:10:13 -03:00
Franklin Sobrinho
d68a33b473 Grid/Tile map editor new item palette 2015-06-22 10:05:03 -03:00
krzycho
fafcc52d1c added some missing biddings 2015-06-22 14:42:52 +02:00
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
krzycho
d65455185a - added GDscript bidings for UndoRedo class mechanizm
- registered UndoRedo
2015-06-21 22:23:09 +02:00
Peace Sells
6edbab0a9f Setting build vs properties in scons. 2015-06-21 14:21:24 -06:00
Kostadin Damyanov
174df9a276 Haiku: add support for mouse wheel 2015-06-21 22:18:27 +03:00
Kostadin Damyanov
6f48ddc61d Haiku: add some screen and window-related methods 2015-06-21 02:08:31 +03:00
Guido Berhoerster
acbaefcc02 Fix typo that produced invalid markup for images 2015-06-20 14:47:06 +02:00
Kostadin Damyanov
b59e95ce1c Haiku: implemet get_widow_size() get/set_window_position() 2015-06-20 15:35:54 +03:00
Peace Sells
aa4211d477 Hide projects folder. 2015-06-19 21:42:11 -06:00
Kostadin Damyanov
d44dfc2440 Haiku: cleanup, add TODOs 2015-06-20 03:43:11 +03:00
Kostadin Damyanov
93ac4ace0a Haiku: handle the quit request message 2015-06-20 01:59:32 +03:00
Kostadin Damyanov
0038e27fc3 Merge remote-tracking branch 'upstream/master' 2015-06-18 22:48:29 +03:00
Kostadin Damyanov
f10eb8ffa1 Haiku: implement get_mouse_pos() and get_mouse_button_state() 2015-06-18 22:41:33 +03:00
Kostadin Damyanov
2102d35e9c Haiku: read the status of the key modifiers and mouse buttons 2015-06-17 22:27:45 +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
Kostadin Damyanov
1505d65ac9 Haiku: handle mouse movement and click events 2015-06-16 21:52:24 +03:00
sanikoyes
14cd70faf3 Script editor: restore line/column after script reload 2015-06-16 15:15:10 +08:00
volzhs
81a1f32f0c Merge branch 'pmr_virtual' 2015-06-15 09:46:32 +09:00
volzhs
43d5d42039 Merge branch 'create_from_fnt' 2015-06-15 09:46:16 +09:00
volzhs
839d69502c fix register Physics2DTestMotionResult 2015-06-15 08:57:14 +09: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
Jaguar
7c0051beac Fixed variables being set before calling the setter method 2015-06-13 14:10:06 -04:00
Bojidar Marinov
852bf95c0c Delete .fscache from fog_of_war demo, closes #2079. 2015-06-13 14:47:22 +03:00
Bojidar Marinov
5a0de04eb7 Resolved a merge conflict. 2015-06-13 14:43:12 +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