summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-03-03Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
Conflicts: modules/gdscript/gd_tokenizer.cpp scene/resources/shader_graph.h
2015-03-03merges from okam repoJuan Linietsky
2015-03-02time was not being set properly with the rest of the uniforms.Juan Linietsky
2015-03-02Merge pull request #1437 from Hinsbart/fix_win_joyJuan Linietsky
fix get joystick name from registry on some systems
2015-03-02support for 2D shadow castersJuan Linietsky
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-01Merge pull request #1459 from romulox-x/blend_with_transparent_backgroundJuan Linietsky
changed the blending function when using a transparent render target so ...
2015-03-01changed the blending function when using a transparent render target so that ↵romulox_x
it blends properly
2015-03-01Merge pull request #1414 from romulox-x/viewport_clear_alphaJuan Linietsky
changed viewport clearing to use the alpha value of the clear color, and...
2015-02-25fix get joystick name from registry on some systemsHinsbart
2015-02-21changed viewport clearing to use the alpha value of the clear color, and ↵romulox_x
made the transparent bg option of viewport force a clear color of 0,0,0,0
2015-02-21Merge pull request #1369 from not-surt/tile_rotationJuan Linietsky
Tile Rotation
2015-02-21Merge pull request #1410 from romulox-x/viewport_clearJuan Linietsky
added option to disable automatic clearing of viewport render buffer
2015-02-21added option to disable automatic clearing of viewport render bufferromulox_x
2015-02-19Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
2015-02-19restored @ for nodepaths/stringnamesJuan Linietsky
2015-02-19Merge pull request #1398 from NateWardawg/rewordingJuan Linietsky
Changed the tooltip message for instancing a scene.
2015-02-19Changed the tooltip message for instancing a scene.Nathan Warden
- 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-fix compilation of godot serverJuan Linietsky
2015-02-19-improved pathfinding accuracyJuan Linietsky
(i hope?)
2015-02-18support for light and normal mapping in 2DJuan Linietsky
2015-02-18Merge pull request #1389 from greay/osx_buildJuan Linietsky
fix a small build error on OS X
2015-02-17fix for “no viable conversion from 'NSPoint' (aka '_NSPoint') to ↵greay
'CGPoint'” build error on OS X
2015-02-16-Some more work on 2D Lights (NOT FUNCTIONAL YET!)reduz
2015-02-16Merge branch 'master' of https://github.com/okamstudio/godot into tile_rotationCarl Olsson
2015-02-15Merge pull request #1371 from erbridge/fix_shadow_declarationJuan Linietsky
Fix a shadow declaration
2015-02-15Fix a shadow declaration.Felix Laurie von Massenbach
2015-02-15Godot UI is quick and snappy again!Juan Linietsky
Changed linked listed sort to use auxiliary memory this fixes user interface performance issues.
2015-02-15fix return value of slide and reflectJuan Linietsky
closes #1311
2015-02-15Merge branch 'master' of https://github.com/okamstudio/godotCarl Olsson
Conflicts: scene/2d/tile_map.cpp
2015-02-15begin new serialization frameworkJuan Linietsky
also got rid of STL dependency on triangulator
2015-02-14Merge pull request #1362 from not-surt/tile_map_body_modeJuan Linietsky
Added body mode property for TileMap as kinematic body
2015-02-14fixes to mouse warpJuan Linietsky
-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-resolved shader set parameter bug, closes #1361Juan Linietsky
2015-02-14New Navigation & Pathfinding support for 2DJuan Linietsky
-Added Navigation & NavigationPolygon nodes -Added corresponding visual editor -New pathfinding algorithm is modern and fast! -Similar API to 3D Pathfinding (more coherent)
2015-02-14Replace body_mode property with use_kinematic flag.Carl Olsson
Revert 2D Platformer demo's moving platforms to sprite plus body.
2015-02-13Added body mode property to TileMap to select between static and kinematic ↵Carl Olsson
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-13Reorder tile transforms so transpose occurs before flips. Much more ↵Carl Olsson
intuitive for flipping transposed tiles.
2015-02-13Merge branch 'master' of https://github.com/okamstudio/godotCarl Olsson
2015-02-12Merge pull request #1359 from Hinsbart/fix_win_joypunto-
fix get_joy_name() on windows
2015-02-12fix get_joy_name() on windowsHinsbart
2015-02-11Merge branch 'master' of https://github.com/okamstudio/godotCarl Olsson
2015-02-11Moved wrapper function to TileMapEditor.Carl Olsson
2015-02-11Merge pull request #1356 from rraallvv/iOS_add_CADisplayLink_supportpunto-
add support for CADisplayLink
2015-02-11Merge branch 'master' of https://github.com/okamstudio/godotCarl Olsson
Conflicts: demos/2d/polygon_path_finder_demo/.fscache
2015-02-11Revert variant arg length to 5 and add 5 arg wrapper function for TileMap ↵Carl Olsson
set_cell.
2015-02-11fixes to HTTPClientJuan Linietsky
-small unchunked files should work properly -blocking mode should work properly
2015-02-11Merge pull request #1327 from romulox-x/polygonPathFinderClosestPointJuan Linietsky
changed PolygonPathFinder::get_closest_point to return the closest posit...
2015-02-11Merge pull request #1346 from Nulifier/import-pluginJuan Linietsky
Added the ability to add and remove editor import plugins.
2015-02-11added missing set_shader_param functionsJuan Linietsky
also added code completion hint for shader params
2015-02-10customizable content margin in styleboxesJuan Linietsky