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

9612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lasse Öörni
23c8af64c7 Added contributor credit. 2016-03-22 12:48:07 +02:00
Lasse Öörni
b7a7bdb705 Tabs to spaces, minor comment cleanup. Document new AssetImporter command line option. 2016-03-22 12:46:40 +02:00
Lasse Öörni
915944bd4a Merge remote-tracking branch 'neat3d/impoter' 2016-03-22 11:57:33 +02:00
Lasse Öörni
d1deb226d5 Merge remote-tracking branch '1vanK/master' 2016-03-22 11:48:38 +02:00
Terence
d73be95692 AssetImpoter can import a subset animation frames. 2016-03-22 03:51:45 +08:00
Lasse Öörni
709290346a Add contributors. 2016-03-21 12:22:50 +02:00
Lasse Öörni
3743a3c102 Merge remote-tracking branch 'r-ku/CreateObject' 2016-03-21 12:21:45 +02:00
Lasse Öörni
e178939f33 Merge remote-tracking branch 'rikorin/sample-fix' 2016-03-21 12:09:34 +02:00
Lasse Öörni
1afdd26927 Remove IsNull() checks from JSON save. Closes #1265. 2016-03-21 11:47:50 +02:00
rikorin
51c7a94a04 Type mismatch in vehicle sample code 2016-03-21 13:18:42 +05:00
Yao Wei Tjong 姚伟忠
41dc3142aa Fix performance issue on Emscripten build due to wrong SSE detection. 
[ci package]
Close #1259.
 2016-03-21 12:55:45 +08:00
bit
d503a84e81 Convenience method Context::CreateObject<T>() for creating objects akin to Node::CreateComponent<T>(...) 2016-03-20 17:41:08 +02:00
Yao Wei Tjong 姚伟忠
1e2baf7d7f Correct typo error in the ci_delete_mirror rake task. 
Related to commit c93c164e01
 2016-03-20 14:28:25 +08:00
Yao Wei Tjong 姚伟忠
adbbb08ab4 Pass extra CMake variable to external project when building tolua++. 2016-03-20 14:12:05 +08:00
Yao Wei Tjong 姚伟忠
771ee02b64 Also install copy of runtime DLL to the tool directory as necessary. 
Close #1214.
 2016-03-20 13:23:52 +08:00
Yao Wei Tjong 姚伟忠
c93c164e01 Fix head movement detection in ci_delete_mirror rake task. 
Close #1234. [ci skip]
 2016-03-20 12:11:41 +08:00
Yao Wei Tjong 姚伟忠
650238cb0b Fix the XAudio2 detection logic on Windows platform. 2016-03-20 11:20:49 +08:00
Ivan K
086cfa1687 Editor: fix all warnings; Complete UITemplate 2016-03-19 20:01:41 +04:00
Lasse Öörni
642f09817e Added contributor credit. Use "unsigned" data type consistently since it's guaranteed to be 32bit on the platforms Urho compiles on. 2016-03-19 14:11:58 +02:00
Lasse Öörni
2551e5698c Merge remote-tracking branch 'damu/master' 2016-03-19 13:38:54 +02:00
Yao Wei Tjong 姚伟忠
d4fb578645 Misc. bug fixes on the new FindDirectX.cmake module. 
The module does not use any of the internal Urho3D CMake variables now, so in theory it could be used for other projects too.
Close #1261. Close #1254.
 2016-03-19 19:31:33 +08:00
damu
1c80774106 Adapted code convention. 2016-03-19 12:14:43 +01:00
Lasse Öörni
4d3d2affbb Disable the in_title_click data & focus_click_pending tests for SDL windows mouse warp, as it seems to lead into issues when regaining focus. Closes #1258. 2016-03-19 12:10:08 +02:00
damu
8328a33de9 Optimized Image::Clear() for the four component case (ARGB). In my case this optimized Clear() only takes ~0.362ms compared to 14.853ms before, see http://i.imgur.com/8O7V77o.jpg http://i.imgur.com/qjhkaWw.jpg. 
There could be an issue, see #1260.
 2016-03-19 08:28:05 +01:00
Lasse Öörni
0631a8a9e2 Merge remote-tracking branch 'GKR/bugfix/sdl-wayland-undefined-references' 2016-03-19 01:16:14 +02:00
Lasse Öörni
aa1199ebf1 Add ODBC compile fix for Windows from lvshiling. Closes #1256. 2016-03-18 12:04:08 +02:00
urho3d-travis-ci
4a261b1f2c Travis CI: API documentation update at 2016-03-18 02:19:25 UTC. 
[ci package]

