19a99afa81
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-20 13:41:37 +03:00
8f5bf2a2ef
Camelcased script variables will now capitalize in the inspector.
2015-02-19 19:35:04 -05:00
11a5949ec4
Fixed issue 1377 about script editor parenthesis matching.
2015-02-19 16:34:04 -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
748311ec42
Added info about operator after bespoke error message.
2015-02-19 16:59:37 +00: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
db2381de7a
Correctly halt on error in sprintf parsing ( fixes #1393 )
2015-02-19 15:45:49 +00:00
e3bf8ab02d
Merge branch 'master' of https://github.com/okamstudio/godot into fix_sprintf_errors
2015-02-19 14:55:21 +00:00
3fdf3d8eab
-fix compilation of godot server
2015-02-19 11:54:03 -03:00
6353734bfb
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-19 13:29:44 +00:00
cf75bf842d
-improved pathfinding accuracy
...
(i hope?)
2015-02-19 00:27:02 -03:00
3241b0181e
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-19 02:00:50 +00:00
5ef3f7392f
support for light and normal mapping in 2D
2015-02-18 19:40:02 -03:00
33ed0efeef
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-18 13:53:40 +00:00
c0efa3fb5b
Merge branch 'master' into wparentheses_removal
2015-02-17 23:10:56 -08: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
335cd90441
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-18 01:07:33 +00:00
2735deb0cf
Merge branch 'master' of https://github.com/a12n/godot
2015-02-17 15:57:51 +03:00
e024ff89b2
Merge branch 'master' of https://github.com/okamstudio/godot
2015-02-17 15:57:24 +03:00
0e1f34b49d
Changed code to remove gcc -Wparentheses warnings.
2015-02-16 18:58:41 -08:00
56402900ff
View > Settings isn't a check item.
2015-02-17 02:51:17 +00:00
fba2d121b4
Corrected behaviour of File.READ_WRITE mode ( fixes #378 )
2015-02-16 20:59:16 +00:00
2bea642583
-Some more work on 2D Lights (NOT FUNCTIONAL YET!)
2015-02-16 14:45:11 -03:00
b3dc4f8550
Merge branch 'master' of https://github.com/okamstudio/godot into snapping2
2015-02-16 05:08:47 +10: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
f5d2e1f42c
Renamed EXPERIMENTAL_WM_API to NEW_WM_API
2015-02-15 18:26:49 +08:00
ee81d4b359
Merge remote-tracking branch 'upstream/master' into x11-window-management
2015-02-15 17:49:34 +08: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
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
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
a13e180052
Merge remote-tracking branch 'upstream/master' into x11-window-management
2015-02-12 15:58:29 +01:00
df7d26ff5b
cleanup + MouseGrab
2015-02-12 15:58:00 +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
Anton Yabchinskiy
Nathan Warden
ElectricSolstice
Juan Linietsky
Juan Linietsky
Bil Bas (Spooner)
greay
Felix Laurie von Massenbach
reduz
Carl Olsson
hurikhan
punto-
Hinsbart