Franklin Sobrinho
868832bca7
Fix editor crash after closing scene with certain types of nodes
2015-12-03 12:42:58 -03:00
Rémi Verschelde
7ac31a7209
Merge pull request #2969 from neikeq/fix_bracket_complete
...
Fix auto bracket completion disabled on newly open scripts
2015-12-01 21:01:48 +01:00
Rémi Verschelde
7b9dd1ea76
Merge pull request #2968 from neikeq/line_duplicate
...
Fix script editor not clonning down last line
2015-12-01 21:01:05 +01:00
neikeq
fc7e313074
Fix script editor not clonning down last line
2015-12-01 19:43:51 +01:00
neikeq
4cbabf9691
ScriptTextEditor: fix auto bracket completion not enabled
2015-12-01 17:43:18 +01:00
Rémi Verschelde
f1f3468f70
Merge pull request #2890 from neikeq/cl_select_children
...
Allow selecting CanvasLayer children in canvas editor
2015-12-01 11:20:48 +01:00
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
Franklin Sobrinho
1138103c63
Fix shader loading, making possible load .shd and .sgp from editor
2015-11-27 21:11:20 -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
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
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
neikeq
0017c368c2
Allow selecting CanvasLayer children in canvas editor
2015-11-23 19:17:01 +01:00
Franklin Sobrinho
354bc0385b
Add StaticBody collision generation for all selected MeshInstance nodes
2015-11-22 20:08:50 -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
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
Juan Linietsky
3b2c25e77d
Merge pull request #2815 from akien-mga/pr-tooltip-buttons-sample-library
...
Added tooltip for a few buttons in sample library editor
2015-11-18 19:21:29 -03:00
Juan Linietsky
551925475b
Merge pull request #2626 from TheHX/editor_dialogs
...
Small fixes in some editor dialogs
2015-11-18 19:17:55 -03:00
Juan Linietsky
536daca8f6
Merge pull request #2631 from firefly2442/duplicate-conditional-fix
...
duplicate conditional check
2015-11-18 19:17:01 -03:00
Juan Linietsky
a8f18e1bae
Merge pull request #2639 from MarianoGnu/origin
...
Fix ButtonGroup broken layout
2015-11-18 19:14:25 -03:00
Juan Linietsky
cba634c608
Merge pull request #2640 from firefly2442/settings-xml-missing-proj
...
projects in the editor_settings.xml that are no longer found on disk will be removed
2015-11-18 19:14:12 -03:00
Juan Linietsky
6aa95e77f3
Merge pull request #2652 from firefly2442/fix-icons
...
Fix icons (default location and in demos)
2015-11-18 19:13:05 -03:00
Tybobobo
c1c2fef23e
Added tooltip for a few buttons in sample library editor
2015-11-18 23:12:23 +01:00
Juan Linietsky
5db5255260
Merge pull request #2676 from neikeq/inspector_history_tooltip
...
Tooltip for the Inspector's history button
2015-11-18 19:04:16 -03:00
Juan Linietsky
3c1fdedc9d
Merge pull request #2679 from eska014/set-all-tileset-shapes
...
Add all collision shapes to a tile when converting scenes to TileSets
2015-11-18 19:03:59 -03:00
Juan Linietsky
f1156b7c48
Merge pull request #2693 from TheHX/memory_leak
...
Fix small memory leak
2015-11-18 19:02:05 -03:00
eska
7f5cb7512d
Split up AnimationPlayer tracks editor Tracks button
2015-11-18 22:55:05 +01:00
Juan Linietsky
9833fc21e6
Merge pull request #2767 from akien-mga/PR-node-rename-problem2
...
Fix node renaming bug when using the '.' character
2015-11-18 18:44:11 -03:00
Juan Linietsky
fecf79c000
Merge pull request #2775 from n31r0/master
...
Remove of use_exclude_ctrl_bones (was removed in io_scene_dae by Serg…
2015-11-18 18:40:19 -03:00
Ovnuniarchos
0b05739a8b
*Polygon2D now updates on any modification in its point array. ShapeLine2D has now an editor.
2015-11-18 19:20:50 +01:00
Juan Linietsky
b08312b30c
-Fixed default theme a little
...
-Added option to group help pages, fixes #2805
2015-11-18 09:20:46 -03:00
Juan Linietsky
3974fbb852
-fixed tabs
2015-11-18 04:47:41 -03:00
Juan Linietsky
17bde66cd8
missing icons
2015-11-17 09:47:18 -03:00
Juan Linietsky
081a236c67
-Merged Script and Help tabs
...
-Help tabs can be opened many at the same time
-Color temperatures for opened scripts
-Dominant script opening when switching scene tab
2015-11-17 09:46:08 -03:00
Juan Linietsky
8420c24f7f
-better integration of ndee's theme
2015-11-13 20:56:44 -03:00
Neiro
724b7edfd7
Remove of use_exclude_ctrl_bones (was removed in io_scene_dae by Sergey Lapin, commit 4210d5e459) in godot_export_manager.py
2015-11-12 17:47:04 +03:00
Juan Linietsky
1d7e9c4ba5
-fixes to animatedsprite used with atlas
2015-11-11 17:39:06 -03:00
sanikoyes
1d3fa162c8
Fix node renaming bug when using the '.' character
...
Fixed by making '.' (and '/') illegal character in node names when adding via the rename feature.
2015-11-10 23:35:52 +01:00
Juan Linietsky
61c4c5795f
-support for stereo ima-adpcm sample compression & playback
...
-support for converting samples to ima-adpcm upon export
2015-11-09 00:49:18 -03:00
masoud bh
69fa5ed1c0
add copyright text
2015-11-09 02:24:41 +03:30
masoud bh
55b8c3ee48
change pe_bliss parent directory from /drivers to /tools
2015-11-09 02:24:01 +03:30
masoud bh
24f3f43457
Add icon to exe file in windows export
...
add version_info and icon sections in "export to windows platform".
add version_info and icon to godot exe file (editor & template exe).
fix an problem in image class.
change all default icons to android export icon (a little more rounded).
create an python script for convert file to cpp byte array for use in
'splash.h'.
2015-11-09 02:23:58 +03:30
Saracen
53c9e8301c
Ignore alpha materials in baked light ray-tracer.
2015-11-02 16:25:16 +00:00
Saracen
56b7567b55
Added missing saving support to animation editor.
2015-11-02 16:17:14 +00:00
Franklin Sobrinho
cd4d4b97e3
Fix issue #1275
2015-11-02 08:34:40 -03:00
Rémi Verschelde
399b1b0474
Cosmetic fixes to SCons buildsystem
...
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39 )
- Potentially fixed an identation issue for openssl check
2015-11-01 20:53:26 +01:00
Franklin Sobrinho
18392e28b6
Fix "Align with view" undo, fixes #1443
2015-10-29 20:44:12 -03:00
ZuBsPaCe
3886ed08ac
Fixes Visual Studio 2015 compile error C3688 (invalid literal suffix)
...
tools\editor\editor_node.cpp(3037): error C3688: invalid literal suffix 'VERSION_FULL_NAME'; literal operator or literal operator template 'operator ""VERSION_FULL_NAME' not found
2015-10-29 15:57:55 +01:00
Alexander Holland
65258f741b
replay on play if already playing for scene and main + switch icon to reload if running.
2015-10-28 23:50:11 +01:00
Franklin Sobrinho
2e1b4ecf4b
Fix small memory leak
2015-10-28 10:34:02 -03:00
eska
ca7cfa9b4c
Add all collision shapes to a tile when converting scenes to TileSets
2015-10-25 23:13:46 +01:00
neikeq
cf995d5f07
Tooltip for the Inspector's history button
2015-10-25 18:00:29 +01:00
Julian Murgia - StraToN
d64c89d447
Fix #2623
2015-10-22 00:23:42 +02:00
Juan Linietsky
35959f9c5a
-fixes to ring buffer (fixes network error)
...
-fixes to invalid disabling of commands on scene tree dock
2015-10-21 16:52:43 -03:00
firefly2442
96cff3a73b
when creating project, save icon using resource location by default
2015-10-21 14:28:23 -05:00
Juan Linietsky
b59c86f6f9
-Ability to debug video memory usage
...
-Small fix to xml saver (swapping > and <)
2015-10-21 09:50:44 -03:00
Juan Linietsky
b5011d9bf1
-Fixes on atlas import to save memory if mipmaps are not used
...
-Make the video memory visible to improve debugging
2015-10-20 19:19:19 -03:00
Ovnuniarchos
0f0dc1a5d3
BBCode is now allowed anywhere in the inline documentation.
2015-10-20 17:41:27 +02:00
firefly2442
ad362fbc58
projects in the editor_settings.xml that are no longer found on disk will be removed
2015-10-19 23:14:02 -05:00
MarianoGNU
6df7d92379
Fix ButtonGroup broken layout
2015-10-19 17:46:13 -03:00
firefly2442
0a45fb6311
duplicate conditional check
2015-10-18 20:50:32 -05:00
Franklin Sobrinho
ec394950ff
Change MeshInstanceEditor outline dialog "Ok" button label
2015-10-18 15:13:17 -03:00
Franklin Sobrinho
abde648e68
Small fixes in some editor dialogs
2015-10-18 13:31:44 -03:00
Juan Linietsky
884d5a0f41
-remove path after inheriting, fixes #2616
2015-10-17 20:55:12 -03:00
Juan Linietsky
fba1842b11
-Propertly restrict renaming of nodes in inherited scenes, fixes #2615
2015-10-17 18:43:52 -03:00
Juan Linietsky
36c874cc45
remove unpexpected revert button, fixes #2614
2015-10-17 18:28:36 -03:00
Juan Linietsky
408c498446
-Added const to a reference, should fix #2613
2015-10-17 17:13:49 -03:00
Juan Linietsky
7d8f187c33
Merge branch 'master' of https://github.com/okamstudio/godot
2015-10-17 15:49:27 -03:00
Juan Linietsky
85a611d1cd
-fixes disability to remove instanced nodes when reopening scene. Fixes #2610
2015-10-17 15:48:42 -03:00
Juan Linietsky
1db523d0bb
Merge pull request #2274 from MarianoGnu/master
...
Improve Visual Shader Editor responsiveness
2015-10-17 15:31:23 -03:00
Juan Linietsky
6f9631fc51
Merge branch 'master' of https://github.com/okamstudio/godot
2015-10-17 12:48:47 -03:00
Juan Linietsky
7d33895320
Merge pull request #2053 from rodolforg/fix-import-button-label
...
Small fix for Import Game dialog labels
2015-10-17 12:13:33 -03:00
Juan Linietsky
474c72697d
Merge pull request #2250 from PeaceSells50/AddedGridMapSettings
...
Added GridMap settings which allows the user to enter a pick distance.
2015-10-17 12:11:13 -03:00
Juan Linietsky
52cc8e6ead
Merge pull request #2357 from volzhs/prevent-to-change-tool-mode
...
prevent to change tool mode when control key is pressed
2015-10-17 10:52:50 -03:00
Juan Linietsky
c22b627ee3
Merge pull request #2362 from AlexHolly/update-scene-tab-fix
...
[UI-FIX] - Update scene tabs on save
2015-10-17 10:51:45 -03:00
Juan Linietsky
c9ff40e140
Merge pull request #2380 from StraToN/tabs-buttons
...
Tab close button + display policies + application on Scenes Tabs
2015-10-17 10:46:32 -03:00
Juan Linietsky
63033aa646
Merge branch 'master' of https://github.com/okamstudio/godot
2015-10-17 10:30:08 -03:00
Juan Linietsky
ab22203791
misc cleanup
2015-10-17 10:29:54 -03:00
Juan Linietsky
b217e1417a
Merge pull request #2479 from firefly2442/cppcheck-unusedvars
...
ran cppcheck, found unused variables
2015-10-17 10:25:36 -03:00
Juan Linietsky
5a14b89c32
Merge pull request #2488 from slapin/remove-unimplemented-exporter-option
...
Remove of use_exclude_ctrl_bones option
2015-10-17 10:11:55 -03:00
Juan Linietsky
f4e93a5137
Merge pull request #2549 from shackra/docdump-openproj
...
Documentation Converter from XML to Open Project wiki markup format
2015-10-17 10:05:31 -03:00
Juan Linietsky
e64874fe20
Merge pull request #2555 from jackmakesthings/class-reference-formatting
...
Readability improvements for the in-game class reference
2015-10-17 10:04:51 -03:00
Juan Linietsky
0b5ac93875
Merge pull request #2569 from TheHX/issue_2567
...
Fix bug in EditorPlugin::add_custom_control
2015-10-17 09:49:00 -03:00
MarianoGNU
a5ebb52500
Merge branch 'master' of https://github.com/okamstudio/godot
...
# Solved Conflicts:
# tools/editor/property_editor.cpp
2015-10-16 23:21:39 -03:00
reduz
078a474135
-fixes and more fixes to new scene system, seems stable now..
...
BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!!
2015-10-16 19:11:23 -03:00
reduz
6b20ee4324
Merge branch 'master' of https://github.com/okamstudio/godot
2015-10-10 09:09:59 -03:00
reduz
422929e87f
Large improvements on scene packing and management
...
-Ability to edit and keep changes of instanced scenes and sub-scenes
-Ability to inherit from other scenes
2015-10-10 09:09:09 -03:00