Commit: ecb0ee38a2

Message: Added missing include.
 2016-03-18 02:19:25 +00:00
hdunderscore
ecb0ee38a2 Added missing include. 2016-03-18 11:55:37 +11:00
Lasse Öörni
a973d8318d Implement pause/resume by sound type in Audio. Closes #1250. Demonstrate by pausing "Effect" type sounds in NinjaSnowWar when the game is paused. Cut quiet part from beginning of NutThrow sound to reduce perceived audio lag when attacking. 2016-03-17 23:01:55 +02:00
Gunnar Kriik
20c31802db Applied patch to fix undefined reference error when compiling for Wayland on Linux. 
This has been fixed in SDL, but no SDL release has been made that includes this fix.

The SDL fix can be found here:
https://hg.libsdl.org/SDL/rev/330f500d5815

In the mean time, this fixes Urho3D compilation on Linux.
 2016-03-17 19:04:09 +01:00
Yao Wei Tjong 姚伟忠
ccbc15f6a6 Fix MinGW build on Windows host system. 
Close #1247. Close #1251.
 2016-03-18 00:38:13 +08:00
urho3d-travis-ci
8f4884f1fb Travis CI: API documentation update at 2016-03-16 14:36:03 UTC. 
[ci package]

Commit: 3d9ea8eece

Message: Editor: fix some warnings
 2016-03-16 14:36:03 +00:00
Ivan K
3d9ea8eece Editor: fix some warnings 2016-03-16 15:47:39 +02:00
Ivan K
f27c48616d Editor russification 2016-03-16 15:47:38 +02:00
urho3d-travis-ci
e9cd8db735 Travis CI: API documentation update at 2016-03-16 10:07:14 UTC. 
[ci package]

Commit: a9625eae8a

Message: Add contributor credit, fix editor code comment.
 2016-03-16 10:07:15 +00:00
Lasse Öörni
a9625eae8a Add contributor credit, fix editor code comment. 2016-03-16 11:53:14 +02:00
Lasse Öörni
1877fb3b90 Minor space fix in code. Make editor stop itself when minimized and reduce defocused FPS to 10. Increase hierarchy window initial size to match inspector window initial size. 2016-03-16 11:51:17 +02:00
Lasse Öörni
cd920ccab8 Unify line break style in HashMap.h. 2016-03-16 11:26:28 +02:00
Lasse Öörni
cf64853faa Merge remote-tracking branch 'BlueMagnificent/global_variable' 2016-03-16 11:25:51 +02:00
Blue, The Magnificent
bfe39c6a3f Enhancement to global variable implementation 2016-03-15 23:08:01 +01:00
urho3d-travis-ci
385a1538fd Travis CI: API documentation update at 2016-03-15 18:11:17 UTC. 
[ci package]

Commit: be2ae85427

Message: Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt.
Fix SDL library build on iOS platform.
 2016-03-15 18:11:17 +00:00
Yao Wei Tjong 姚伟忠
be2ae85427 Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on iOS platform.
 2016-03-16 01:45:09 +08:00
Yao Wei Tjong 姚伟忠
06bcfbeb7b Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Web platform.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
3e40a5ebeb Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Windows platform.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
f5fcfc48f1 Set CMake minimum version to 3.2.3 for Windows platform. 
This is in preparation to use optional components feature of find_package() command for FindDirectX.cmake module (was FindDirect3D).
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
71efb146cb Refactor the CPU instruction extensions detection mechanism. 
Fix SDL build on the latest Raspbian Jessie release.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
14d4e0d378 Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Linux, Android, and RPI platforms.
 2016-03-16 01:45:08 +08:00
Lasse Öörni
250bb0e7d1 Include <cstdio> unconditionally in FileSystem.cpp to fix remove() compile error on Emscripten. 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
a09a153f5e Integrate SDL's original CMakeLists.txt into Urho3D build system. 
Close #1046. Close #1123. Close #1172.
 2016-03-16 01:44:11 +08:00
Yao Wei Tjong 姚伟忠
fba647f7f8 Refactor to handle graphics restore similarly between iOS and Android. 2016-03-16 01:42:01 +08:00