asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2647 commits 1 branch 0 tags 2.2 GiB
Commit graph

803 commits

Author SHA1 Message Date
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
Julian Murgia - StraToN
c5941ab57a include not necessary anymore 2015-07-30 00:05:37 +02:00
Julian Murgia - StraToN
4ad590b92f Added automatic clear output on Play in Godot Settings 2015-07-30 00:03:25 +02:00
Julian Murgia - StraToN
f46e340ab5 Added "Clear" button top right of output debug console in editor 2015-07-29 00:41:24 +02:00
Juan Linietsky
ed85339bcb Merge pull request #2248 from romulox-x/colladaImagePath 
fixed image path problem in bettercollada
 2015-07-27 22:21:53 -03:00
Mariano Javier Suligoy
d7279ddaf2 Delete selected nodes with the Delete key 2015-07-26 21:57:27 -03:00
Juan Linietsky
07c99e11f5 QOL, script buttons in scene tabs 2015-07-26 10:44:35 -03:00
Mariano Javier Suligoy
add0105c4e Little fix: don't create an empty undo/redo command when trying to add a second Input GraphNode 2015-07-25 22:05:45 -03:00
Mariano Javier Suligoy
5ffd818fb1 Duplicate GraphNode(s) [Control+D] 2015-07-25 21:16:07 -03:00
Juan Linietsky
d50ebbb441 -added icons for root node types on tabs 2015-07-24 14:18:02 -03:00
blackwc
31fa1bb8bd Improve export validation 2015-07-22 12:51:17 -04:00
Mariano Javier Suligoy
2a43778793 Fix tab indent 2015-07-20 22:15:06 -03:00
Mariano Javier Suligoy
bdd12744fe Select and move multiple nodes at once 2015-07-19 01:48:46 -03:00
Mariano Javier Suligoy
5b71fc45b7 Use popup menu to add new nodes to the shader graph editor in the last clicked location. 2015-07-16 22:38:12 -03:00
Peace Sells
a009fadfff Added GridMap settings which allows the user to enter a pick distance. 2015-07-09 20:51:49 -06:00
romulox_x
1efeb8b956 when copy images enabled, 'images' path prefix was only being written to file if the destination file didn't exist. so it only worked the first time. 2015-07-09 17:34:12 -07:00
Juan Linietsky
95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources. 
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
 2015-06-29 00:29:49 -03:00
Juan Linietsky
a67486a39e improved get_node(), connect(), etc code completion. 
-properly completes text arguments
-includes the "/root" autoloads
 2015-06-26 01:14:49 -03:00
Juan Linietsky
29b2e811f6 added a tiny bit more space to docks and script tab 2015-06-24 18:57:14 -03:00
Juan Linietsky
30a94bcc9f fix connection dialog bug 2015-06-24 18:26:34 -03:00
Juan Linietsky
48f1d02da4 added ability to define signals in script 
closes #2175
 2015-06-24 13:29:45 -03:00
Franklin Sobrinho
5688b6157f CollisionShape2D visual editor 2015-06-23 12:20:34 -03:00
Juan Linietsky
8b61a3c358 Merge pull request #1907 from tommy3/show-hidden-files 
set initial flag 'show_hidden_files' for file dialogs in project manager initialization
 2015-06-23 00:01:55 -03:00
Juan Linietsky
5092cc46b4 Merge pull request #2070 from Krzycho666/AnimationPlayer_fix 
Animation player set_steps fix
 2015-06-22 23:57:28 -03:00
Juan Linietsky
6154cff93f Merge pull request #2101 from sanikoyes/Pr-script-editor-save-state 
Pr-Script editor
 2015-06-22 23:54:04 -03:00
Juan Linietsky
8f9f03e374 Merge pull request #2132 from gber/master 
Fix typo that produced invalid markup for images
 2015-06-22 23:45:21 -03:00
Juan Linietsky
29e644c20a Merge pull request #2144 from Krzycho666/UndoRedo_fix 
added GDscript bidings for UndoRedo class
 2015-06-22 23:42:13 -03:00
Franklin Sobrinho
0159cecd69 Small fixes for Grid/Tile map editor palette 2015-06-22 11:10:13 -03:00
Franklin Sobrinho
d68a33b473 Grid/Tile map editor new item palette 2015-06-22 10:05:03 -03:00
Juan Linietsky
e9bbb97acc Multiple scene editing *POTENTIALLY UNSTABLE* 
-ability to edit multiple scenes at the same time
-resource internal IDs are now persistent, this makes multiple scene
editing possible but maaaaay result in file corruption bugs (tested and
could not find anything but possibility exists because core code
changed, report immediately if you find this).
-properly save settings, layout, etc when edited
-script editing is independent from scene editing now
-show a yellow box when a script belongs to the scene
 2015-06-22 00:04:15 -03:00
