maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2258 commits 10 branches 35 tags 1.1 GiB
Commit graph

669 commits

Author SHA1 Message Date
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
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
neikeq 62b9659c41 Import Sub-Scene as root's child if no node is selected 2015-11-23 20:22:42 +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
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
Juan Linietsky daf3182442 Revert "Ignore alpha materials in baked light ray-tracer." 2015-11-19 00:50:25 -03:00
Juan Linietsky 068b177c12 Merge pull request #2292 from blackwc/can_export 
Improve export validation
 2015-11-19 00:35:04 -03:00
Juan Linietsky a0564efb65 Merge pull request #2349 from neikeq/dock_patch 
Hide right UR and BR dock slots by default
 2015-11-19 00:31:09 -03:00
Juan Linietsky 9a7769f194 Merge pull request #2444 from TheHX/issue_2117 
Fix for problem when drawing CollisionPolygon when parented (#2117)
 2015-11-19 00:23:17 -03:00
Juan Linietsky fe449a6235 Merge pull request #2445 from TheHX/issue_2113 
Possible fix for crash on replacing Path2D node (#2113)
 2015-11-19 00:22:53 -03:00
Juan Linietsky 2dac9ab2ef Merge pull request #2447 from TheHX/issue_1275 
Fix crash after undo when editing Polygon2D (#1275)
 2015-11-19 00:21:46 -03:00
Juan Linietsky 6a3484260d Merge pull request #2451 from PeaceSells50/FixForFilesystemAdd 
Fixed bug with adding an instance from the FIleSystem dialog.
 2015-11-19 00:20:54 -03:00
Juan Linietsky 0168947084 Merge pull request #2518 from masoudbh3/godot-icons 
Add icon to exe file in windows export
 2015-11-19 00:08:47 -03:00
Juan Linietsky ea035f308b Merge pull request #2644 from Ovnuniarchos/BBCodeDocs 
BBCode is now allowed anywhere in the inline documentation.
 2015-11-19 00:07:32 -03:00
Juan Linietsky 6a7ae77847 Merge pull request #2696 from AlexHolly/restart-feature-on-running 
replay on play if already playing for scene and main + switch icon to…
 2015-11-19 00:06:34 -03:00
Juan Linietsky 33aa019e4f Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilation 
Visual studio 2015 compilation
 2015-11-18 23:56:06 -03:00
Juan Linietsky 3118c192bd Merge pull request #2786 from neikeq/node_select_menu 
Added selection menu to spatial and canvas editors
 2015-11-18 23:46:46 -03:00
Ovnuniarchos a9a330645b Merge branch 'master' into BBCodeDocs 2015-11-19 01:19:19 +01:00
neikeq f84dc8e59d Added selection menu to spatial and canvas editors 2015-11-19 00:19:00 +01:00
Juan Linietsky 94fdd01241 Merge pull request #2702 from TheHX/fix_align_with_view 
Fix 3D editor align with current view
 2015-11-18 19:58:52 -03:00
Juan Linietsky 0c3386b2ed Merge pull request #2707 from akien-mga/master 
Cosmetic fixes to SCons buildsystem
 2015-11-18 19:43:28 -03:00
Juan Linietsky fce4c6eecb Merge pull request #2716 from SaracenOne/animation_saving_fix 
Added missing saving support to animation editor.
 2015-11-18 19:35:57 -03:00
Juan Linietsky ba9ebe6b03 Merge pull request #2717 from SaracenOne/light_baker_transluscent 
Ignore alpha materials in baked light ray-tracer.
 2015-11-18 19:35:42 -03:00
Juan Linietsky 18ab04c102 Merge pull request #2812 from eska014/split-anim-tracks-button 
Split up AnimationPlayer tracks editor `Tracks` button
 2015-11-18 19:25:16 -03:00