townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,202 Commits 3 Branches 3 Tags 168 MiB
cc
Commit Graph

10202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aster2013
412ae47aaf Merge branch 'master' of https://github.com/urho3d/Urho3D 2014-02-13 23:11:47 +08:00
aster2013
163921a072 UpdateDocument.bat and UpdateDocument.sh for new Lua Script Dox tool. 2014-02-13 23:07:53 +08:00
urho3d-travis-ci
a04d74f126 Travis CI: API documentation update at 2014-02-13 14:46:40 UTC. 
[ci skip]
 2014-02-13 14:46:40 +00:00
aster2013
21044135a5 Remove pkgToDox.lua, Rename some function and variant in ToDoxHook.lua. 2014-02-13 22:32:53 +08:00
Daniel Wiberg
0bcd1cfc5f Changed includes of Windows.h to windows.h so it's possible to cross-compile on Linux 2014-02-13 14:54:42 +01:00
Daniel Wiberg
dce4c5a2c5 Added support for cross-compiling Urho3D for Windows on Linux systems. 2014-02-13 14:54:18 +01:00
urho3d-travis-ci
eb8371b0dd Travis CI: API documentation update at 2014-02-13 13:48:14 UTC. 
[ci skip]
 2014-02-13 13:48:14 +00:00
Lasse Öörni
77129bb9cb Added statements for SDL modification to comply with the license. 2014-02-13 15:23:46 +02:00
Lasse Öörni
33ae3c8e58 Merge remote-tracking branch 'remotes/overminddl1/overminddl1-inputchanges' 2014-02-13 15:07:16 +02:00
aster2013
f455b2fac2 Update CMakeLists.txt for document. 2014-02-13 19:53:59 +08:00
aster2013
a910501027 Add ToDoxHook.lua to generate dox file from tolua++. 2014-02-13 19:49:28 +08:00
Lasse Öörni
f20e4968fc If a node is added to the scene with a zero ID (default), assign an ID. This would happen when constructing a node manually and adding it using AddChild(), instead of using CreateChild(). 2014-02-13 12:08:13 +02:00
Lasse Öörni
6a760116ff Added note on implementing scene logic, and that you should not subclass Node. 2014-02-13 11:43:42 +02:00
Yao Wei Tjong 姚伟忠
a6a19ebadb For Travis CI - make 32&64-bit and android build as mandatory to pass. 2014-02-13 15:11:38 +08:00
Lasse Öörni
e44e3f7652 Only signal work items that have specified or higher priority in WorkQueue::Complete(), to prevent lower priority work item events triggering when they shouldn't (in the middle of render update.) Set explicit max priority in Octree & View items, but leave default priority to the lowest for user items. Removed a static variable from WorkQueue::PurgePool(). 2014-02-12 23:04:48 +02:00
Yao Wei Tjong 姚伟忠
c8a8d15681 For Travis CI - attempt to fix 32-bit CI build. Skip Android SDK. 2014-02-13 00:05:32 +08:00
Lasse Öörni
b496c5a012 Added a square Urho icon (same as the Android icon) to use for the samples on desktop. 2014-02-12 15:19:58 +02:00
Lasse Öörni
705d2411ba Acquire event data for work item completion only when necessary. These are pooled by the Context so it shouldn't hurt performance. 2014-02-12 15:05:26 +02:00
Lasse Öörni
1e3722e54f Merge remote-tracking branch 'remotes/alexparlett/feature/pooled-work-queue' 2014-02-12 14:11:59 +02:00
Alex Parlett
884be1c22d Exposed ability to set the tolerance before the pool will begin erasing items. 
Modified the way in which pooled items are tracked to remove a number of O(n) searches.
Modified the check for duplicate items into an assert so its caught in debug but not in release.
 2014-02-12 10:47:48 +00:00
OvermindDL1
13e07265db Er, right, C code, no static_cast... 2014-02-12 03:03:22 -07:00
Lasse Öörni
00cf05c2a2 Document what is unsafe in WorkQueue work functions. 2014-02-12 11:58:27 +02:00
OvermindDL1
34fb889906 Added support for the Keyboard Raw value to Urho3D. 2014-02-12 02:56:14 -07:00
OvermindDL1
9f8a1ab977 Tabs to spaces indention changes to match everything else... 2014-02-12 02:48:20 -07:00
OvermindDL1
1ea3e8b0f9 *cough* ignore the duplicate comma... 2014-02-12 02:41:44 -07:00
OvermindDL1
d7f3c9ae66 Added support for raw keyboard keys to all other platforms, passes 0 for ones where there is not a raw code that makes sense, else passes in something sensible. 2014-02-12 02:33:54 -07:00
OvermindDL1
dba4216c86 Changed SDL to support unknown keys and pass them as the unused/raw keysym field as it seems that it used to do... 
Will fix Urho3D to read that field and pass it to the Variant event for the systems to process if wanted.
 2014-02-12 02:12:25 -07:00
