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
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
f706e3e5d1
Merge pull request #1380 from ElectricSolstice/wparentheses_removal
...
Changed code to remove gcc -Wparentheses warnings.
2015-03-22 15:05:47 -03:00
6d813c81b8
Merge pull request #1460 from MarianoGnu/master
...
Create Checkbox class with support for Radio Buttons
2015-03-22 14:55:36 -03:00
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
cde55bee91
Fix for Issue #1484 : Don't strip whitespace on line comment
2015-03-22 10:25:18 +01:00
4d30bb7241
Fix issue #931 : display current view name into editor's 3d scene viewports
2015-03-21 21:47:21 +01:00
91744e9ed3
New Demo, Screen Space Shaders
...
-Fixes to screen space shaders.
-Fixes to isometric light demo.
2015-03-10 00:53:50 -03:00
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
63006f6f6f
Register CheckBox class to create it using editor.
2015-03-02 22:12:51 -03:00
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
41686d5fdd
Merge branch 'master' of https://github.com/okamstudio/godot into snapping2
2015-02-22 07:38:06 +10:00
402db5bd79
Renamed "snap to offset" to "snap relative". Better conveys meaning.
2015-02-20 22:21:59 +10:00
0e1f34b49d
Changed code to remove gcc -Wparentheses warnings.
2015-02-16 18:58:41 -08:00
56402900ff
View > Settings isn't a check item.
2015-02-17 02:51:17 +00:00
196185d0be
Merge branch 'master' of https://github.com/okamstudio/godot
...
Conflicts:
scene/2d/tile_map.cpp
2015-02-15 18:21:35 +10:00
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
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
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
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
6a38ab1b43
Reorder tile transforms so transpose occurs before flips. Much more intuitive for flipping transposed tiles.
2015-02-13 10:56:53 +10:00
c613fb121b
Moved wrapper function to TileMapEditor.
2015-02-11 21:40:50 +10:00
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
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
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
afa13bf868
Forgot to update tile transform buttons when picking tiles.
2015-02-03 19:51:21 +10:00
52700563bc
Finish GUI for tile transform.
2015-02-02 22:28:10 +10:00
ee44664b2a
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-02 21:34:47 +10:00
c5bf43f6eb
Working TileMap tile transpose transform.
2015-02-02 21:27:48 +10:00
c6eabbbec5
fixed world vertex issues in canvas item shader
2015-01-21 00:57:37 -03:00
11c1756257
Visual Shader Editing for 2D
...
Editing 2D shaders with visual editor seems to work now.
2015-01-20 20:36:25 -03:00
a8b318871c
Prep for tile transpose transform.
2015-01-19 23:07:25 +10:00
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
6f3c09047e
-intentional breakage of shader graph to fix issues, existing graphs will be broken, sorry :(
2015-01-18 09:51:11 -03:00
5a4ef1c2cc
fixes
2015-01-17 14:05:26 -05:00
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
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
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
d0055a751b
Add current_line_color ediotr setting for script and shader editor
2015-01-15 16:59:07 +08:00
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
f3dc51fc69
2D shader progress
2015-01-11 20:52:42 -03:00
fc4d6765f1
Fixes #1160
...
Fixed curve handles not taking current zoom level into consideration
when being dragged
2015-01-11 12:18:10 +00:00
6c4e1650fb
add option to automatically reload changed scripts
2015-01-10 12:55:12 -05:00
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
3f1dd9c57f
-Fixed matrix and vec+scalar multiplication issues, fixes #1143
2015-01-07 20:29:05 -03:00
1659f82e7e
-changed type of C component of vec interp, fixes #1144
2015-01-07 19:48:38 -03:00
7a0e4c822c
-Visual Shader Editing Finished, PLEASE TEST!
2015-01-07 01:45:46 -03:00
1ff0d5c4e5
-attempt to be friendlier on non english keyboards
2015-01-04 22:39:21 -03:00
a8bcb96ad4
-Fix shortcuts for OSX code completion, fixes #1111
...
-Fixed how translation fallbacks works, fixes #1011
2015-01-04 11:03:31 -03:00
dc7ac86b79
-Completely removed EmptyControl (but added fallback), closes #1017
2015-01-03 17:24:16 -03:00
