Rémi Verschelde
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
Franklin Sobrinho
69a6524adf
Add script auto-completion for function parameters
2015-11-26 09:40:13 -03:00
Rémi Verschelde
f8b8f7b873
Merge pull request #2912 from TheHX/pr-mesh-import-plugin
...
Better import mesh warnings
2015-11-25 14:41:41 +01:00
Franklin Sobrinho
adf082a006
Better import mesh warnings
2015-11-25 10:28:46 -03:00
neikeq
dc9ddfc6a0
Editor layouts menu
2015-11-25 13:28:41 +01:00
Rémi Verschelde
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
Rémi Verschelde
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
Rémi Verschelde
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
est31
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
Juan Linietsky
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
Juan Linietsky
b987d2113b
0theora compilation fixes
2015-11-25 00:28:03 -03:00
neikeq
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
Rémi Verschelde
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
neikeq
06957a8026
Fix Class Reference request from Inspector
2015-11-25 00:08:39 +01:00
neikeq
bfe8df27bc
Fix switching between 2D/3D/Script
2015-11-25 00:07:32 +01:00
Rémi Verschelde
5db398f67f
Merge pull request #2907 from neikeq/fix_2887
...
Fix Class Search dialog not showing
2015-11-24 23:55:44 +01:00
neikeq
660e831e36
Fix Class Search dialog not showing up
2015-11-24 23:03:51 +01:00
Rémi Verschelde
36ef5cd7bc
Merge pull request #2906 from neikeq/help_last_search
...
Remember last search help term
2015-11-24 23:00:31 +01:00
neikeq
c591293718
Remember last help search
2015-11-24 22:33:26 +01:00
Rémi Verschelde
c731dd1ba6
Merge pull request #2905 from akien-mga/master
...
Fix indent
2015-11-24 20:06:11 +01:00
Rémi Verschelde
e4a2458d4c
Fix indent
2015-11-24 20:05:14 +01:00
Rémi Verschelde
045844fc47
Merge pull request #2904 from akien-mga/master
...
Fix build of ogg and vorbis drivers
2015-11-24 20:04:24 +01:00
Rémi Verschelde
adbc85cabd
Fix build of ogg and vorbis drivers
...
Regression from ccd40f76e8
2015-11-24 19:59:57 +01:00
Juan Linietsky
082e3fbb29
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
main/main.cpp
2015-11-24 10:52:41 -03:00
Juan Linietsky
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
Rémi Verschelde
2ea992b788
Merge pull request #2899 from godotengine/pr-typo-boot-splash
...
Fix typo, missing quote
2015-11-24 10:14:38 +01:00
Rémi Verschelde
b01546f91c
Fix typo, missing quote
2015-11-24 10:14:06 +01:00
Rémi Verschelde
0442ce2e2e
Merge pull request #2876 from akien-mga/pr-boot-splash-debug
...
Silence too verbose boot splash debug info
2015-11-24 09:36:11 +01:00
Rémi Verschelde
96115ac975
Merge pull request #2872 from akien-mga/pr-load-main-scene
...
Load main scene if defined when running editor from the command line
2015-11-24 09:35:28 +01:00
Rémi Verschelde
14145d516e
Merge pull request #2898 from est31/string_byte_format_doc
...
Document string <-> byte conversion methods
2015-11-24 08:36:12 +01:00
est31
323938cc28
Document byte conversion methods for Strings
2015-11-24 05:46:00 +01:00
est31
a23e29ab36
Correct retvals of String::to_ascii() and String::to_utf8()
...
Both return RawArray, not String.
My fault from commit f83f96cb44
2015-11-24 05:11:39 +01:00
Rémi Verschelde
1ac7d4fc77
Merge pull request #2889 from akien-mga/pr-matrix32-members
...
Fix return type of Matrix32 member vars
2015-11-24 00:10:18 +01:00
Franklin Sobrinho
e6047912fe
Add ability to set oneshot connection from Editor
2015-11-23 17:38:15 -03:00
Rémi Verschelde
17a97b7bdf
Merge pull request #2894 from neikeq/import_subscene_patch
...
Import Sub-Scene as root's child if no node is selected
2015-11-23 20:27:51 +01:00
neikeq
62b9659c41
Import Sub-Scene as root's child if no node is selected
2015-11-23 20:22:42 +01:00
Franklin Sobrinho
2db2dd66de
Fix property editor Matrix3 and Matrix32 editing
2015-11-23 15:34:54 -03:00
neikeq
0017c368c2
Allow selecting CanvasLayer children in canvas editor
2015-11-23 19:17:01 +01:00
Rémi Verschelde
a961347d8c
Fix return type of Matrix32 member vars
...
Thanks to @bojidar-bg for localising the issue.
2015-11-23 19:08:54 +01:00
Rémi Verschelde
19a8f9b74d
Merge pull request #2882 from Brickcaster/20151123
...
Added windows specific .gitignore for icon related change
2015-11-23 14:07:41 +01:00
Brickcaster
f7b090f94a
Added windows specific file
...
godot_res.res is showing up as a changed file when compiling for
windows. Need to ignore it.
2015-11-23 08:00:52 -05:00
Rémi Verschelde
ead86031b1
Merge pull request #2881 from bojidar-bg/reference-vector3-array
...
Document Vector3 and Vector3Array.
2015-11-23 14:00:24 +01:00
Bojidar Marinov
4359a90cca
Document Vector3 and Vector3Array. Fix documentation of Vector2 and Vector2Array.
2015-11-23 14:18:13 +02:00
Bojidar Marinov
ca750fb7bc
Update doc with -doctool.
2015-11-23 13:57:57 +02:00
Rémi Verschelde
2fbc1445a5
Merge pull request #2870 from neikeq/submenu_pos_fix
...
Popup submenu position enhancement
2015-11-23 11:53:30 +01:00
Rémi Verschelde
aa30e01f26
Merge pull request #2752 from SaracenOne/shadow_color
...
New shader feature: change the colour of shadows on a per-material basis
2015-11-23 11:40:52 +01:00
Rémi Verschelde
74e0c76216
Merge pull request #2788 from masoudbh3/pck-file-name
...
Load binaryname.pck
2015-11-23 09:59:48 +01:00
Rémi Verschelde
d405e6ae35
Merge pull request #2850 from TheHX/dialog_property
...
Add more properties to AcceptDialog
2015-11-23 08:25:02 +01:00
Rémi Verschelde
956282031c
Merge pull request #2878 from zvodd/master
...
Fix poorly formed documentation xml, text outside of tags
2015-11-23 07:57:20 +01:00
zvodd
18dfb16e26
fix poorly formed documentation xml, text outside of tags
2015-11-23 12:52:43 +11:00