krzycho
d65455185a - added GDscript bidings for UndoRedo class mechanizm 
- registered UndoRedo
 2015-06-21 22:23:09 +02:00
Guido Berhoerster
acbaefcc02 Fix typo that produced invalid markup for images 2015-06-20 14:47:06 +02:00
Juan Linietsky
37af8b4136 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-16 16:39:20 -03:00
Juan Linietsky
669f5c994b fix "v" pivot adjust function 2015-06-16 16:15:01 -03:00
sanikoyes
14cd70faf3 Script editor: restore line/column after script reload 2015-06-16 15:15:10 +08:00
Juan Linietsky
f2a29aadc6 fixed small refresh issue when moving docks 2015-06-14 01:09:58 -03:00
Juan Linietsky
7674bad6c4 fixes for dock motion 2015-06-14 00:41:08 -03:00
Juan Linietsky
8228fea02f missing changes 2015-06-14 02:13:47 -03:00
Juan Linietsky
edf1f27118 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-13 22:14:36 -03:00
Juan Linietsky
9a58960d28 some editor window changes 
-ability to make dock position configurable, and it gets saved
-editor starts maximized default
 2015-06-13 22:12:53 -03:00
Juan Linietsky
8945670bc0 made changing pivot simpler in 2D nodes (just press v with mouse over position) 2015-06-12 13:53:18 -03:00
krzycho
2287d030a2 fixed problem with crashing godot when changing number of steps while no animation added 2015-06-11 14:39:50 +02:00
Rodolfo Ribeiro Gomes
310f061a4a Small fix for Import Game dialog labels 2015-06-08 23:19:52 -03:00
Juan Linietsky
0351e3ae17 Merge pull request #2023 from TheJosh/dae-exporter-assimp 
Fix Blender DAE exporter - files are unreadable by Assimp
 2015-06-07 00:30:07 -03:00
Juan Linietsky
143265d4cb Merge pull request #1973 from Biliogadafr/ColorRamp 
Replace color phases with color ramp for Particles2D. (need some review/guidance)
 2015-06-07 00:26:35 -03:00
Juan Linietsky
b524b40fdc -fixed many memory initialization issues 
-fixed deadlock on previews thread
-fixed compilation errors on unix
 2015-06-06 22:06:58 -03:00
Juan Linietsky
6974823288 Merge remote-tracking branch 'origin/master' 
Conflicts:
	tools/editor/io_plugins/editor_texture_import_plugin.cpp
 2015-06-06 10:12:09 -03:00
Juan Linietsky
9acab32daa new file dialog! 
-ItemList control for easier lists/thumbnails
-New file dialog, with support for thumbnails, favorites, recent places,
etc
-Moved .fscache out of the project, no more bugs due to committed/pulled
.fscache!
-Dir dialog now sorts directories
 2015-06-06 09:44:38 -03:00
Josh Heidenreich
ee04b41a97 Fix DAE exporter - files unreadable by Assimp 
Colours came though as 3x component instead of 4x component.
Index of refraction was in the wrong place.
 2015-06-02 21:15:37 +09:30
Juan Linietsky
ab99671bb8 -fixes to navigation, so edge-merging is more flexible on conflict 
-add tab support to richtextlabel
-some click fixes to audio stream resampled
-ability to import largetextures (dialog)
 2015-06-01 19:42:34 -03:00
reduz
07a466f6e6 mesh preview 2015-05-31 21:13:24 -03:00
Juan Linietsky
d5348eebdc work in progress, resource previews 2015-05-31 02:00:18 -03:00
Juan Linietsky
f62961aba3 -fix bug in animation editor 
-fix crash bug in physics motion, closes #1993
 2015-05-27 17:30:50 -03:00
Juan Linietsky
9df77d2765 ability to run 2D physics in a thread 
also, 2D physics is now thread safe too.
see physics_2d/thread_model
 2015-05-26 01:06:05 -03:00
Juan Linietsky
f36e7dcb40 improved animation editor 
-same-value link keys
-new layout
-forward, backwards playback
-integrated curve/property editor
-auto increment sprite frame after insert
-copy & paste animation resoucres
 2015-05-25 01:47:02 -03:00
