Commit graph

2393 commits

Author SHA1 Message Date
Juan Linietsky
a6e6c5b878 Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-04 18:32:18 -03:00
Juan Linietsky
2d396fb710 -More strict argument type-checking, will make many bugs visible, fixes #1809
-added NOTIFICATION_INSTANCED
2015-05-04 18:30:57 -03:00
yg2f
43c41fc9f9 fixes issue #1693 winmain and main unicode
makes WinMain() and main() accepts unicode characters into arguments
2015-05-04 20:26:49 +02:00
Juan Linietsky
2a02d3f96f fix font import path on windows, closes #1675 2015-05-04 15:06:41 -03:00
Ricardo Pérez
f3542ff838 Wrong use of | instead of || 2015-05-04 19:54:17 +02:00
Juan Linietsky
fbbe7dcdfb Merge remote-tracking branch 'origin/master'
Conflicts:
	drivers/windows/dir_access_windows.cpp
2015-05-04 13:24:02 -03:00
Juan Linietsky
7f5b744b92 small unicode fixes 2015-05-04 13:12:05 -03:00
Juan Linietsky
6f8bd89931 -invalidated string -> int automatic conversion, fixes #1788 2015-05-04 11:17:11 -03:00
Juan Linietsky
f4caddbc23 -corrected frac() and hyperbolic sin,cos,tan when running on PC (GLSL120), fixes #1775 2015-05-04 10:53:54 -03:00
Juan Linietsky
a76709d240 -vec3 uniforms should now work, fixes #1773 2015-05-04 10:17:24 -03:00
Juan Linietsky
9b01f5954a solve invalid pointer, fixes #1793 2015-05-04 00:55:21 -03:00
Juan Linietsky
4b6225586c Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-04 00:53:52 -03:00
Juan Linietsky
442febd2ae added return keyword, fixes #1797 2015-05-04 00:53:33 -03:00
Juan Linietsky
30f652998d Merge pull request #1738 from jackmakesthings/master
Updating demo engine.cfgs where name is missing
2015-05-03 23:00:26 -03:00
Juan Linietsky
d6d29f6d79 Merge pull request #1755 from dbsGen/master
Fixed some bugs in Label.
2015-05-03 22:55:58 -03:00
Juan Linietsky
f64fcc42ef Merge pull request #1772 from Biliogadafr/Tripleclick
Tripleclick now doesn't select line if clicks was done on different lines. Fix #1727
2015-05-03 22:54:16 -03:00
Juan Linietsky
f850f0d9ec Merge pull request #1784 from NateWardawg/sa_fixes
Fixed some items caught in cppcheck
2015-05-03 22:54:02 -03:00
Juan Linietsky
c631d597ad Merge pull request #1792 from swenner/static_analysis_fixes
Static analysis fixes
2015-05-03 22:53:30 -03:00
Juan Linietsky
913cb443fc Merge pull request #1798 from ricpelo/ricpelo-patch-1
Missing return statement
2015-05-03 22:52:42 -03:00
Juan Linietsky
795ccf0e14 Merge pull request #1800 from antonyjones67/VSGenerator
Added Visual Studio project generation. Use "vsproj=yes" in command line...
2015-05-03 22:52:20 -03:00
Juan Linietsky
e7aa37fe75 improved kinematic motion, improved demos for kinematic motion 2015-05-03 22:37:10 -03:00
Juan Linietsky
04fb3402c5 -Make sure properties are exported the way they should in xml, fixes #1799 2015-05-03 20:31:50 -03:00
Antony Jones
2a4da03f10 Added Visual Studio project generation. Use "vsproj=yes" in command line. This does not set up NMAKE properly. 2015-05-03 15:18:56 -06:00
Juan Linietsky
767f71a35e -Made one way collision work with 2D physics (rigidbody) 2015-05-03 18:18:21 -03:00
Ricardo Pérez
256a9fd1df Missing return statement 2015-05-03 22:09:42 +02:00
Juan Linietsky
af06843982 -new collision layer & mask system for 2D, for more flexible collision masking 2015-05-03 16:47:21 -03:00
Simon Wenner
3f1826866b fixed uninitialized name pointers (cppcheck) 2015-05-03 02:16:26 +02:00
Simon Wenner
332d9af81b fixed memory leak: triangulated (cppcheck) 2015-05-03 02:11:43 +02:00
Simon Wenner
bd08cd7fd2 fixed broken comment block 2015-05-03 02:04:30 +02:00
Simon Wenner
a0e985c6c1 removed unnecessary semicolons 2015-05-03 01:48:20 +02:00
Simon Wenner
2830f85b05 fixed uninitialized variable (cppcheck) 2015-05-03 01:45:55 +02:00
Juan Linietsky
5f2aac4bbe same fixes to 3D navmesh.. 2015-05-02 17:39:29 -03:00
Juan Linietsky
2296b0508e 2D pathfinder fixes, should now always find the best path. 2015-05-02 16:35:43 -03:00
Nathan Warden
6212946927 Fixed some items caught in cppcheck 2015-05-02 12:17:59 -05:00
Juan Linietsky
524d9fad59 -fixed godot icon for android
-added a genname option to generate the name of android app
2015-05-01 23:21:27 -03:00
Juan Linietsky
dda60296d8 Merge branch 'master' of https://github.com/okamstudio/godot 2015-05-01 23:20:41 -03:00
Juan Linietsky
fb8b740fcb -fixed default godot logo
-made the packagename generated from name by default
2015-05-01 23:20:05 -03:00
Juan Linietsky
61e90385f6 -option to select arm and x86 architectures on android export (will not work with current templates, you have to make new and include both x86 and arm support) 2015-05-01 22:45:32 -03:00
Juan Linietsky
1e422941c8 -Fixed android export options (screen sizes, orientation should work)
-added functions to get mouse position in CanvasItem
2015-05-01 21:13:20 -03:00
Biliogadafr
8e7973d660 Triple click doesn't select line if click was done on different lines. Fix #1727 2015-05-02 00:03:49 +03:00
Juan Linietsky
88d078df1e bumped version to rc1 2015-05-01 12:30:13 -03:00
Juan Linietsky
c1eee112f4 fixed bullet in 3d platformer demo 2015-05-01 12:24:20 -03:00
Juan Linietsky
ee8f8add4e -removed get_mouse_pos from Input, as it only caused problems 2015-05-01 12:19:24 -03:00
Juan Linietsky
c45ffc2ca9 -fixed old condition in TextureFrame that caused bugs in materials, closes #1742 2015-05-01 12:16:51 -03:00
Juan Linietsky
bf53b7789a -fix timer behavior described, closes #1455 2015-05-01 11:44:02 -03:00
Juan Linietsky
c08597aa64 -fix a bug in extra cull margin, closes #1760 2015-05-01 11:26:23 -03:00
Juan Linietsky
4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
Juan Linietsky
af42e244e0 Merge pull request #1769 from est31/xml-order
Sort xml files, so order is constant
2015-05-01 10:02:58 -03:00
Gen
0bc5b7a146 Optimize the code. 2015-05-01 18:47:34 +08:00
est31
b2b5143678 Sort xml files, so order is constant
Makes xml format work better with version control systems.
2015-05-01 03:41:45 +02:00