godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,300 Commits 15 Branches 59 Tags 2.2 GiB
e1d02e4831
Commit Graph

688 Commits

Author SHA1 Message Date
est31
e1d02e4831 Make the setting unix-only. 
For this, put the detection into the OS class and its subclass.
 2015-11-30 02:35:59 +01:00
est31
15f6d3cebf Add way to look for templates at system wide level too 
Useful for everybody wanting to package godot.
Fixes #1026.

-> Retain the old behaviour: path in error msg only when exporting.
-> User templates override system templates
 2015-11-30 01:36:08 +01:00
koalefant
c93a005fb6 Script Editor: automatic indentation after a colon 2015-11-29 17:13:29 +01:00
Juan Linietsky
46c5fda91d -orphan resource explorer dialog + tools menu 2015-11-29 01:08:31 -03:00
Juan Linietsky
68aaa0f813 Merge branch 'master' of https://github.com/godotengine/godot 2015-11-28 20:57:23 -03:00
Juan Linietsky
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
Franklin Sobrinho
553ec52300 Fix message - ERROR: get_path: Condition ' !is_inside_tree() ' is true - when closing the editor 2015-11-28 16:58:10 -03:00
Rémi Verschelde
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
Franklin Sobrinho
493d3c22ca Fix editor help scroll to result 2015-11-27 20:11:49 -03:00
Rémi Verschelde
0fd20e1002 Update copyright header in ios xcode templates 2015-11-27 19:34:55 +01:00
Rémi Verschelde
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
Rémi Verschelde
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
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
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
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
neikeq
c591293718 Remember last help search 2015-11-24 22:33:26 +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
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
Franklin Sobrinho
e6047912fe Add ability to set oneshot connection from Editor 2015-11-23 17:38:15 -03: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
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
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
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
eska
fa12ab8f02 Fix help display 2015-11-20 01:12:29 +01:00
Juan Linietsky
f858adf150 -small fix to avoid warnings 2015-11-19 20:24:43 -03:00
Juan Linietsky
06d842566c Merge pull request #2830 from Ovnuniarchos/ShapeLine2DXPolygonEditor 
Corrections to #2808 (2D shapes editor update)
 2015-11-19 19:35:18 -03:00
Juan Linietsky
dccbd3b4f8 Merge pull request #2831 from neikeq/select_menu_patch 
Show select menu on button pressed (instead of released)
 2015-11-19 19:34:50 -03:00
Alexander Holland
5ee443bcc0 fix with refactoring, refrash re-run icon 2015-11-19 21:06:49 +01:00
Ovnuniarchos
1396ae274a get_handle_value implemented for LINE_SHAPE. Normal length normalized. 2015-11-19 16:13:45 +01:00
neikeq
6b0423b191 Show select menu on button pressed (instead of released) 2015-11-19 15:47:04 +01:00
Juan Linietsky
b7a1599845 removed iconv dependency from pe_bliss 2015-11-19 11:15:32 -03:00
Juan Linietsky
fd5ee87c24 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	platform/windows/export/export.h
 2015-11-19 10:44:13 -03:00
Juan Linietsky
d3eb9e8c54 -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 2015-11-19 10:41:20 -03:00
Julian Murgia - StraToN
6d20ded6d7 Ask confirmation on closing a scene tab 2015-11-19 14:15:17 +01:00
Juan Linietsky
232b1a3fef Merge pull request #2822 from kurikaesu/master 
HTTPClient docs & request functionality + fixes
 2015-11-19 09:18:09 -03:00
Aren Villanueva
30d4889131 Fixes https://github.com/godotengine/godot/issues/2821 2015-11-19 22:02:03 +11:00
Aren Villanueva
5c7e9e7e63 Fixes the make_doc.sh, <, > and & signs in descriptions that cause the parser to break. 
Documentation for HTTPClient.
Added a query_string_from_dict method to HTTPClient to create a x-www-form-urlencoded valid query string for GET and POST messages.
String now has http_escape() and http_unescape() methods to help facilitate the above query_string_from_dict method.
 2015-11-19 22:01:42 +11:00
ZuBsPaCe
2b36da0f79 Fixes Visual Studio compile error due to pe_bliss 
Error: C2039: 'min': is not a member of 'std'
Reason: #2518 introduced pe_bliss

Fix: Visual Studio 2015 & 2013 need to include algorithm header before string, otherwise std:min cannot be used.
See: http://stackoverflow.com/questions/17409956
 2015-11-19 11:07:46 +01:00