Biliogadafr
df9d48d9b5 Replace color phases with color ramp for Particles2D. 2015-05-24 21:18:52 +03:00
Juan Linietsky
bb5d46bb11 Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-21 15:02:49 -03:00
Juan Linietsky
1e50677594 fixes on sample importing 2015-05-19 23:37:04 -03:00
Juan Linietsky
f220183e40 fix a crash situation when starting a thread and other small fixes 2015-05-18 12:45:53 -03:00
Juan Linietsky
5900e7f589 fix a compile error 2015-05-18 11:14:02 -03:00
Juan Linietsky
e323cc0505 -Rename unexisting by nonexistant, closes #1940 
-Added function to retrieve list of actions fron InputMap
 2015-05-18 10:20:54 -03:00
Juan Linietsky
5272853cdc -changed some copyrights to 2015 2015-05-17 18:19:24 -03:00
Juan Linietsky
2696ecb769 reinstante focus into textedit after menu used in code editor 2015-05-17 15:38:24 -03:00
Juan Linietsky
e72717e373 properly save external resources, fixes #1924 
added API to get scancode names to OS
 2015-05-17 13:15:23 -03:00
Juan Linietsky
70c2c7a3f9 Merge pull request #1900 from guilhermefelipecgs/fix_#1898 
Fix find option in Help tab. #1898
 2015-05-16 16:18:17 -03:00
Juan Linietsky
744f778707 Merge pull request #1761 from est31/master 
Fix headless exporting bugs
 2015-05-16 13:43:38 -03:00
tommy3
282c392466 set initial flag 'show_hidden_files' for file dialogs in project manager initialization 2015-05-14 23:50:15 +02:00
Guilherme Felipe
96a86fdf75 Fix #1898 2015-05-13 23:27:13 -03:00
Juan Linietsky
4363798608 -Fixed bug in translation remaps, also added proper demo, maybe fixes #1729 2015-05-12 07:31:15 -03:00
Juan Linietsky
bc0ef64bed fixed crash on make resources unique menu option, fixes #1874 2015-05-11 21:23:29 -03:00
Juan Linietsky
4b8745ad63 Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-11 15:49:41 -03:00
Juan Linietsky
421b4fec3e -compatibility option for physicsbody layers, fixes #1842 2015-05-10 15:58:08 -03:00
Juan Linietsky
1310e09c73 corrected copyright date in project manager, fixes #1870 2015-05-09 13:11:59 -03:00
ehriche
897a1aade5 optional formal changes 2015-05-06 01:22:31 +02:00
ehriche
dcc93a33fd fixed SpatialEditor::_init_indications. loopcounter "i" used ambiguous 2015-05-06 00:49:00 +02:00
ehriche
d177e0f64a fixed issue with format string in PCKPacker::flush 2015-05-06 00:46:02 +02:00
est31
584f4470c8 Abort when exporting fails 2015-05-05 18:19:14 +02:00
est31
1268e65aa5 Set settings directory variable when loading settings fails 
This makes export work when you are first running godot for your user.
 2015-05-05 18:19:14 +02:00
Juan Linietsky
74b0e0c296 fix crash in editor when using alt+arrows to indent, thanks adolson and romulox_x 2015-05-05 00:17:22 -03:00
Juan Linietsky
68700ee3a9 Proper support for code editor autosaving (disabled by default) 2015-05-04 23:32:40 -03:00
Juan Linietsky
2a02d3f96f fix font import path on windows, closes #1675 2015-05-04 15:06:41 -03:00
Juan Linietsky
30f652998d Merge pull request #1738 from jackmakesthings/master 
Updating demo engine.cfgs where name is missing
 2015-05-03 23:00:26 -03:00
Juan Linietsky
dda60296d8 Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-01 23:20:41 -03:00
Juan Linietsky
fb8b740fcb -fixed default godot logo 
-made the packagename generated from name by default
 2015-05-01 23:20:05 -03:00
Juan Linietsky
4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
Juan Linietsky
fa83cf3c96 label properly adjusted to size when inserting key, fixes #1607 2015-04-28 22:46:05 -03:00
Juan Linietsky
eeb0fcfb41 fix quit bug on linux when using alt-f4, fixes #1677 2015-04-26 19:02:32 -03:00
jack
d22a13e2e8 issue #1715 - menu separator 
There was a request for a separator between Open Scene and Save Scene to avoid accidental mis-clicks. So here's that!
 2015-04-25 22:45:49 -04:00
