townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,836 Commits 3 Branches 3 Tags 168 MiB
upstream-octree
Commit Graph

9836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lasse Öörni
cdc06e6cec Fix null exception in txml import. 2014-08-28 18:36:12 +03:00
urho3d-travis-ci
13595673ce Travis CI: API documentation update at 2014-08-28 11:16:07 UTC. 
[ci package]
 2014-08-28 11:16:07 +00:00
Lasse Öörni
3f5280aa3a Add one second delay to file change notifications by default. Possibly helps with #408. Removed FileWatcher from Lua bindings as it's not a class you can readily use from script and it is not exposed to AngelScript either. 2014-08-28 14:04:09 +03:00
Yao Wei Tjong 姚伟忠
2e8f480990 For Travis CI - MinGW STATIC CI build workaround again. 2014-08-28 17:22:29 +08:00
Yao Wei Tjong 姚伟忠
2a33e6eea3 Do not use SONAME for Android SHARED libs as it does not support it. 2014-08-28 16:41:33 +08:00
Yao Wei Tjong 姚伟忠
ac20004e87 For Travis CI - Scale back to use just 1 process when retrying. 2014-08-28 13:39:09 +08:00
aster2013
058428dc9c Revert test code.[ci skip] 2014-08-28 13:38:14 +08:00
urho3d-travis-ci
717d492b9a Travis CI: API documentation update at 2014-08-28 04:29:46 UTC. 
[ci package]
 2014-08-28 04:29:46 +00:00
aster2013
c82759de85 Add STAGGERED tile map support. 2014-08-28 12:18:35 +08:00
Yao Wei Tjong 姚伟忠
634658c835 Bump the default NDK API level to 12 matching Urho3D Android manifest. 
[ci package]
 2014-08-28 08:57:04 +08:00
Yao Wei Tjong 姚伟忠
0fffb18972 For Travis CI - Fix downloading from wrong Android NDK arch. 2014-08-28 08:17:45 +08:00
Yao Wei Tjong
83b58dacdc Update android.toolchain.cmake to include NDK r10. 2014-08-28 02:03:18 +08:00
Yao Wei Tjong 姚伟忠
cda4637106 For Travis CI - Revert back to always install ALSA for all platforms. 
Straightly speaking ALSA is not required while cross-compiling to other non-Linux targets. However, in the CI build we have enabled Lua or LuaJIT and because of that we have to build some native tool(s). The problem is when configuring native project on a Linux build system, we could not inform our CMake script to ONLY configure for the tool building. Currently the script always attempt to configure most of things including SDL which in turns depends on ALSA, although actually the Lua tool building does not require it.
[ci package]
 2014-08-28 01:04:35 +08:00
urho3d-travis-ci
c75f56da41 Travis CI: API documentation update at 2014-08-27 16:22:36 UTC. 
[ci package]
 2014-08-27 16:22:36 +00:00
Yao Wei Tjong 姚伟忠
83bb4be238 Fix Angelscript binding for TileMapObject2D. 2014-08-28 00:06:25 +08:00
Yao Wei Tjong 姚伟忠
bb1a410831 For Travis CI - For MinGW STATIC build, retry sample build for 3 times. 
Each retry should build starts from where it fails, so hopefully it would not hit the memory limit.
Closes #431.
 2014-08-27 23:52:14 +08:00
Yao Wei Tjong 姚伟忠
46f4f6fa24 For Travis CI - Upgrade to Android NDK r10 and SDK r23.0.2. 
Closes #429.
 2014-08-27 23:52:14 +08:00
Yao Wei Tjong 姚伟忠
5761839635 For Travis CI - Install libasound2-dev only when targetting Linux. 
Closes #430.
 2014-08-27 23:52:14 +08:00
aster
649edf054d Rename TileObject2D to TileMapObject2D, rename some functions. 2014-08-27 22:21:29 +08:00
aster2013
18a8a4e640 Add draw debug geometry for tile map, fix tile map object position bug. 2014-08-27 13:11:46 +08:00
aster2013
3539eda839 Merge branch 'master' of https://github.com/urho3d/Urho3D 2014-08-27 13:06:57 +08:00
Chris Friesen
d12ec82b37 Fix reference to spritehelper url thx Mike3D 2014-08-26 01:01:44 -05:00
xDarkShadowKnightx
cb92ea9d64 A basic terrain editor that integrates with the Urho3d Editor. This is in very early stages. It currently supports raising/lowering terrain, setting the height of the terrain, and smoothing the terrain (which needs some serious improvisation). This is all done using "Brushes", which you can create and edit (only the alpha of the brush affects the brushes effect on the terrain). Terrains are saved to the file they we're loaded from, and editing one will cause SetSceneModified to be called (therefore prompting you to save before exiting). This is WIP and should not be considered done by any means. 2014-08-25 23:22:35 -04:00
aster2013
f0e874c69f Merge branch 'master' of https://github.com/urho3d/Urho3D 2014-08-25 10:27:13 +08:00
urho3d-travis-ci
26bdba2039 Travis CI: API documentation update at 2014-08-24 09:24:49 UTC. 
[ci package]
 2014-08-24 09:24:49 +00:00
