Commit graph

831 commits

Author SHA1 Message Date
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
reduz
aad2bbdb6f newline fixes 2015-10-08 15:00:40 -03:00
Jorge Araya Navarro
613962d48a Minor changes: Organizing imports 2015-10-07 13:24:52 -06:00
Jorge Araya Navarro
0fb91ef95b Minor changes 2015-10-07 13:15:28 -06:00
Jorge Araya Navarro
68d005760b Internationalization implemented
Specify which language you want the templates translate to with the
`--language` option and any choice language available. By default
English is used. When class_list.xml is translated to different language
than English this option will be useful to make the template language
match.
2015-10-07 13:11:17 -06:00
Jorge Araya Navarro
7c843fbc04 Refactoring some strings and ordering imports 2015-10-06 19:50:55 -06:00
Franklin Sobrinho
a609a567ea Fix bug in EditorPlugin::add_custom_control, fixes #2567 2015-10-04 08:29:19 -03:00
George Marques
6e87314d83
Add support for Opus audio format 2015-10-02 14:25:38 -03:00
Juan Linietsky
e055247b17 -Added ability to use cubic interpolation on image resize (little more quality on non-po2 resizing)
-Added ability for exporter to shrink images to non-integer values. Helps if you want to convert your game artwork from 1080->720 or similar
2015-10-01 16:25:36 -03:00
Jack Gold
f36d0fe4c5 Small readability fixes for the in-game class reference - fixes #2515 and #2393 (text spacing and top/left padding for the text area, respectively). 2015-09-29 22:38:23 -04:00
Juan Linietsky
8154dff3d0 Merge pull request #2528 from MarianoGnu/sprite-edit
SpriteRegionEditor
2015-09-28 09:32:42 -03:00
MarianoGNU
3e6aaec193 Add SpriteRegionEditor and update Polygon2DUVEditor
Both with snap and grid support
2015-09-28 00:06:06 -03:00
Jorge Araya Navarro
7a008afc67 XML to Open Project Wiki implemented 2015-09-27 19:25:13 -06:00
Jorge Araya Navarro
f95f099eb2 Adding the new Python file
This script works different compared to the other, for instance, it
requires Python 3.x to run. It also have more sophisticate flags to
run. And finally this file conforms to PEP8.

This script is not finished yet, though.
2015-09-26 23:55:00 -06:00
Juan Linietsky
9962518ffd Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-24 18:07:13 -03:00
Juan Linietsky
82a3304458 Added ability to set custom mouse cursors. Not hardware accelerated yet. 2015-09-24 18:06:15 -03:00
Bojidar Marinov
38a5e023af Fix a bug with doctool (" >")
Please test, this was made from GitHub GUI, so couldn't test it myself.
2015-09-23 17:16:39 +03:00
Juan Linietsky
83d9a692be Ability to visually debug geometry visually:
-Visible 2D and 3D Shapes, Polygons, Tile collisions, etc.
-Visible Navmesh and Navpoly
-Visible collision contacts for 2D and 3D as a red point
-Customizable colors in project settings
2015-09-20 13:03:46 -03:00
Sergey Lapin
4210d5e459 Remove of use_exclude_ctrl_bones option
use_exclude_ctrl_bones option is not implemented.
This option is supposed to filter-out unneeded skeleton bones.
This option was never implemented (in repository) and confuses
users that feature exists.
This commit removes this option as this option implementation
is not happenning any time soon and claim it exists
confuses users into thinking the feature is supported.

