Commit graph

2293 commits

Author SHA1 Message Date
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
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
Rémi Verschelde
00ddb532fb Silence too verbose boot splash debug info 2015-11-23 00:38:12 +01:00
Rémi Verschelde
d3529da1e4 Merge pull request #993 from orbitcowboy/master
sprite_3d.cpp: fixed buffer access out of bounds.
2015-11-23 00:22:48 +01:00
Rémi Verschelde
5a35bb903d Merge pull request #1820 from guilhermefelipecgs/master
Remove duplicated filter, Fix #1795
2015-11-23 00:22:35 +01:00
Rémi Verschelde
2674565cf6 Merge pull request #1931 from Faless/audio_free_rid
Expose AudioServer::free(RID rid) as AudioServer.free_rid(RID rid)
2015-11-23 00:22:15 +01:00
Rémi Verschelde
d97e8cface Merge pull request #2871 from TheHX/property_editor_search
Better PropertyEditor search
2015-11-23 00:21:19 +01:00
Rémi Verschelde
b5a7585fc0 Merge pull request #2875 from akien-mga/pr-colormap
Make all demo icons 8-bit/color RGB(A)
2015-11-23 00:20:49 +01:00
Rémi Verschelde
b6c6e2f5e5 Make all demo icons 8-bit/color RGB(A)
Godot does not seem to like 8-bit colormaps.
Fixes #2874.
2015-11-23 00:19:00 +01:00
Rémi Verschelde
f99b630993 Load main scene if defined when running editor from the command line
If no main scene is defined, or if it's an empty string, the previous behaviour will still be used, i.e. launch the project manager.
A small fix was also added not to maximize the window when opening the project manager via -editor (i.e. "godot" and "godot -e" will behave the same when no project is in the path).

Fixes #2869.
2015-11-22 17:36:03 +01:00
Franklin Sobrinho
e956677f44 Better PropertyEditor search 2015-11-22 13:05:55 -03:00
neikeq
9797b6374b Popup submenu position enhancement 2015-11-22 15:53:22 +01:00
Juan Linietsky
bcf4aded9a Merge pull request #2859 from TheHX/property_editor
Implement name filter for PropertyEditor
2015-11-22 08:31:18 -03:00
Juan Linietsky
265f7ba4e5 Merge pull request #2862 from mikica1986vee/Godot_Tegra_3_fix
Tegra 3 fix
2015-11-21 19:27:01 -03:00
mikica1986vee
d6b317a2c1 tegra 3 fix 2015-11-21 23:21:36 +01:00
Franklin Sobrinho
82c8190013 Implement name filter to PropertyEditor
- Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 13:42:15 -03:00
Rémi Verschelde
0b07d16fef Merge pull request #2838 from akien-mga/demos-icons
Additional demos icons
2015-11-21 16:22:42 +01:00
Franklin Sobrinho
5ef23812ac Add more properties to AcceptDialog 2015-11-20 18:25:01 -03:00
Rémi Verschelde
dd09f13f68 Merge pull request #2847 from akien-mga/pr-sync-doc
Sync doc template with code
2015-11-20 18:48:17 +01:00
Rémi Verschelde
0c8dda80ff Update Vector2.angle() description 2015-11-20 18:47:18 +01:00
Rémi Verschelde
497efa720c Sync doc template with code 2015-11-20 18:39:23 +01:00
Rémi Verschelde
cae515f3fa Merge pull request #2846 from Ovnuniarchos/DocShapes2D
Documented 2D collision shapes and their editors
2015-11-20 18:36:22 +01:00
Ovnuniarchos
8c0c46c2ae Inserted explanation about the behaviour of CollsionPolygon2D.set_polygon. 2015-11-20 18:24:28 +01:00
Ovnuniarchos
68a0f713b8 Differences between ConvexPolygon2D and ConcavePolygon2D? 2015-11-20 18:09:31 +01:00
Ovnuniarchos
1155ac884c ConvexPolygonShape2D.set_point_cloud documented to do nothing. 2015-11-20 18:09:31 +01:00
Ovnuniarchos
73a80e5509 Added definition of bias solver. 2015-11-20 18:09:31 +01:00
Juan Linietsky
cf3ae61a7f Merge pull request #2825 from StraToN/fix-tabclose-confirmation
Ask confirmation on closing a scene tab
2015-11-20 08:17:53 -03:00
masoud bh
6277fe3078 add priority to load binaryname.pck 2015-11-20 12:47:55 +03:30