Juan Linietsky
807a811fad changed some shortcuts in text editor, maybe fixes #1732 2015-04-24 16:25:27 -03:00
Juan Linietsky
4fb905ed29 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-24 15:09:47 -03:00
Juan Linietsky
115f55e972 local changes 2015-04-24 15:09:35 -03:00
Juan Linietsky
b09a8bd32f fix to collada import crash 2015-04-23 22:42:52 -03:00
Juan Linietsky
5e03874571 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-22 23:31:09 -03:00
Juan Linietsky
c43dfddb65 Changed collada importer to properly handle ALL blend shape arrays, fixes problems with animated normals, uvs, etc. 2015-04-22 23:29:03 -03:00
Juan Linietsky
1721ef17d6 disable apply modifiers by default in export flag 2015-04-22 18:20:29 -03:00
Juan Linietsky
66c71c21df resolved some cases wehre built-in doc is not properlt generated, fixes #1719 2015-04-22 00:25:13 -03:00
Juan Linietsky
8aab677906 corrected project manager popup, fixes #1721 2015-04-21 21:30:00 -03:00
Juan Linietsky
93ce7d92c1 -Many fixes and demo for RichTexLabel 
-Proper ability to edit BBCode in RTL.
 2015-04-21 16:01:58 -03:00
Juan Linietsky
59154cccf9 -Changed Godot exit to be clean. 
-Added more debug information on memory cleanliness on exit (if run with -v)
-Fixed several memory leaks, fixes #1731, fixes #755
 2015-04-20 19:38:02 -03:00
Juan Linietsky
1de1a04b78 -fix local and global usage for DirAccess, fixes #791 
please test anyway..
 2015-04-18 20:11:33 -03:00
Juan Linietsky
b66b86b05e -Fixed post-import script-reload buf, fixes #1683 2015-04-18 19:06:58 -03:00
Juan Linietsky
bedb4f1ab2 Merge pull request #1662 from TheHX/fix_plugins 
Fix toolbar menu position(RichText and MultiMesh plugins)
 2015-04-18 14:45:29 -03:00
Juan Linietsky
fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
Juan Linietsky
2998515442 -Fix issue of scene import script path being broken on reimport, fixes #1668 2015-04-13 09:21:34 -03:00
Juan Linietsky
2dfa1279ea improved save path error messages for scene, textures and audio, fixes #1514 2015-04-12 16:45:59 -03:00
Juan Linietsky
ab6eaa3de4 renamed scrts to scripts, fixes #1525 2015-04-12 15:40:08 -03:00
Franklin Sobrinho
5cb4ba24d3 Fix toolbar menu position(RichText and MultiMesh plugins) 2015-04-09 09:48:46 -03:00
Franklin Sobrinho
59692d9012 Changed popup_centered by popup_centered_minsize in editor dialogs 2015-04-08 14:02:13 -03:00
Juan Linietsky
e18c6ef63b -Better Collada now keeps mesh names properly from blender, makes the "overwrite existing, keep materials" import mode work properly. 2015-04-08 01:46:55 -03:00
Juan Linietsky
b016f3898b fixed re-import of scene when new nodes are added, fixes #1620 2015-04-08 01:11:50 -03:00
Juan Linietsky
ef222aea89 Merge pull request #836 from adolson/new-default-project-icon 
new default project icon
 2015-04-07 20:25:33 -03:00
Juan Linietsky
e336306e91 Merge pull request #1554 from NateWardawg/inspectorupdate 
Camel casing being capitalized only happens in the inspector now.
 2015-04-07 20:22:09 -03:00
Juan Linietsky
d1567636f4 Merge pull request #1569 from sanikoyes/Pr-sort-sample-library 
Pr-sort-sample-library
 2015-04-07 20:17:16 -03:00
Juan Linietsky
5ed2600279 Merge pull request #1580 from UsernameIsAReservedWord/fixes_help_background_color_theme 
fixes #332 : makes EditorHelp uses EditorSettings bg color
 2015-04-07 20:15:06 -03:00
Juan Linietsky
b1bf4fcef2 Merge pull request #1591 from MostafaHassan/pr_FixCrashInVisualShader 
(Fix crash) in visual shader for curve remap node
 2015-04-07 20:14:10 -03:00
Juan Linietsky
9c1fef866f Merge pull request #1602 from TheHX/fix_issue_#1594 
Fix Issue #1594
 2015-04-07 20:12:39 -03:00
Juan Linietsky
b36e41cb71 Added a PVRTC encoder for iOS 2015-04-06 21:48:20 -03:00
Franklin Sobrinho
f77349a4c2 Better fix 2015-04-03 10:28:30 -03:00
Franklin Sobrinho
aa929bc1f1 fix_issue_#1594 2015-04-02 15:32:37 -03:00
Juan Linietsky
1572238adb merging okam changes 2015-04-02 07:22:17 -03:00
mostafahassan
78d734873d Fixed crash when trying to add keypoints and deleting them while holding mouse button down. 2015-03-31 22:49:11 +02:00
mostafahassan
3d4cc27bad New node will be added to root node if nothing is selected 2015-03-31 20:26:38 +02:00
yg2f
303ce0ea32 makes_editorhelp_uses_editor_settings_bg_color 
This fixes issue #332 by using the "text_editor/background_color" editor
setting as background color for the EditorHelp.
 2015-03-26 15:45:53 +01:00
