Commit Graph

28778 Commits

Author SHA1 Message Date
Juan Linietsky 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
Juan Linietsky 2d4cec0cb6 fix return value of slide and reflect
closes #1311
2015-02-15 11:26:31 -03:00
hurikhan f5d2e1f42c Renamed EXPERIMENTAL_WM_API to NEW_WM_API 2015-02-15 18:26:49 +08:00
hurikhan ee81d4b359 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-15 17:49:34 +08: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 2185c018f6 begin new serialization framework
also got rid of STL dependency on triangulator
2015-02-15 01:21:26 -03: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 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
Juan Linietsky a49802ae33 -resolved shader set parameter bug, closes #1361 2015-02-14 14:54:58 -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 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
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 5c3c730bad Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-13 06:26:53 +10:00
punto- d0ea475405 Merge pull request #1359 from Hinsbart/fix_win_joy
fix get_joy_name() on windows
2015-02-12 16:04:03 +01:00
hurikhan a13e180052 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-12 15:58:29 +01:00
hurikhan df7d26ff5b cleanup + MouseGrab 2015-02-12 15:58:00 +01:00
Hinsbart 97e46194f4 fix get_joy_name() on windows 2015-02-12 04:17:29 +01:00
Carl Olsson 9de87ef7e3 Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-11 21:41:52 +10:00
Carl Olsson c613fb121b Moved wrapper function to TileMapEditor. 2015-02-11 21:40:50 +10:00
punto- b3a6cc097d Merge pull request #1356 from rraallvv/iOS_add_CADisplayLink_support
add support for CADisplayLink
2015-02-11 12:33:16 +01: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 78a268c2eb fixes to HTTPClient
-small unchunked files should work properly
-blocking mode should work properly
2015-02-11 07:57:51 -03:00
Juan Linietsky 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
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
Juan Linietsky 1d54c2dd1c added missing set_shader_param functions
also added code completion hint for shader params
2015-02-11 06:51:20 -03:00
Juan Linietsky d22b256f08 customizable content margin in styleboxes 2015-02-10 23:53:04 -03:00
Rhody Lugo d67e866788 add support for CADisplayLink 2015-02-10 22:10:10 -04:30
Juan Linietsky 8678658875 remove make.bat 2015-02-10 19:19:11 -03:00
Juan Linietsky 878e805665 ignore make.bat 2015-02-10 19:18:00 -03:00
Juan Linietsky e74982e55e fixes to skinned buffer
should avoid targets with large objects using morphs
also skinned buffer size is properly customizable on project settings.
2015-02-10 19:14:22 -03:00
Jeffrey Steward 84be16758e Added the default arguments to the binding for ResourceImportMetadata::add_source to match the c++ version 2015-02-10 14:23:49 -07:00
Juan Linietsky dfb94de041 Merge pull request #1352 from Hinsbart/master
fix typo in script template
2015-02-10 15:48:32 -03:00
Hinsbart cbade4daf6 fix typo in script template 2015-02-10 19:39:52 +01: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 66d32b75b3 Merge pull request #1176 from Spooner/add_sprintf
Add sprintf
2015-02-09 22:21:43 -03:00
Juan Linietsky a34d27438c ability to customize max render elements
should close #1339
2015-02-09 22:18:44 -03:00
Bil Bas (Spooner) 58d7678947 Merge branch 'master' of https://github.com/okamstudio/godot into add_sprintf
Conflicts:
	.gitignore
2015-02-10 00:42:28 +00:00
Juan Linietsky f53b27dca3 Merge pull request #1300 from umxprime/fix/ios-init-crash
Fix init crash on iPad 1st gen device with iOS 5.1.1
2015-02-09 21:38:43 -03:00
Juan Linietsky b1ec72a799 Merge pull request #1299 from umxprime/fix/isim-sdk-path
Fix iOS Simulator SDK path for isim platform.
2015-02-09 21:38:38 -03:00
Juan Linietsky 3b4fd0f24d Merge pull request #1170 from UsernameIsAReservedWord/fix_cubemap_ressource_editor
fixes cubemap ressource editor bug, fixes issue #908
2015-02-09 21:37:01 -03: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 85edf05343 Merge pull request #1179 from marynate/PR-fix-compile-win
Fix compile compile error on windows platform
2015-02-09 21:32:42 -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 b3ab07ecd8 Merge pull request #1251 from adolson/fscache-stuff
ignore and remove .fscache files. closes #1249
2015-02-09 21:32:07 -03:00
Juan Linietsky 3b3829e002 Merge pull request #1259 from laganojunior/feature/fix_modifier_key_unpress
Modifiers are unset on events for the modifier key itself
2015-02-09 21:31:39 -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