Yao Wei Tjong 姚伟忠
f95328ac0f For Travis CI - speedup CI build for pull requests. 2014-02-12 16:21:38 +08:00
Yao Wei Tjong 姚伟忠
73732f6653 Fix luajit runtime error on 64-bit Mac OS X build. [ci skip] 2014-02-12 14:57:48 +08:00
urho3d-travis-ci
e18f481eea Travis CI: API documentation update at 2014-02-11 20:02:28 UTC. 
[ci skip]
 2014-02-11 20:02:28 +00:00
Lasse Öörni
fd140ddb32 Minor code reorganization of the HelloGUI example. Removed SubscribeToEvents() as it was only used for 1 event and events were also subscribed to elsewhere. 2014-02-11 21:41:57 +02:00
Lasse Öörni
e0166ce900 Merge remote-tracking branch 'remotes/mike3d/master' 2014-02-11 21:06:20 +02:00
Lasse Öörni
e4008732d1 Merge remote-tracking branch 'remotes/alexparlett/feature/pooled-work-queue' 2014-02-11 20:32:50 +02:00
Yao Wei Tjong 姚伟忠
0c41be144f Use CMake path instead of native path. Closes #188. 2014-02-11 23:53:29 +08:00
aster2013
9def6c0541 Fixed typo. 2014-02-11 23:53:06 +08:00
aster2013
df315fbeb4 Merge branch 'master' of https://github.com/urho3d/Urho3D 2014-02-11 23:50:13 +08:00
aster2013
b7990b94da Modify tolua_isnumber and tolua_isstring function to fixed issue #182. 2014-02-11 23:49:20 +08:00
Alex Parlett
e8abdfc366 Added Pool for WorkItem SharedPtrs to save allocation every frame. Its an optional construct to allow the user to create their own pools or not use the pool if they so desire. 
Below is the profiling for the Octree and View changes to pooled allocation.

Before:
UpdateDrawables                        35    0.139    0.193    0.135     4.871
SortAndUpdateGeometry          35    0.080    0.135    0.077     2.802

After:
UpdateDrawables                        21    0.082    0.172    0.078     1.735
SortAndUpdateGeometry          21    0.054    0.069    0.052     1.144
 2014-02-11 15:46:05 +00:00
Yao Wei Tjong 姚伟忠
a6eb19f5ba For Travis CI - temporary disable 32-bit. Android CI build is OK now! 2014-02-11 23:23:05 +08:00
Yao Wei Tjong 姚伟忠
ca36bf1e17 For Travis CI - change the subshell to bash shell. Pardon our dust. 2014-02-11 23:03:32 +08:00
Yao Wei Tjong 姚伟忠
357019e0f3 For Travis CI - subshell could not export var, so define it elsewhere. 2014-02-11 22:55:19 +08:00
Yao Wei Tjong 姚伟忠
797528b3c8 For Travis CI - complete the last branching with a true command. 2014-02-11 22:07:10 +08:00
Yao Wei Tjong 姚伟忠
18c2418064 For Travis CI - change the sh option from -e to -c. 2014-02-11 21:54:02 +08:00
Yao Wei Tjong 姚伟忠
09742eb18e For Travis CI - another attempt to add more CI build matrix. 2014-02-11 21:50:12 +08:00
Yao Wei Tjong 姚伟忠
d85d24ae82 For Travis CI - attempt to setup 32-bit and Android CI build. 2014-02-11 21:39:56 +08:00
Mike3D
cde67d7391 Fix various order of exposition to lua 2014-02-11 13:53:26 +01:00
Mike3D
a0f42bee35 Added drag and tooltip to sample#2 HelloGUI 2014-02-11 09:49:53 +01:00
Yao Wei Tjong 姚伟忠
327ab9af76 Minor tweak to link lua/luajit tool without Urho3D dependency libs. 
These changes should also reduce prerequisite for building 32-bit luaJIT VM (for Android and RASPI) on 64-bit host/build system.
 2014-02-11 13:47:36 +08:00
urho3d-travis-ci
e2ea3404d6 Travis CI: API documentation update at 2014-02-11 01:34:00 UTC. 
[ci skip]
 2014-02-11 01:34:00 +00:00
Lasse Öörni
ffd5b7de5e Fix order of exposing AnimatedModel functions to Lua so that all overloads of SetMorphWeight() & GetMorphWeight() work. Closes #182. 2014-02-11 03:18:06 +02:00