46c5fda91d
-orphan resource explorer dialog + tools menu
2015-11-29 01:08:31 -03:00
68aaa0f813
Merge branch 'master' of https://github.com/godotengine/godot
2015-11-28 20:57:23 -03:00
7aa39b7cae
-Fixed bug with scene inheritance, should work again
...
-Proper .tscn and .tres parsing, should work, please test well!
2015-11-28 20:56:14 -03:00
68c56f81f9
Merge pull request #2940 from TheHX/pr-error-message
...
Fix error messages when closing the editor
2015-11-28 21:28:35 +01:00
553ec52300
Fix message - ERROR: get_path: Condition ' !is_inside_tree() ' is true - when closing the editor
2015-11-28 16:58:10 -03:00
280d72eb8b
Merge pull request #2937 from koalefant/master
...
fixed crash when creating new object with wrong number of arguments (rebased)
2015-11-28 18:15:47 +01:00
bc998c9195
fixed crash when creating new object with wrong number of arguments
2015-11-28 17:30:59 +01:00
e4c872a260
Merge pull request #2936 from TheHX/pr-container
...
Add container automatic update when moving a child node
2015-11-28 17:16:54 +01:00
43e1b879d0
Add container automatic update when moving a child node
2015-11-28 13:05:39 -03:00
1138103c63
Fix shader loading, making possible load .shd and .sgp from editor
2015-11-27 21:11:20 -03:00
274b17b636
Merge pull request #2932 from TheHX/pr-editor-help-scroll
...
Fix editor help scroll to result
2015-11-28 00:15:02 +01:00
493d3c22ca
Fix editor help scroll to result
2015-11-27 20:11:49 -03:00
d2f9155995
Merge pull request #2927 from akien-mga/pr-references-okam
...
Replace hardcoded references to Okam Studio by Godot Engine
2015-11-27 23:59:58 +01:00
a98eafe3cc
Merge pull request #2930 from vnen/cleaner-opus-build
...
Clean up Opus build command arguments
2015-11-27 23:58:41 +01:00
4057907cf4
Remove redundant Opus directive definition
...
Clean up the build command line another extra bit.
2015-11-27 19:59:50 -02:00
fc0c4c6175
Remove Opus extra includes
...
Remove the extra directories to include that were needed by the Opus
library. Now the lib includes more specific paths to avoid those.
2015-11-27 19:59:13 -02:00
20efb48101
Moved subscene creation from scene menu to an icon on the scene dock
...
Based on @Fiona's PR #2220 .
The previous "subscene" concept is also renamed to "new scene", as those subscene are just like regular scenes.
2015-11-27 21:42:48 +01:00
0fd20e1002
Update copyright header in ios xcode templates
2015-11-27 19:34:55 +01:00
55d56d9b7c
Replace hardcoded references to Okam Studio by Godot Engine
...
Since the engine development is now independent.
Fixes #2836 .
2015-11-27 18:54:09 +01:00
ed4738fbed
Merge pull request #2926 from Magurosenbei/shader_language_function_validation_fix
...
Bug Fix #2541 : Shader language function validation logic
2015-11-27 14:55:49 +01:00
67a1c3f136
Bug Fix #2541 : Shader language function validation logic
...
ensures that it finds the correct function to validate.
2015-11-27 21:27:06 +08:00
d1a07ee28b
Merge pull request #2891 from TheHX/fix_matrix_property
...
Fix property editor Matrix3 and Matrix32 editing
2015-11-26 23:38:21 +01:00
82413bd2a1
Merge pull request #2921 from est31/error_if_no_export_to
...
Print error if no export destination has been passed
2015-11-26 23:06:13 +01:00
0b4830f3be
Added set_hidden method to Spatial and CanvasItem
2015-11-26 13:44:06 -08:00
523b67e740
Print error if no export destination has been passed
2015-11-26 22:35:27 +01:00
772900c4ff
Merge pull request #2918 from TheHX/pr-function-parameters
...
Add script auto-completion for function parameters
2015-11-26 13:58:09 +01:00
69a6524adf
Add script auto-completion for function parameters
2015-11-26 09:40:13 -03:00
f8b8f7b873
Merge pull request #2912 from TheHX/pr-mesh-import-plugin
...
Better import mesh warnings
2015-11-25 14:41:41 +01:00
adf082a006
Better import mesh warnings
2015-11-25 10:28:46 -03:00
dc9ddfc6a0
Editor layouts menu
2015-11-25 13:28:41 +01:00
d909942f25
Merge pull request #2895 from TheHX/oneshot_connection
...
Add ability to set oneshot connection from Editor
2015-11-25 08:50:54 +01:00
868a5a5be1
Merge pull request #2910 from est31/export_error_on_headless
...
Print errors to console when exporting
2015-11-25 08:07:35 +01:00
7aa2a2e62c
Merge pull request #2909 from neikeq/imp_2908
...
Put 2D, 3D and Script editor table indexes in enum
2015-11-25 07:24:58 +01:00
5dc9770feb
Print errors to console when exporting
...
Now you the errors when exporting via godot server binary.
When exporting via non-headless godot, it is useful to have the error
on the console as well.
Also exit and print a list of valid export platforms when
the supplied platform was not found.
2015-11-25 06:50:08 +01:00
bd10df93ec
Merge branch 'master' of https://github.com/godotengine/godot
...
Conflicts:
drivers/ogg/SCsub
drivers/vorbis/SCsub
2015-11-25 00:29:23 -03:00
b987d2113b
0theora compilation fixes
2015-11-25 00:28:03 -03:00
8d97eef0fe
Put 2D, 3D and Script editor index in enum
...
To avoid invalid index out of bounds mistakes.
2015-11-25 00:46:44 +01:00
a1059e3e3e
Merge pull request #2908 from neikeq/fix_editor_select
...
Fix bugs caused by merged Script and Help tabs
2015-11-25 00:25:55 +01:00
06957a8026
Fix Class Reference request from Inspector
2015-11-25 00:08:39 +01:00
bfe8df27bc
Fix switching between 2D/3D/Script
2015-11-25 00:07:32 +01:00
5db398f67f
Merge pull request #2907 from neikeq/fix_2887
...
Fix Class Search dialog not showing
2015-11-24 23:55:44 +01:00
660e831e36
Fix Class Search dialog not showing up
2015-11-24 23:03:51 +01:00
36ef5cd7bc
Merge pull request #2906 from neikeq/help_last_search
...
Remember last search help term
2015-11-24 23:00:31 +01:00
c591293718
Remember last help search
2015-11-24 22:33:26 +01:00
c731dd1ba6
Merge pull request #2905 from akien-mga/master
...
Fix indent
2015-11-24 20:06:11 +01:00
e4a2458d4c
Fix indent
2015-11-24 20:05:14 +01:00
045844fc47
Merge pull request #2904 from akien-mga/master
...
Fix build of ogg and vorbis drivers
2015-11-24 20:04:24 +01:00
adbc85cabd
Fix build of ogg and vorbis drivers
...
Regression from ccd40f76e8
2015-11-24 19:59:57 +01:00
082e3fbb29
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
main/main.cpp
2015-11-24 10:52:41 -03:00
ccd40f76e8
-work in progress resourceparser and .tscn parser. Still non-functional
...
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24 10:42:05 -03:00
Juan Linietsky
Rémi Verschelde
Franklin Sobrinho
admix
George Marques
Rémi Verschelde
Andrea Chua
romulox_x
est31
neikeq