Lasse Öörni
0472b4d410 Allow sending client observer rotation in addition to position. Note that rotation is not used by the NetworkPriority component, but can be used for custom logic. Do not send the observer pos/rot until actually set by the client. Closes #428. 2014-08-24 02:42:27 +03:00
urho3d-travis-ci
3fcb89e176 Travis CI: API documentation update at 2014-08-23 13:06:49 UTC. 
[ci package]
 2014-08-23 13:06:49 +00:00
aster
46fcd67794 Add name and type support for tile map objects. 2014-08-23 20:57:53 +08:00
aster
134d26814f Merge branch 'master' of https://github.com/urho3d/Urho3D 2014-08-22 21:08:30 +08:00
aster2013
578310a05e Merge branch 'master' of https://github.com/urho3d/Urho3D 2014-08-22 18:16:39 +08:00
aster2013
e18fc4e5e2 Add cmake options to Readme.txt [ci skip] 2014-08-22 17:50:08 +08:00
aster2013
937ed5f732 Merge branch 'more-options' 2014-08-22 17:47:06 +08:00
urho3d-travis-ci
e50ec823a5 Travis CI: API documentation update at 2014-08-22 05:03:50 UTC. 
[ci package]
 2014-08-22 05:03:50 +00:00
aster2013
a2ead6f404 Add index to position convert function in TileMap2D 2014-08-22 12:52:41 +08:00
aster
753d5bfc91 Merge branch 'master' of https://github.com/urho3d/Urho3D 2014-08-21 23:32:09 +08:00
urho3d-travis-ci
10efcd8c6a Travis CI: API documentation update at 2014-08-21 13:13:48 UTC. 
[ci package]
 2014-08-21 13:13:48 +00:00
aster2013
a04edb1108 Refactor tile map, add TileMapInfo2D struct. 2014-08-21 21:03:03 +08:00
aster2013
6caa0ade65 When resource's name is empty, set file name as resource name. 2014-08-21 13:54:04 +08:00
aster2013
25132bd4a0 ADD URHO3D_PHYSICS AND URHO3D_NAVIGATION OPTIONS. 2014-08-21 12:41:24 +08:00
Yao Wei Tjong 姚伟忠
3f24b74025 Fix the RELEASE_TAG conditional check. 2014-08-21 02:11:10 +08:00
urho3d-travis-ci
bd39c6d6af Travis CI: API documentation update at 2014-08-20 17:31:39 UTC. 
[ci package]
 2014-08-20 17:31:39 +00:00
Lasse Öörni
9246a5cfdb Dump a class list to AngelScript & Lua API dox pages. Also add a table of contents to both. Closes #426. 2014-08-20 20:16:42 +03:00
Yao Wei Tjong 姚伟忠
4f571f7df5 For Travis CI - Demoting Doxygen's h1 to h2 and h2 to h3. 
This process is only carried out when building Doxygen documentation pages in the CI server because those pages are intended to be embedded inside a Jekyll template.
Closes https://github.com/urho3d/urho3d.github.io/issues/3.
Also reverting back the scripting done for one time documentation build.
[ci skip]
 2014-08-19 20:19:59 +08:00
Yao Wei Tjong 姚伟忠
0e0979d42d One time documentation build for HEAD and past two releases. Take 2. 2014-08-19 20:04:29 +08:00
Yao Wei Tjong 姚伟忠
2ee30602d3 One time documentation build for HEAD and past two releases. 2014-08-19 19:58:49 +08:00
Lasse Öörni
a06c328305 Store Connection's address & port on construction, so that we do not log a zero address later if the socket has already been destroyed. 2014-08-19 11:14:13 +03:00
aster2013
d17f5c3f57 Fix typo.[ci skip] 2014-08-19 15:03:28 +08:00
Yao Wei Tjong 姚伟忠
bc35f91a6f For Travis CI - preparation for versioned site documentation update. 2014-08-17 14:23:43 +08:00
aster
bb0ffb942a Merge branch 'master' of https://github.com/urho3d/Urho3D 2014-08-14 20:26:37 +08:00
Lasse Öörni
1c6d04c6b5 Send UIMOUSECLICK event on click to emptiness even if there is a modal element. Fixes #423. 2014-08-14 14:08:06 +03:00