sanikoyes
1515de217e Sort sample lists by name(more readable) 2015-03-25 10:57:35 +08:00
Juan Linietsky
92905075d3 crash bug solved, fixes #1560 2015-03-23 13:44:03 -03:00
Juan Linietsky
7ad7f2f6a9 android fixes, please test 
(can' t build android atm)
 2015-03-23 11:31:23 -03:00
Nathan Warden
21eb3b2a83 Camel casing being capitalized only happens in the inspector now. 2015-03-23 00:08:07 -05:00
Carl Olsson
b9bd83e178 Merge branch 'master' of https://github.com/not-surt/godot into snapping2 2015-03-23 08:31:54 +10:00
Carl Olsson
817f9debe7 Add iostream include to collada plugin and change to light occluder to use canvas item snap function. 2015-03-23 08:24:52 +10:00
Carl Olsson
fb2cdfe7ed Merge branch 'master' of https://github.com/not-surt/godot into snapping2 
Conflicts:
	tools/editor/plugins/canvas_item_editor_plugin.cpp
	tools/editor/plugins/canvas_item_editor_plugin.h
 2015-03-23 08:19:20 +10:00
Juan Linietsky
23e13ce3c2 fixes to new window management API 
-needs testing on Linux
-needs testing on Windows
-NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
 2015-03-22 19:00:50 -03:00
Juan Linietsky
c16276b414 Merge pull request #1378 from erbridge/settings_not_checkbox 
Make View > Settings a non check item
 2015-03-22 15:06:01 -03:00
Juan Linietsky
f706e3e5d1 Merge pull request #1380 from ElectricSolstice/wparentheses_removal 
Changed code to remove gcc -Wparentheses warnings.
 2015-03-22 15:05:47 -03:00
Juan Linietsky
68c3e82f7a Merge pull request #1433 from cheece/patch-1 
COLLADA load morph target normals
 2015-03-22 15:01:01 -03:00
Juan Linietsky
6d813c81b8 Merge pull request #1460 from MarianoGnu/master 
Create Checkbox class with support for Radio Buttons
 2015-03-22 14:55:36 -03:00
Juan Linietsky
a8f55d11d3 Merge pull request #1480 from theuserbl/patch-2 
Changed *_scene() to *_tree() in the time-example
 2015-03-22 14:54:06 -03:00
Juan Linietsky
47efcff8bb Merge pull request #1535 from rollenrolm/hidden_files 
New option to show/hide hidden files
 2015-03-22 14:46:09 -03:00
Juan Linietsky
1aaaee99e9 Merge pull request #1537 from rollenrolm/issue_#931 
Fix issue #931: display current view name into editor's 3d scene viewpor...
 2015-03-22 14:44:29 -03:00
rollenrolm
cde55bee91 Fix for Issue #1484: Don't strip whitespace on line comment 2015-03-22 10:25:18 +01:00
rollenrolm
4d30bb7241 Fix issue #931: display current view name into editor's 3d scene viewports 2015-03-21 21:47:21 +01:00
rollenrolm
db0a71fc58 New option to show/hide hidden files 2015-03-21 18:33:32 +01:00
Juan Linietsky
acc6f3b285 signed distance field font support 2015-03-21 00:43:33 -03:00
Juan Linietsky
90a84b4ddb wip distance field font import 
font import may not work if using distance field, this is WIP
 2015-03-20 00:26:01 -03:00
Juan Linietsky
a969e2e6f1 Area2D can now detect overlap with other areas 
this should make everything simpler, specially for newcomers to Godot
 2015-03-17 00:45:25 -03:00
Juan Linietsky
53e1694e1e New option to send canvas to render buffer 
allows to use 3D environment effects for post processing such as Glow,
Bloom, HDR, etc. in 2D.
 2015-03-16 01:14:59 -03:00
Juan Linietsky
650e13f3cd back buffer copy node, to improve on texscreen() 
back buffer copy node and respective demo
 2015-03-12 01:05:50 -03:00
Juan Linietsky
57380f9aba increase minimum range in property editor a bit 2015-03-10 09:53:22 -03:00
Juan Linietsky
91744e9ed3 New Demo, Screen Space Shaders 
-Fixes to screen space shaders.
-Fixes to isometric light demo.
 2015-03-10 00:53:50 -03:00
Juan Linietsky
09489e3a78 lot of work on 2D lighting and isometric maps 
added a new demo, isometric_light that does full isometric sorting,
lights, shadows, etc.
 2015-03-09 02:34:56 -03:00
theuserbl
31e6c6ca8f Changed *_scene() to *_tree() 
Changed _enter_scene and _exit_scene() to _enter_tree() and _exit_tree() in the time-example, because the *_scene no longer work.
 2015-03-05 23:05:30 +01:00
Juan Linietsky
2c2894ceb6 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	modules/gdscript/gd_tokenizer.cpp
	scene/resources/shader_graph.h
 2015-03-03 14:41:36 -03:00
Juan Linietsky
4d2198110b merges from okam repo 2015-03-03 14:39:13 -03:00
Mariano Javier Suligoy
63006f6f6f Register CheckBox class to create it using editor. 2015-03-02 22:12:51 -03:00
Juan Linietsky
a1f715a4da support for 2D shadow casters 
Added support for 2D shadow casters.

*DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a
CanvasItem and pull this, you will lose them. Shaders now work through a
2D material system similar to 3D. If you don't want to lose the 2D
shader code, save the shader as a .shd, then create a material in
CanvasItem and re-assign the shader.
 2015-03-02 00:54:43 -03:00
Mariano Javier Suligoy
e8e9f100e5 Add CheckBox control with theme edition and radio icon avaible. 2015-03-01 11:23:05 -03:00
cheece
1444946006 COLLADA load normals from morph target 
if the file has normals use them!
 2015-02-24 20:13:21 -04:30
Carl Olsson
41686d5fdd Merge branch 'master' of https://github.com/okamstudio/godot into snapping2 2015-02-22 07:38:06 +10:00
Juan Linietsky
1d7337ba10 Merge pull request #1369 from not-surt/tile_rotation 
Tile Rotation
 2015-02-21 15:37:02 -03:00
Carl Olsson
402db5bd79 Renamed "snap to offset" to "snap relative". Better conveys meaning. 2015-02-20 22:21:59 +10:00
Nathan Warden
c6a87d3a50 Changed the tooltip message for instancing a scene. 
- Old wording was misleading as it gave the impression that you could select any node from another scene.
- New wording matches the functionality that you instance the entire scene as a single node.
 2015-02-19 11:15:13 -05:00
ElectricSolstice
0e1f34b49d Changed code to remove gcc -Wparentheses warnings. 2015-02-16 18:58:41 -08:00
Felix Laurie von Massenbach
56402900ff View > Settings isn't a check item. 2015-02-17 02:51:17 +00:00
reduz
2bea642583 -Some more work on 2D Lights (NOT FUNCTIONAL YET!) 2015-02-16 14:45:11 -03:00
Carl Olsson
196185d0be Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	scene/2d/tile_map.cpp
 2015-02-15 18:21:35 +10:00
Carl Olsson
e2c8aecb3d Better 2D Snapping 
Consolidated duplicate snapping functions into CanvasItemEditor.
Allow non-square grids.
Add grid origin offsets.
Allow seperate toggling of grid display.
Add rotation snapping.
Add offset snapping.
 2015-02-15 18:00:55 +10:00
Juan Linietsky
7ebb224ec1 Merge pull request #1362 from not-surt/tile_map_body_mode 
Added body mode property for TileMap as kinematic body
 2015-02-14 19:25:35 -03:00
Juan Linietsky
c5f509f238 New Navigation & Pathfinding support for 2D 
-Added Navigation & NavigationPolygon nodes
-Added corresponding visual editor
-New pathfinding algorithm is modern and fast!
-Similar API to 3D Pathfinding (more coherent)
 2015-02-14 12:10:15 -03:00
Carl Olsson
9d182e93a3 Added body mode property to TileMap to select between static and kinematic physics bodies. Kinematic allow use of TileMaps for moving platforms for example. 
Updated 2D Platformer demo to use kinematic TileMaps for moving platforms, in doing so discovered that the tileset was messed up and not converting properly, so fixed that too.
And in order to fix the tileset I need to activate snapping for collision polygon vertices.
 2015-02-13 20:49:21 +10:00
Carl Olsson
6a38ab1b43 Reorder tile transforms so transpose occurs before flips. Much more intuitive for flipping transposed tiles. 2015-02-13 10:56:53 +10:00
Carl Olsson
c613fb121b Moved wrapper function to TileMapEditor. 2015-02-11 21:40:50 +10:00
Carl Olsson
573ae5dd92 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	demos/2d/polygon_path_finder_demo/.fscache
 2015-02-11 21:15:49 +10:00
Carl Olsson
9171f71ff5 Revert variant arg length to 5 and add 5 arg wrapper function for TileMap set_cell. 2015-02-11 21:11:14 +10:00
Juan Linietsky
7f88df73be Merge pull request #1346 from Nulifier/import-plugin 
Added the ability to add and remove editor import plugins.
 2015-02-11 07:07:59 -03:00
Jeffrey Steward
6e54fa3d47 Added get_gui_base to the EditorNode class to allow for import plugins to create centered Popups. 
This is the function used by all the built-in import plugins. Without this, the only alternative is to add it to the EditorNode itself which messes up auto-centering and sizing.
 2015-02-10 11:17:48 -07:00
Jeffrey Steward
13dc6f53ca Added the ability to add and remove editor import plugins. 2015-02-09 23:36:16 -07:00
Juan Linietsky
80d0117b83 Merge pull request #1174 from adolson/autoreload-edited-scripts 
add option to automatically reload changed scripts
 2015-02-09 21:35:52 -03:00
Juan Linietsky
a1ff40100e Merge pull request #1243 from NateWardawg/ChangeRunSceneToRunProject 
Changed the "Start the scene (F5)." tooltip to say "Play the project (F5)."
 2015-02-09 21:32:20 -03:00
Juan Linietsky
63a4faac3a Merge pull request #1271 from NateWardawg/NestedSceneFix 
Pr - Fixed a bug where a user could add a cyclical dependency, causing a crash.
 2015-02-09 21:24:58 -03:00
Juan Linietsky
d45a227e25 Merge pull request #1303 from erbridge/revert_menu_item 
Add a revert menu item
 2015-02-09 21:21:48 -03:00
Segey Lapin
2c8cc632d2 io_scene_dae: fixed invalid variable name 2015-02-04 04:40:09 +03:00
Carl Olsson
afa13bf868 Forgot to update tile transform buttons when picking tiles. 2015-02-03 19:51:21 +10:00
Carl Olsson
52700563bc Finish GUI for tile transform. 2015-02-02 22:28:10 +10:00
Carl Olsson
ee44664b2a Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-02 21:34:47 +10:00
Carl Olsson
c5bf43f6eb Working TileMap tile transpose transform. 2015-02-02 21:27:48 +10:00
Felix Laurie von Massenbach
5e1e78b257 Show a confirmation for the revert action. 2015-01-27 00:00:07 +00:00
Felix Laurie von Massenbach
ce488e1f93 Move the Revert Scene menu item to be less intrusive. 2015-01-26 23:51:13 +00:00
Felix Laurie von Massenbach
977b190a2d Add a revert menu item. 2015-01-25 00:14:06 +00:00
Juan Linietsky
c6eabbbec5 fixed world vertex issues in canvas item shader 2015-01-21 00:57:37 -03:00
Juan Linietsky
11c1756257 Visual Shader Editing for 2D 
Editing 2D shaders with visual editor seems to work now.
 2015-01-20 20:36:25 -03:00
Nathan Warden
0e8987abaf Fixed a bug where if a scene hadn't been saved it would find a cyclical dependency. 2015-01-20 09:05:22 -05:00
Nathan Warden
92cc7b840e Fixed a bug where a user could add a cyclical dependency, causing a crash. 2015-01-19 15:47:50 -05:00
Carl Olsson
a8b318871c Prep for tile transpose transform. 2015-01-19 23:07:25 +10:00
Juan Linietsky
a0511ed59a Color Ramp and Curve Map added to visual shader editing. 
Added Color Ramp and Curve Map to shader nodes.
Fixed an issue that crashed Godot Editor right when opened.
 2015-01-19 02:39:58 -03:00
Juan Linietsky
6f3c09047e -intentional breakage of shader graph to fix issues, existing graphs will be broken, sorry :( 2015-01-18 09:51:11 -03:00
Dana Olson
5a4ef1c2cc fixes 2015-01-17 14:05:26 -05:00
Juan Linietsky
cdf3c5b0eb Merge pull request #1181 from adolson/duplicate-node-naming-prefs 
fix naming of duplicated nodes, closes #1161
 2015-01-17 09:48:11 -03:00
Juan Linietsky
938c6d0df3 Merge pull request #1204 from marynate/PR-new-default-theme 
new default theme
 2015-01-17 09:45:19 -03:00
Juan Linietsky
be7d8a182c Merge pull request #1225 from marynate/PR-script-editor-close-tab 
Only show Close Tab confirmation when script has unsaved change
 2015-01-17 09:42:06 -03:00
Juan Linietsky
9ce885ccd8 Merge pull request #1227 from marynate/PR-editor-line-color 
Add current_line_color editor setting for script and shader editor
 2015-01-17 09:41:47 -03:00
Juan Linietsky
bf4f439ae1 Merge pull request #1230 from ndee85/export_manager_additions 
Export Manager Fixes
 2015-01-17 09:41:24 -03:00
Carl Olsson
9bfb08830b Wrapped duplicated CellOp generation code in a function and added TileMap tile picking with Ctrl+LMB. 2015-01-17 16:48:21 +10:00
Nathan Warden
2fd9292b12 Changed the "Start the scene (F5)." tooltip to say "Play the project (F5)." 2015-01-16 23:17:12 -05:00
Andreas Esau
904770fb91 Export Manager Fixes 
- fixed a bug where it could happen that objects did not get exported
- fixed some script errors
- added the feature to export particle dupliobjects. Now you can add objects with the particle system and get them directly exported.
 2015-01-15 22:22:12 +01:00
marynate
d0055a751b Add current_line_color ediotr setting for script and shader editor 2015-01-15 16:59:07 +08:00
marynate
d2a0f86d9f Only show Close Tab confirmation when script has unsaved change;Update Close Tab message to emphasize the fact script will be saved when closing tab;Stop dumping 'applying code' message to console 2015-01-15 15:55:18 +08:00
Ralf Hölzemer
6983cb80ea More desaturated icons 2015-01-15 13:29:57 +08:00
Ralf Hölzemer
ae70108883 New iteration of the theme 
- try to implement ndee's mockup from the forum
- new color palette
- get rid of most gradients

probably needs some more tweaks
 2015-01-15 13:29:54 +08:00
Ralf Hölzemer
7b9f5e65c9 New neutral default theme 
- desaturated UI elements to grey
- desaturated all near-white icons to grey
- changed some hardcoded colors
 2015-01-15 13:29:53 +08:00
Juan Linietsky
250188e1aa Merge pull request #1215 from Qwertie-/PR-GUI 
Fixed typo in error message
 2015-01-14 08:25:18 -03:00
Luke Picciau
b734c838db Fixed typo in message 2015-01-14 12:02:55 +10:30
Juan Linietsky
823d7ae3b5 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-13 11:23:05 -03:00
Juan Linietsky
7c7ab30c4e fixes 2015-01-13 11:22:56 -03:00
reduz
f3dc51fc69 2D shader progress 2015-01-11 20:52:42 -03:00
BenH
fc4d6765f1 Fixes #1160 
Fixed curve handles not taking current zoom level into consideration
when being dragged
 2015-01-11 12:18:10 +00:00
Dana Olson
9bbc3f0c94 fix naming of duplicated nodes, closes #1161, adds separator character preferences 2015-01-11 00:08:32 -05:00
Dana Olson
6c4e1650fb add option to automatically reload changed scripts 2015-01-10 12:55:12 -05:00
Juan Linietsky
0a6f409323 Merge pull request #1156 from marynate/PR-fix-compile-tools-no 
Fix compile error when tools=no
 2015-01-09 08:40:07 -03:00
Dana Olson
66a2adbf4b mergable version of ndee's pull request 2015-01-09 01:36:38 -05:00
marynate
e2f5cf3ef0 Fix compile error when tools=no 2015-01-09 11:20:02 +08:00
Maximillian
5b7b817c9b Merge branch 'fix_debug_process_exited_alert' 2015-01-08 09:33:40 -07:00
Maximillian
41b3a1fea3 Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-08 09:30:13 -07:00
Maximillian
f1b9994cbc Fix process being debugged has exited pop up #1128 2015-01-08 09:14:56 -07:00
Juan Linietsky
78f4b93703 Fixes to GraphEdit: 
-Working area is bigger now, solves #1148
-Using Position now works, fixes #1141
-RGB ops now work, fixes #1139
-Missing bindings to GraphEdit and GraphNode added
-Shader Graph Editor Shows errors on cyclic links and missing connections
 2015-01-08 00:41:34 -03:00
Juan Linietsky
3f1dd9c57f -Fixed matrix and vec+scalar multiplication issues, fixes #1143 2015-01-07 20:29:05 -03:00
Juan Linietsky
1659f82e7e -changed type of C component of vec interp, fixes #1144 2015-01-07 19:48:38 -03:00
Maximillian
5c5519e2c8 Merge remote-tracking branch 'upstream/master' 2015-01-07 10:23:00 -07:00
Juan Linietsky
7a0e4c822c -Visual Shader Editing Finished, PLEASE TEST! 2015-01-07 01:45:46 -03:00
Maximillian
5d86f845d7 fix little mistake that made the project run each save 2015-01-06 20:35:52 -07:00
Maximillian
cf616e5845 Prompt save dialog if running a unsaved scene. Solution for #966 2015-01-06 15:28:25 -07:00