aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/okamstudio/godotCarl Olsson2015-02-1547-241/+4862
|\
| * begin new serialization frameworkJuan Linietsky2015-02-1513-206/+729
| * Merge pull request #1362 from not-surt/tile_map_body_modeJuan Linietsky2015-02-147-161/+280
| |\
| | * Replace body_mode property with use_kinematic flag.Carl Olsson2015-02-144-72/+75
| | * Added body mode property to TileMap to select between static and kinematic ph...Carl Olsson2015-02-139-223/+339
| * | fixes to mouse warpJuan Linietsky2015-02-147-4/+44
| * | -resolved shader set parameter bug, closes #1361Juan Linietsky2015-02-141-52/+62
| * | New Navigation & Pathfinding support for 2DJuan Linietsky2015-02-1426-2/+3932
| |/
* | Reorder tile transforms so transpose occurs before flips. Much more intuitive...Carl Olsson2015-02-134-24/+28
* | Merge branch 'master' of https://github.com/okamstudio/godotCarl Olsson2015-02-132-1/+52
|\|
| * Merge pull request #1359 from Hinsbart/fix_win_joypunto-2015-02-122-1/+52
| |\
| | * fix get_joy_name() on windowsHinsbart2015-02-122-1/+52
| |/
* | Merge branch 'master' of https://github.com/okamstudio/godotCarl Olsson2015-02-112-0/+40
|\|
| * Merge pull request #1356 from rraallvv/iOS_add_CADisplayLink_supportpunto-2015-02-112-0/+40
| |\
| | * add support for CADisplayLinkRhody Lugo2015-02-102-0/+40
* | | Moved wrapper function to TileMapEditor.Carl Olsson2015-02-114-11/+12
* | | Merge branch 'master' of https://github.com/okamstudio/godotCarl Olsson2015-02-1135-160/+1350
|\| |
| * | fixes to HTTPClientJuan Linietsky2015-02-112-10/+39
| * | Merge pull request #1327 from romulox-x/polygonPathFinderClosestPointJuan Linietsky2015-02-111-9/+17
| |\ \
| | * | changed PolygonPathFinder::get_closest_point to return the closest position i...romulox_x2015-02-011-9/+17
| * | | Merge pull request #1346 from Nulifier/import-pluginJuan Linietsky2015-02-115-11/+63
| |\ \ \
| | * | | Added the default arguments to the binding for ResourceImportMetadata::add_so...Jeffrey Steward2015-02-101-1/+1
| | * | | Added get_gui_base to the EditorNode class to allow for import plugins to cre...Jeffrey Steward2015-02-101-1/+1
| | * | | Added the ability to add and remove editor import plugins.Jeffrey Steward2015-02-094-10/+62
| | |/ /
| * | | added missing set_shader_param functionsJuan Linietsky2015-02-113-2/+25
| * | | customizable content margin in styleboxesJuan Linietsky2015-02-101-0/+6
| * | | remove make.batJuan Linietsky2015-02-101-1/+0
| * | | ignore make.batJuan Linietsky2015-02-101-0/+1
| * | | fixes to skinned bufferJuan Linietsky2015-02-103-7/+17
| * | | Merge pull request #1352 from Hinsbart/masterJuan Linietsky2015-02-101-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | fix typo in script templateHinsbart2015-02-101-1/+1
| |/ /
| * | Merge pull request #1176 from Spooner/add_sprintfJuan Linietsky2015-02-096-21/+1007
| |\ \
| | * \ Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintfBil Bas (Spooner)2015-02-1019-107/+501
| | |\ \
| | * \ \ Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintfBil Bas (Spooner)2015-02-01335-8704/+6310
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Completed more complex formatting.Bil Bas (Spooner)2015-02-012-65/+423
| | * | | Completed implementing standard formatting.Bil Bas (Spooner)2015-02-012-40/+135
| | * | | Added basic sprintf functionality (e.g. "fish %d %s" % [12, Vector2(1, 2)])Bil Bas (Spooner)2015-01-104-2/+193
| | * | | Ignored more generated files.Bil Bas (Spooner)2015-01-101-0/+2
| * | | | ability to customize max render elementsJuan Linietsky2015-02-092-6/+29
| | |_|/ | |/| |
| * | | Merge pull request #1300 from umxprime/fix/ios-init-crashJuan Linietsky2015-02-091-7/+12
| |\ \ \
| | * | | Fix init crash on iPad 1st gen device with iOS 5.1.1Maxime CHAPELET2015-01-231-7/+12
| | | |/ | | |/|
| * | | Merge pull request #1299 from umxprime/fix/isim-sdk-pathJuan Linietsky2015-02-091-1/+1
| |\ \ \
| | * | | Fix iOS Simulator SDK path for isim platform.Maxime CHAPELET2015-01-221-1/+1
| | |/ /
| * | | Merge pull request #1170 from UsernameIsAReservedWord/fix_cubemap_ressource_e...Juan Linietsky2015-02-091-18/+18
| |\ \ \
| | * | | fixes cubemap ressource editor bugyg2f2015-01-101-18/+18
| * | | | Merge pull request #1174 from adolson/autoreload-edited-scriptsJuan Linietsky2015-02-091-1/+5
| |\ \ \ \
| | * | | | fixesDana Olson2015-01-171-1/+2
| | * | | | add option to automatically reload changed scriptsDana Olson2015-01-101-1/+4
| | |/ / /
| * | | | Merge pull request #1179 from marynate/PR-fix-compile-winJuan Linietsky2015-02-090-0/+0
| |\ \ \ \
| | * | | | Fix compile compile error on windows platformmarynate2015-01-111-1/+1