summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-15Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan
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-12Merge pull request #1359 from Hinsbart/fix_win_joypunto-
fix get_joy_name() on windows
2015-02-12Merge remote-tracking branch 'upstream/master' into x11-window-managementhurikhan
2015-02-12cleanup + MouseGrabhurikhan
2015-02-12fix get_joy_name() on windowsHinsbart
2015-02-11Merge pull request #1356 from rraallvv/iOS_add_CADisplayLink_supportpunto-
add support for CADisplayLink
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
2015-02-10add support for CADisplayLinkRhody Lugo
2015-02-10remove make.batJuan Linietsky
2015-02-10ignore make.batJuan Linietsky
2015-02-10fixes to skinned bufferJuan Linietsky
should avoid targets with large objects using morphs also skinned buffer size is properly customizable on project settings.
2015-02-10Added the default arguments to the binding for ↵Jeffrey Steward
ResourceImportMetadata::add_source to match the c++ version
2015-02-10Merge pull request #1352 from Hinsbart/masterJuan Linietsky
fix typo in script template
2015-02-10fix typo in script templateHinsbart
2015-02-10Added get_gui_base to the EditorNode class to allow for import plugins to ↵Jeffrey Steward
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-09Added the ability to add and remove editor import plugins.Jeffrey Steward
2015-02-09Merge pull request #1176 from Spooner/add_sprintfJuan Linietsky
Add sprintf
2015-02-09ability to customize max render elementsJuan Linietsky
should close #1339
2015-02-10Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintfBil Bas (Spooner)
Conflicts: .gitignore
2015-02-09Merge pull request #1300 from umxprime/fix/ios-init-crashJuan Linietsky
Fix init crash on iPad 1st gen device with iOS 5.1.1
2015-02-09Merge pull request #1299 from umxprime/fix/isim-sdk-pathJuan Linietsky
Fix iOS Simulator SDK path for isim platform.
2015-02-09Merge pull request #1170 from ↵Juan Linietsky
UsernameIsAReservedWord/fix_cubemap_ressource_editor fixes cubemap ressource editor bug, fixes issue #908
2015-02-09Merge pull request #1174 from adolson/autoreload-edited-scriptsJuan Linietsky
add option to automatically reload changed scripts
2015-02-09Merge pull request #1179 from marynate/PR-fix-compile-winJuan Linietsky
Fix compile compile error on windows platform
2015-02-09Merge pull request #1243 from NateWardawg/ChangeRunSceneToRunProjectJuan Linietsky
Changed the "Start the scene (F5)." tooltip to say "Play the project (F5)."
2015-02-09Merge pull request #1251 from adolson/fscache-stuffJuan Linietsky
ignore and remove .fscache files. closes #1249
2015-02-09Merge pull request #1259 from laganojunior/feature/fix_modifier_key_unpressJuan Linietsky
Modifiers are unset on events for the modifier key itself
2015-02-09Merge pull request #1271 from NateWardawg/NestedSceneFixJuan Linietsky
Pr - Fixed a bug where a user could add a cyclical dependency, causing a crash.
2015-02-09Merge pull request #1281 from sanikoyes/Pr-fix-rtt-filtersJuan Linietsky
Pr-fix-rtt-filters
2015-02-09Merge pull request #1303 from erbridge/revert_menu_itemJuan Linietsky
Add a revert menu item
2015-02-09Merge pull request #1306 from sambler/freebsd_fixesJuan Linietsky
fix build on freebsd
2015-02-09Merge pull request #1307 from sambler/scons_changesJuan Linietsky
Adjustment to x11/detect.py
2015-02-09Merge pull request #1325 from hrib/masterJuan Linietsky
fixed math in Camera::project_position
2015-02-09Merge pull request #1336 from slapin/exporter2Juan Linietsky
io_scene_dae: fixed invalid variable name
2015-02-04io_scene_dae: fixed invalid variable nameSegey Lapin
2015-02-01Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintfBil Bas (Spooner)
2015-02-01Completed more complex formatting.Bil Bas (Spooner)
2015-02-01Completed implementing standard formatting.Bil Bas (Spooner)
2015-02-01changed PolygonPathFinder::get_closest_point to return the closest position ↵romulox_x
inside, rather then the closest vertex