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

249 commits

Author SHA1 Message Date
Franklin Sobrinho
d6aed94651 Fix for issue #2117 2015-09-07 08:20:33 -03:00
Mariano Javier Suligoy
680402cebf Add missing icons, also make MSVC2010 happy 2015-08-30 19:37:23 -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
Mariano Javier Suligoy
54291c655d Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-24 21:33:00 -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
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
Mariano Javier Suligoy
3a83337420 Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-09 16:33:02 -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
Mariano Javier Suligoy
c88038228a Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-03 17:28:33 -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
Mariano Javier Suligoy
d7279ddaf2 Delete selected nodes with the Delete key 2015-07-26 21:57:27 -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
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
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
Franklin Sobrinho
5688b6157f CollisionShape2D visual editor 2015-06-23 12:20:34 -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
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
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
8945670bc0 made changing pivot simpler in 2D nodes (just press v with mouse over position) 2015-06-12 13:53:18 -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
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
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
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
2696ecb769 reinstante focus into textedit after menu used in code editor 2015-05-17 15:38:24 -03:00
Juan Linietsky
421b4fec3e -compatibility option for physicsbody layers, fixes #1842 2015-05-10 15:58:08 -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
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
807a811fad changed some shortcuts in text editor, maybe fixes #1732 2015-04-24 16:25:27 -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
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
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
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
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
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
sanikoyes
1515de217e Sort sample lists by name(more readable) 2015-03-25 10:57:35 +08: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
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
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
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
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
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
Carl Olsson
41686d5fdd Merge branch 'master' of https://github.com/okamstudio/godot into snapping2 2015-02-22 07:38:06 +10:00
Carl Olsson
402db5bd79 Renamed "snap to offset" to "snap relative". Better conveys meaning. 2015-02-20 22:21:59 +10: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
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
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
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
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
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
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
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
marynate
d0055a751b Add current_line_color ediotr setting for script and shader editor 2015-01-15 16:59:07 +08:00