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
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
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
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
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