Commit graph

1633 commits

Author SHA1 Message Date
Hinsbart
9229d9d1bb fix get joystick name from registry on some systems 2015-02-25 16:33:08 +01:00
cheece
1444946006 COLLADA load normals from morph target
if the file has normals use them!
2015-02-24 20:13:21 -04:30
UsernameIsAReservedWord
b3976ec14c Update detect.py 2015-02-24 22:38:49 +01:00
UsernameIsAReservedWord
fde7f11a55 Update detect.py 2015-02-24 22:31:18 +01:00
UsernameIsAReservedWord
84905809a1 fixes platform/windows/detect.py
- fixes issue #1298 : under windows, too long `ar` command lines are split into several smaller command lines.
- fixes issue #1285 : under linux, cross compiling with Mingw-w64 now generates actual 64bits EXE.
- `MINGW32_PREFIX` and `MINGW64_PREFIX` environment variables are also available for Windows.
- started to clean-up the remains of previous hacks and workarounds.
- added some documentation into the script.
2015-02-24 22:28:51 +01:00
Bil Bas (Spooner)
c85b2e3fb3 Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-22 14:08:59 +00:00
romulox_x
2ac767b1f5 changed viewport clearing to use the alpha value of the clear color, and made the transparent bg option of viewport force a clear color of 0,0,0,0 2015-02-21 13:57:12 -08:00
Carl Olsson
41686d5fdd Merge branch 'master' of https://github.com/okamstudio/godot into snapping2 2015-02-22 07:38:06 +10:00
Juan Linietsky
1d7337ba10 Merge pull request #1369 from not-surt/tile_rotation
Tile Rotation
2015-02-21 15:37:02 -03:00
Juan Linietsky
57183a7783 Merge pull request #1410 from romulox-x/viewport_clear
added option to disable automatic clearing of viewport render buffer
2015-02-21 10:41:53 -03:00
romulox_x
f4312a5076 added option to disable automatic clearing of viewport render buffer 2015-02-21 01:35:06 -08:00
Nathan Warden
bfad392387 Updated the variable in the lerp function to be weight instead of percent. 2015-02-20 16:28:48 -05:00
Nathan Warden
071b2ea4f2 Updated the internal documention for the GDScript class. 2015-02-20 13:05:21 -05:00
Carl Olsson
402db5bd79 Renamed "snap to offset" to "snap relative". Better conveys meaning. 2015-02-20 22:21:59 +10:00
Nathan Warden
8f5bf2a2ef Camelcased script variables will now capitalize in the inspector. 2015-02-19 19:35:04 -05:00
ElectricSolstice
11a5949ec4 Fixed issue 1377 about script editor parenthesis matching. 2015-02-19 16:34:04 -08:00
Juan Linietsky
31e076d16a Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-19 18:13:15 -03:00
Juan Linietsky
daeac73c54 restored @ for nodepaths/stringnames 2015-02-19 18:12:45 -03:00
Juan Linietsky
15d97c1e08 Merge pull request #1398 from NateWardawg/rewording
Changed the tooltip message for instancing a scene.
2015-02-19 14:29:38 -03:00
Bil Bas (Spooner)
748311ec42 Added info about operator after bespoke error message. 2015-02-19 16:59:37 +00:00
Nathan Warden
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
Bil Bas (Spooner)
db2381de7a Correctly halt on error in sprintf parsing (fixes #1393) 2015-02-19 15:45:49 +00:00
Bil Bas (Spooner)
e3bf8ab02d Merge branch 'master' of https://github.com/okamstudio/godot into fix_sprintf_errors 2015-02-19 14:55:21 +00:00
Juan Linietsky
3fdf3d8eab -fix compilation of godot server 2015-02-19 11:54:03 -03:00
Bil Bas (Spooner)
6353734bfb Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-19 13:29:44 +00:00
Juan Linietsky
cf75bf842d -improved pathfinding accuracy
(i hope?)
2015-02-19 00:27:02 -03:00
Bil Bas (Spooner)
3241b0181e Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-19 02:00:50 +00:00
Juan Linietsky
5ef3f7392f support for light and normal mapping in 2D 2015-02-18 19:40:02 -03:00
Bil Bas (Spooner)
33ed0efeef Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-18 13:53:40 +00:00
ElectricSolstice
c0efa3fb5b Merge branch 'master' into wparentheses_removal 2015-02-17 23:10:56 -08:00
Juan Linietsky
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
greay
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
Bil Bas (Spooner)
335cd90441 Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-18 01:07:33 +00:00
ElectricSolstice
0e1f34b49d Changed code to remove gcc -Wparentheses warnings. 2015-02-16 18:58:41 -08:00
Felix Laurie von Massenbach
56402900ff View > Settings isn't a check item. 2015-02-17 02:51:17 +00:00
Bil Bas (Spooner)
fba2d121b4 Corrected behaviour of File.READ_WRITE mode (fixes #378) 2015-02-16 20:59:16 +00:00
reduz
2bea642583 -Some more work on 2D Lights (NOT FUNCTIONAL YET!) 2015-02-16 14:45:11 -03:00
Carl Olsson
b3dc4f8550 Merge branch 'master' of https://github.com/okamstudio/godot into snapping2 2015-02-16 05:08:47 +10:00
Carl Olsson
0fa1153ea7 Merge branch 'master' of https://github.com/okamstudio/godot into tile_rotation 2015-02-16 05:07:13 +10:00
Juan Linietsky
d7ea20c166 Merge pull request #1371 from erbridge/fix_shadow_declaration
Fix a shadow declaration
2015-02-15 16:03:18 -03:00
Felix Laurie von Massenbach
2478935f96 Fix a shadow declaration. 2015-02-15 18:09:11 +00:00
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