Closes #2476
2015-09-18 12:52:34 +03:00
firefly2442
afbb6c064c ran cppcheck, found unused variables 2015-09-16 15:35:30 -05:00
Juan Linietsky
889d21e004 Merge pull request #2352 from xodene/patch-6/script-file-new
Add "New" script button to Script Editor Popup Menu
2015-09-16 09:55:10 -03:00
George Marques
1add3b3dac
Set AnimationEditor UndoRedo reference on creation
Fix #2418
2015-09-13 16:21:09 -03:00
Juan Linietsky
3013a83f2f Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-10 00:12:05 -03:00
Juan Linietsky
0fb7b5aa0c HTML5 exporter Improvements
-Better template handling
-Voice support
-Stream support
2015-09-10 00:10:54 -03:00
Juan Linietsky
9741374617 Rewrite of the AudioStream API
-Fixes long-standing issues regarding to playing a single stream multiple times simultanteously
-Fixes wrong-looping, starting, caching, etc. Issues resulting from bad original design
-Allows more interesting kinds of streams (stream graphs with streams inside streams!) in the future
2015-09-09 18:50:52 -03:00
Peace Sells
fca36207e3 Fixed bug with adding an instance from the FIleSystem dialog. 2015-09-07 19:55:47 -06:00
Franklin Sobrinho
b3e60585c2 Possible fix for issue #2113
* closes #2113
2015-09-07 10:13:29 -03:00
Franklin Sobrinho
d6aed94651 Fix for issue #2117 2015-09-07 08:20:33 -03:00
Juan Linietsky
b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -03:00
Juan Linietsky
688047a4c9 -removed resources dock, good bye old friend 2015-09-01 00:49:47 -03:00
Juan Linietsky
cf57a654d7 new editor settings customization of where to run the game from the editor 2015-08-30 23:36:46 -03:00
Mariano Javier Suligoy
553edf1f25 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	scene/gui/spin_box.cpp
#	scene/gui/tree.cpp
2015-08-30 19:39:36 -03:00
Mariano Javier Suligoy
680402cebf Add missing icons, also make MSVC2010 happy 2015-08-30 19:37:23 -03:00
Juan Linietsky
cb6839c5c1 make moving up&down items from the autoload list work 2015-08-30 17:48:29 -03:00
Juan Linietsky
947b283248 -fix compile issue (pow)
-ask user for track to call nodes when adding call track
2015-08-30 10:10:51 -03:00
Mariano Javier Suligoy
c688b55019 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h
2015-08-30 02:48:45 -03:00
Mariano Javier Suligoy
a19a653e2c Compile shaders using default values. 2015-08-30 02:44:49 -03:00
Juan Linietsky
1bad27e1f8 -Properly keep animation editor and viewport state while switching scene tabs 2015-08-29 22:59:25 -03:00
Mariano Javier Suligoy
ea448cb779 Edit default values. WARNING!!!
Do not merge these changes, default values are not compiled into shaders yet!
2015-08-29 21:09:11 -03:00
Juan Linietsky
b4acd18f32 -display/emulate_touchscreen now really emulates a touchscreen
-icons to show node menus
2015-08-29 17:16:11 -03:00
Juan Linietsky
1fecba6b5b -added hints to sprite v/hframes, fixes truncation problem
-removed an error being printed often unnecesarly about missing child
2015-08-29 13:02:56 -03:00
Juan Linietsky
b0be30d9ef make sure array is created if not existing, as noted by Guilherme Felipe 2015-08-25 23:09:41 -03:00
Juan Linietsky
d50921b550 Show documentation for properties on hover.
This works if the property has been documented (about half are at this point)
2015-08-25 23:00:11 -03:00
Juan Linietsky
04cb3c9eb1 Ability to edit all kinds of arrays from the property editor.
Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 20:45:51 -03:00
Mariano Javier Suligoy
cbf05355ed Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-25 18:33:21 -03:00
Juan Linietsky
eff2931b2a Multiple, simultaneous node editing spuport!!
..but will you be brave enough to try it? :)
2015-08-25 00:08:45 -03:00
Mariano Javier Suligoy
54291c655d Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-24 21:33:00 -03:00
Juan Linietsky
0d77277a86 missing type icon 2015-08-24 09:40:48 -03:00
Juan Linietsky
5850b6b58a beautiful visual menu to change anchors
will you dare to try it? :)
because, I'd check previous commit msgs if I were you..
2015-08-24 01:00:39 -03:00
Juan Linietsky
4b40f9228b Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-23 20:22:08 -03:00
Juan Linietsky
07e9741425 **WARNING BEFORE PULLING**
This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools.
If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :)

Summary of Changes

-New Filesystem dock, with filesystem & tree view modes.
-New refactoring tools, to change or fix dependencies.
-Quick search dialog, to quickly search any file
2015-08-23 20:15:56 -03:00
Julian Murgia - StraToN
17fbd20673 Added close button to tab. Added 4 display policies for this close button (show always, show never, show active tab only, show hover). Set the scene tabs in editor to follow the hover policy. 2015-08-18 20:27:01 +02:00
Alexander Holland
f6eff87793 update scene tabs on save - fix 2015-08-12 22:35:37 +02:00
volzhs
edabbcd064 remove shift key check because shift + v in use with tool mode 2015-08-11 22:52:43 +09:00
volzhs
80943d77a4 prevent to change tool mode when control or shift key is pressed 2015-08-11 22:39:59 +09:00
Maximillian
bc9952f1c7 Fix create script dialog title(s) 2015-08-09 16:55:59 -07:00
Maximillian
8f83f6c675 Add create new script button to script editor menu 2015-08-09 16:39:59 -07:00
neikeq
d097d1081d Hide right_r dock slots by default 2015-08-09 21:59:13 +02:00
Mariano Javier Suligoy
3a83337420 Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-09 16:33:02 -03:00
Juan Linietsky
b3dff195e0 Merge pull request #2316 from StraToN/clearconsole
Clear output console (Button + clear on Play)
2015-08-08 11:07:36 -03:00
Juan Linietsky
9d185ccc30 -Merged the file server with the live editing and remote debug
-It is now really easy to deploy an android build with debug, and debug it
2015-08-06 02:37:40 -03:00
Juan Linietsky
8280bb0de0 more debugger fixes
-setting/clearing breakpoints during run-time now works
-multi-line strings resulted in wrong line numbers in bytecode, fixed
2015-08-04 20:17:39 -03:00
Juan Linietsky
d1da2c2995 error debugger
shows the list of errors that happened during running the game, traces
can be analyzed
2015-08-04 09:47:32 -03:00
Mariano Javier Suligoy
c88038228a Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-03 17:28:33 -03:00
Juan Linietsky
cbee679bd7 live debug fixes
removing node in live debugging fixed
2015-08-02 20:28:10 -03:00
Juan Linietsky
59961c9914 Live edit WORK IN PROGRESS
1) press the heart while the game is running
2) select a scene to live edit from the opened scenes
3) edit/add/remove nodes or resources, change their properties, etc.
4) watch changes reflected in running game, in all places this scene is
edited
5) It's not perfect obviously, but the aim of it is to try to reflect
your changes as best as possible in the running game.
2015-08-02 12:30:01 -03:00
Julian Murgia - StraToN
e6a711282a Damnit, forgot one more debug line >< 2015-07-30 00:10:21 +02:00
Julian Murgia - StraToN
6e608bd499 forgot to remove a method declaration... 2015-07-30 00:08:11 +02:00