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
4d2198110b
merges from okam repo
2015-03-03 14:39:13 -03:00
a0ee5cc353
time was not being set properly with the rest of the uniforms.
2015-03-02 19:21:46 -03:00
440cc5e4b6
Merge pull request #1437 from Hinsbart/fix_win_joy
...
fix get joystick name from registry on some systems
2015-03-02 01:00:56 -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
0e732637d0
Merge pull request #1459 from romulox-x/blend_with_transparent_background
...
changed the blending function when using a transparent render target so ...
2015-03-01 20:52:20 -03:00
320700fc92
changed the blending function when using a transparent render target so that it blends properly
2015-03-01 15:44:02 -08:00
e15157f289
Merge pull request #1414 from romulox-x/viewport_clear_alpha
...
changed viewport clearing to use the alpha value of the clear color, and...
2015-03-01 18:58:50 -03:00
9229d9d1bb
fix get joystick name from registry on some systems
2015-02-25 16:33:08 +01:00
2ac767b1f5
changed viewport clearing to use the alpha value of the clear color, and made the transparent bg option of viewport force a clear color of 0,0,0,0
2015-02-21 13:57:12 -08:00
1d7337ba10
Merge pull request #1369 from not-surt/tile_rotation
...
Tile Rotation
2015-02-21 15:37:02 -03:00
57183a7783
Merge pull request #1410 from romulox-x/viewport_clear
...
added option to disable automatic clearing of viewport render buffer
2015-02-21 10:41:53 -03:00
f4312a5076
added option to disable automatic clearing of viewport render buffer
2015-02-21 01:35:06 -08:00
31e076d16a
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-19 18:13:15 -03:00
daeac73c54
restored @ for nodepaths/stringnames
2015-02-19 18:12:45 -03:00
15d97c1e08
Merge pull request #1398 from NateWardawg/rewording
...
Changed the tooltip message for instancing a scene.
2015-02-19 14:29:38 -03:00
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
3fdf3d8eab
-fix compilation of godot server
2015-02-19 11:54:03 -03:00
cf75bf842d
-improved pathfinding accuracy
...
(i hope?)
2015-02-19 00:27:02 -03:00
5ef3f7392f
support for light and normal mapping in 2D
2015-02-18 19:40:02 -03:00
63165d80d5
Merge pull request #1389 from greay/osx_build
...
fix a small build error on OS X
2015-02-18 00:51:28 -03:00
ef565b9778
fix for “no viable conversion from 'NSPoint' (aka '_NSPoint') to 'CGPoint'” build error on OS X
2015-02-17 19:19:29 -08:00
2bea642583
-Some more work on 2D Lights (NOT FUNCTIONAL YET!)
2015-02-16 14:45:11 -03:00
0fa1153ea7
Merge branch 'master' of https://github.com/okamstudio/godot into tile_rotation
2015-02-16 05:07:13 +10:00
d7ea20c166
Merge pull request #1371 from erbridge/fix_shadow_declaration
...
Fix a shadow declaration
2015-02-15 16:03:18 -03:00
2478935f96
Fix a shadow declaration.
2015-02-15 18:09:11 +00:00
4333aa240c
Godot UI is quick and snappy again!
...
Changed linked listed sort to use auxiliary memory
this fixes user interface performance issues.
2015-02-15 12:38:25 -03:00
2d4cec0cb6
fix return value of slide and reflect
...
closes #1311
2015-02-15 11:26:31 -03: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
2185c018f6
begin new serialization framework
...
also got rid of STL dependency on triangulator
2015-02-15 01:21:26 -03: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
d2f86cc09b
fixes to mouse warp
...
-can warp now from viewport and control, in their respective coordinate
systems
-warp is now local to the window on Windows and OSX.
IF YOU RUN OSX, PLEASE TEST THIS! And make sure it works!, new code is
in OS_OSX::warp_mouse_pos. I don't have OSX so i can't test!
2015-02-14 19:22:06 -03:00
a49802ae33
-resolved shader set parameter bug, closes #1361
2015-02-14 14:54:58 -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
8bb1e19d73
Replace body_mode property with use_kinematic flag.
...
Revert 2D Platformer demo's moving platforms to sprite plus body.
2015-02-14 06:43:50 +10: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
5c3c730bad
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-13 06:26:53 +10:00
d0ea475405
Merge pull request #1359 from Hinsbart/fix_win_joy
...
fix get_joy_name() on windows
2015-02-12 16:04:03 +01:00
97e46194f4
fix get_joy_name() on windows
2015-02-12 04:17:29 +01:00
9de87ef7e3
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-11 21:41:52 +10:00
c613fb121b
Moved wrapper function to TileMapEditor.
2015-02-11 21:40:50 +10:00
b3a6cc097d
Merge pull request #1356 from rraallvv/iOS_add_CADisplayLink_support
...
add support for CADisplayLink
2015-02-11 12:33:16 +01: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
78a268c2eb
fixes to HTTPClient
...
-small unchunked files should work properly
-blocking mode should work properly
2015-02-11 07:57:51 -03:00
b4e1c1d717
Merge pull request #1327 from romulox-x/polygonPathFinderClosestPoint
...
changed PolygonPathFinder::get_closest_point to return the closest posit...
2015-02-11 07:12:15 -03:00
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
1d54c2dd1c
added missing set_shader_param functions
...
also added code completion hint for shader params
2015-02-11 06:51:20 -03:00
d22b256f08
customizable content margin in styleboxes
2015-02-10 23:53:04 -03:00
