Commit Graph

9886 Commits

Author SHA1 Message Date
Lasse Öörni
ba4cb70e42 Use PODVector for GeometryDesc to avoid MSVC warning. 2014-08-14 11:09:07 +03:00
aster2013
c8f989f0c3 Change tile map texture size to power of 2.[ci skip] 2014-08-14 13:31:16 +08:00
aster
0bea9e68cc Merge branch 'master' of https://github.com/urho3d/Urho3D 2014-08-13 23:01:07 +08:00
aster
db59a66cbf Fix typo.[ci skip] 2014-08-13 23:00:42 +08:00
urho3d-travis-ci
81096e625a Travis CI: API documentation update at 2014-08-13 14:42:01 UTC.
[ci package]
2014-08-13 14:42:01 +00:00
aster
8c99b8d866 Merge branch 'tile-map' 2014-08-13 22:16:19 +08:00
aster
85bcdaecf4 Add screen to world convert functions, PhysicsWorld2D use these function to pick rigid body. 2014-08-13 22:07:46 +08:00
urho3d-travis-ci
f215bf2b12 Travis CI: API documentation update at 2014-08-12 19:41:33 UTC.
[ci package]
2014-08-12 19:41:33 +00:00
Lasse Öörni
89f6b31a47 Enhance the ConvexCast function to take a start pos,rot & end pos,rot instead of just a ray, so that the swept shape can be rotated. Ignore collision to self during convex cast, if the supplied shape belongs to a RigidBody. 2014-08-12 22:26:53 +03:00
aster
391f83aa3b Fix typo. 2014-08-12 22:06:50 +08:00
Yao Wei Tjong 姚伟忠
528bfe316d For Travis CI - use single process when building samples for MinGW. 2014-08-12 12:05:21 +08:00
aster2013
6a0a03f3ac Add tile map AngelScript sample. 2014-08-12 11:57:34 +08:00
Yao Wei Tjong 姚伟忠
4b45d70769 For Travis CI - misc. minor fixes.
- Fix commit message when performing API documentation update.
- Use single process when packaging to prevent make process being killed due to out of memory.
- Use one less process when building samples for MinGW/64-bit/STATIC target due to out of memory.
- Use commit-ish to describe the version number when renaming source package.
2014-08-12 11:41:56 +08:00
urho3d-travis-ci
379bd474fe Travis CI: API documentation update at 2014-08-11 20:38:42 UTC.
[ci package]
2014-08-11 20:38:42 +00:00
Lasse Öörni
a717793e3e Added ConvexCast function to PhysicsWorld, which performs a sweep test with user-specified collision shape. Closes #420. 2014-08-11 23:20:01 +03:00
urho3d-travis-ci
eea6082d9b Travis CI: API documentation update at 2014-08-11 18:54:27 UTC.
[ci package]
2014-08-11 18:54:27 +00:00
Lasse Öörni
5071b4324a Tabs to spaces. 2014-08-11 21:10:13 +03:00
Lasse Öörni
8357e50afb Merge remote-tracking branch 'remotes/ninjastone/master' 2014-08-11 21:00:49 +03:00
ninjastone
390016fd76 Added script bindings 2014-08-11 23:41:31 +09:00
aster
20450c8a8f Add missing class declartion. 2014-08-11 21:36:07 +08:00
aster
d13338f793 Add isometric map support. 2014-08-11 21:13:13 +08:00
aster
a1a48e02e9 Add tile set TSX support. 2014-08-11 20:27:56 +08:00
aster
56c677c759 Add tile map AngelScript binding and sample. 2014-08-11 18:15:46 +08:00
aster2013
a3c819f32a Add tile map Lua binding and sample. 2014-08-11 13:26:39 +08:00
aster2013
b81d08ba21 Move tile object define to TileMapDefs2D. Add half pixel offset in Direct3D mode. 2014-08-11 13:07:10 +08:00
Yao Wei Tjong 姚伟忠
2d04e9faac For Travis CI - fix the commit message for API documentation update. 2014-08-11 00:45:23 +08:00
aster
6b2566702c Remove some functions.[ci skip] 2014-08-10 22:29:32 +08:00
aster
2615d583b5 Change Properties2D derived from RefCounted. 2014-08-10 22:12:15 +08:00
Yao Wei Tjong 姚伟忠
20d1cef4c2 Fix line wrap in the Readme.txt when viewed from GitHub.
[ci skip]
2014-08-10 15:46:18 +08:00
Yao Wei Tjong 姚伟忠
0a9ca375ab Replace old link references.
[ci skip]
2014-08-10 15:38:32 +08:00
Yao Wei Tjong
7f225d1367 Merge pull request #422 from friesencr/short-names-no
Switch to long document output names.
2014-08-10 15:07:13 +08:00
Chris Friesen
705f2c78ed Switch to long document output names 2014-08-09 22:34:29 -05:00
ninjastone
b92aa88a73 Added function to list json object member value names 2014-08-10 02:57:17 +09:00
ninjastone
6347724b66 Fix index out of range 2014-08-10 02:42:01 +09:00
aster
7110a05c58 refactor tile map code. 2014-08-09 23:41:37 +08:00
Yao Wei Tjong 姚伟忠
eb8157c3eb Differentiate between SOVERSION and git revision number.
Closes #419. Test [ci package]
2014-08-09 01:12:36 +08:00
Yao Wei Tjong 姚伟忠
a1bee0af01 For Travis CI - wget quietly. 2014-08-09 01:10:30 +08:00
aster
f8aea4848d Fix Text.glsl error on Mac OS X. 2014-08-08 23:25:51 +08:00
aster
4d840600b3 Refactor tile map. 2014-08-08 23:24:04 +08:00
Yao Wei Tjong 姚伟忠
7c014df6dd For Travis CI - upload snapshot source packages to FRS.
Test [ci package].
2014-08-08 19:42:01 +08:00
Yao Wei Tjong 姚伟忠
becb97cdb6 Only give warning for 'bad' MinGW compiler when no SSE option given.
So that user does not receive the same warning subsequently after taking action to set the URHO3D_SSE option explicitly or after the correct setting has been set by the script.
2014-08-08 14:54:02 +08:00
Yao Wei Tjong 姚伟忠
6aa37fc87f Set default tab width to 2 for vi editor only for these two files. 2014-08-08 14:24:29 +08:00
Yao Wei Tjong 姚伟忠
eb24f558ea For Travis CI - Another attempt before falling back to NUMJOBS=2. 2014-08-08 13:24:09 +08:00
Yao Wei Tjong 姚伟忠
514ed2b9a3 For Travis CI - Another attempt by building 22_LuaIntegration first. 2014-08-08 13:11:20 +08:00
Yao Wei Tjong 姚伟忠
5989a5c4d9 For Travis CI - build AssetImporter separately from the rest.
Temporary workaround due to Travis-CI insufficient memory when building AssetImporter concurrently with other samples in 64-bit/MinGW/STATIC build configuration.
2014-08-08 12:46:10 +08:00
aster
b87c4f24fe Move some functions from header file to source file. For all of objects create node for it. 2014-08-07 22:23:38 +08:00
aster
573a0abe3d Add visible property to layer. 2014-08-07 21:50:15 +08:00
Lasse Öörni
6d5c73a15f Note that client cameras should be created into a local node in networked applications. 2014-08-07 10:45:50 +03:00
aster2013
0ab5fb8d16 Add tile properties. 2014-08-07 12:46:09 +08:00
aster2013
564343c3a6 Add properties. 2014-08-07 12:34:27 +08:00