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

581 Commits

Author SHA1 Message Date
Yao Wei Tjong 姚伟忠
da01a0d5b1 Merge commit '987280793337c6caedaa65233b0611999614ab3c' as 'Source/ThirdParty/LibCpuId' 2018-02-03 23:46:25 +08:00
Yao Wei Tjong 姚伟忠
9722dd6011
Replace Source/ThirdParty/LibCpuId subdirectory with subtree. 2018-02-03 23:44:11 +08:00
Yao Wei Tjong 姚伟忠
c2ca48c410
Merge commit 'b597fc956489b2fb3fc651986db0de0cc41cfc32'. 2018-02-03 11:12:08 +08:00
Sandu Liviu Catalin
4740e142b3
Update the STB Image Write library. This removes the dependency on the Jo_JPEG library since it was integrated into STB Image Writte (github.com/nothings/stb/pull/432). 2018-02-03 10:46:06 +08:00
Yao Wei Tjong 姚伟忠
f1c1f5aa42 For CI - setup the lint stage on the primary CI. 2018-01-24 02:06:23 +08:00
urho3d-travis-ci
70049ba582 Travis CI: bump copyright to 2018. 
[cache clear]
 2018-01-01 05:35:37 +00:00
Yao Wei Tjong 姚伟忠
ad9c6594d1 Fix web build on Windows host system. 
Close #2224.
 2018-01-01 13:11:05 +08:00
Yao Wei Tjong 姚伟忠
40516e48c9 Add macro for checking the compiler's C++11 type trait templates. 
Modify angelscript.h header file to use our custom compiler define based on the check result to cater for pre-standard Clang compiler toolchain.
 2017-12-31 13:48:26 +08:00
Yao Wei Tjong 姚伟忠
28e4c64bfc Remove "execute" permission in the source files. 
[ci skip]
 2017-12-17 09:37:10 +08:00
Yao Wei Tjong 姚伟忠
cc5eccec1b Fix RPI build, could not have khronos in the header search path. 2017-12-17 02:03:18 +08:00
Yao Wei Tjong 姚伟忠
2af82c6eff Bug fix to allow build with appletvsimulator and iphonesimulator SDKs. 2017-12-17 01:51:32 +08:00
Yao Wei Tjong 姚伟忠
9b7ae13095 Fix the mistake when merging the custom changes. 2017-12-17 01:51:32 +08:00
Yao Wei Tjong 姚伟忠
afae5cae35 Remove the custom bug fix for SDL_x11opengl.c as SDL has fixed it. 2017-12-17 01:51:32 +08:00
Yao Wei Tjong 姚伟忠
3c692181bc Move the workaround to the FindDirectX.cmake module. 
Don't need to add the define via CMake anymore as the new SDL 2.0.7 header now has it baked in.
 2017-12-17 01:51:31 +08:00
Yao Wei Tjong 姚伟忠
68cea3a1e7 Remove SDL2Config.cmake. 2017-12-17 01:51:31 +08:00
Yao Wei Tjong 姚伟忠
1cc32beff6 Merge commit '28a8bc01ddef814b654840d30f1cc07651cc347a' into master. 2017-12-17 01:48:20 +08:00
Yao Wei Tjong 姚伟忠
bf9629144a Suppress C++11 warning on a compiler define. 2017-12-16 08:12:35 +08:00
Yao Wei Tjong 姚伟忠
8fe15fab49 Set compiler define to indicate iOS does not have system() function. 2017-12-16 08:09:51 +08:00
Yao Wei Tjong 姚伟忠
860922136b Fix iOS build to support 11.x deployment target. 
Close #2190.
 2017-12-15 23:32:34 +08:00
Eugene Kozlov
26ff4fce30 Fix AssImp compilation with VS 2017. Remove cmake_vs2013.bat. Closes #2191. 2017-11-25 09:04:41 +03:00
Yao Wei Tjong 姚伟忠
aaa4fd8eb8 Include one of assimp's cmake module for enabling Open3DGC for Linux. 
Fix header search path for the compiling Open3DGC build option.
 2017-10-24 21:52:19 +08:00
Yao Wei Tjong 姚伟忠
9b22e16324 Fix the intermittent Android-CI build failure 
Related to commit 6b63f20065.
 2017-10-14 14:30:22 +08:00
Yao Wei Tjong 姚伟忠
0af84653df Minor patch for the assimp's CMakeLists to fix MinGW build. 2017-10-14 08:37:02 +08:00
Yao Wei Tjong 姚伟忠
0c96975249 Merge commit '661527824a9364865142e46c2a46b2e57f64c8ce' as 'Source/ThirdParty/Assimp' 2017-10-12 22:58:00 +08:00
Yao Wei Tjong 姚伟忠
b096792dcc Replace Source/ThirdParty/Assimp subdirectory with subtree. 2017-10-12 22:57:57 +08:00
Yao Wei Tjong 姚伟忠
6b63f20065 Fix the intermittent Android-CI build failure. 
A few of the docker-containers for Android build environment in Travis may have been wrongly configured recently (have different CPU type than the rest) that the 'native' host tool built from the Android build environment caused illegal instruction (core dumped) when the tool was run on the container host. We are using "ccache" to cache the object files. For this to work, we expect to have a uniform build environments. Setting the deployment target to 'generic' for now in order to workaround the problem.
 2017-10-11 17:12:59 +08:00
Yao Wei Tjong 姚伟忠
c38299ae1b Merge commit '6f9bcea2833beb3a0b5a4428d7228d2206a58f5e' as 'Source/ThirdParty/AngelScript' 2017-10-01 17:00:22 +08:00
Yao Wei Tjong 姚伟忠
65ec0deca6 Replace Source/ThirdParty/AngelScript subdirectory with subtree. 2017-10-01 16:58:11 +08:00
Yao Wei Tjong 姚伟忠
b53cda9d6f Remove the nanodbc internal build options. 
To revisit when our code base and/or build system has catched up with them.
 2017-09-24 12:07:23 +08:00
Yao Wei Tjong 姚伟忠
27d00d19c6 Merge commit 'c5706e2c884636104906ea75dbf444ad82abf0f4' into master. 2017-09-23 20:58:06 +08:00
Henrik Heino
a149a71c78 Fix too strict assert in kNet. 2017-09-14 09:55:41 +03:00
Yao Wei Tjong
a8893bafca Merge pull request #2122 from rainerdeyke/master 
Hot-fix to AngelScript: fixed compile with address sanitizer.
 2017-09-10 16:35:05 +08:00
Yao Wei Tjong 姚伟忠
e29e743c2a Fix Android debug build caused by ik library. 2017-09-07 21:57:19 +08:00
Rainer Deyke
19acb12713 Hot-fix to AngelScript: fixed compile with address sanitizer. 2017-09-05 11:43:30 +02:00
cosmy
a6456e7308 Update sqlite to 3.20.1. 2017-08-24 21:15:24 +02:00
Lasse Öörni
3a85655248 Prevent use of system call also on iOS. Closes #2083. 2017-08-20 21:43:45 +03:00
Lasse Öörni
50dd3fd3c9 Fix memory backtrace option (Linux-only) getting enabled on non-Unix platform in debug build. 2017-08-19 20:38:45 +03:00
Lasse Öörni
12c394232c Disable verbose debug output (z_verbose & z_error) from FreeType's zlib, to make sure it doesn't clash with Assimp's zlib in a debug build. 2017-08-19 19:56:06 +03:00
TheComet
c43b269845 Updating script APIs, making sure sample compiles, see thread on the forum for more info 2017-08-06 17:08:14 +02:00
TheComet
1f679d6756 fixes #2058 - It probably still has some bugs that need fixing, and the script bindings need updating 2017-08-03 23:22:32 +02:00
TheComet
0e72531fe3 Gotta stop here, will continue tomorrow 2017-08-03 00:02:17 +02:00
TheComet
15f837d880 (Sorry) giving RebuildData() a more sensible name 2017-08-02 23:10:28 +02:00
TheComet
ea593632a5 Setting IK_RESTRICT properly this time. Also refactoring export.h.in 2017-07-29 21:53:40 +02:00
TheComet
cc8b06c8f9 Using #cmakedefine and making the for loop more efficient 2017-07-29 16:36:03 +02:00
Alex Murray
a7b20de253 config.h.in fail 2017-07-29 01:12:13 +02:00
TheComet
eaebb5e82b Fixing IK_HAVE_STDINT_H 2017-07-29 00:31:15 +02:00
TheComet
4f96c7c29f Refactoring the 'feature' setters and getters into a single method. Renaming a few things to be more consistent. Adding Documentation 2017-07-28 18:36:57 +02:00
TheComet
4a6d86804e Fixing bugs, updating script bindings and sample code 2017-07-28 03:42:16 +02:00
TheComet
bbaeccb11b Fixing compilation errors 2017-07-26 01:40:06 +02:00
TheComet
183cea3ef5 Merging updated IK library source files 2017-07-26 01:40:06 +02:00
Lasse Öörni
5fb53f9bd8 Better check for Android NEON support in WebP. 2017-07-22 13:18:48 +03:00
Lasse Öörni
93fc311b30 Disable NEON from WebP library on Android for now, as it results in compile error from the include files if the NEON instruction set is not in use. 2017-07-21 22:38:49 +03:00
Lasse Öörni
157130c612 Add WebP license and mention to library list. 2017-07-20 22:13:49 +03:00
carnalis
3339e5012b Initial commit of WebP image support 2017-07-20 00:43:15 -04:00
Yao Wei Tjong 姚伟忠
ec84cfdfd1 Remove the usage of add_compiler_export_flags() deprecated function. 
Fix #1945.
 2017-07-13 23:17:09 +08:00
Yao Wei Tjong 姚伟忠
7fc9aa816a Make clean for MinGW/Android/Web platforms. 
The rest of the platforms are already taken care of by this commit, however, only tested explicitly on Linux native, RPI, and ARM.
 2017-07-09 21:58:33 +08:00
Lasse Öörni
650f380623 Add base64 license, apply Urho code convention to base64 code since it's inside StringUtils.cpp. 2017-07-05 13:55:22 +03:00
Lasse Öörni
0b8af7cf04 Remove the FreeType docs/reference folder, as it has been Urho3D tradition to not include it. 2017-06-17 00:06:00 +03:00
Iain Merrick
4e851dbd4d Update FreeType to 2.8. 2017-06-15 13:07:34 -05:00
Lasse Öörni
86ba5e5bdd Update Bullet to 2.86.1. Thanks to slapin for the initial work. 2017-06-10 21:30:19 +03:00
Yao Wei Tjong 姚伟忠
c7a0149dc9 Another sweep for tvOS conditional code branch. 2017-06-05 23:04:09 +08:00
Yao Wei Tjong 姚伟忠
75b8420a31 Initial work for porting Urho3D to AppleTV platform. 2017-06-05 23:04:09 +08:00
1vanK
e1e6016eeb Update rapidjson lib 2017-05-04 17:28:02 +03:00
Lasse Öörni
d57e7bc5c4 Fix JSONValue::End() and typo. Closes #1925. 2017-05-02 20:46:46 +03:00
cosmy
aa6c87f18d Update LZ4 license year. 2017-04-26 20:39:09 +02:00
cosmy
0d91c33e22 Update LZ4 to 1.7.5. 2017-04-26 20:14:28 +02:00
cosmy1
3c360b9627 Update SQLite to 3.18.0. 2017-04-25 13:26:25 +02:00
cosmy1
0a66603da7 Update boost preprocessor to 1.64.0. 2017-04-25 13:14:15 +02:00
Yao Wei Tjong 姚伟忠
d53928310c Workaround struct redefinition on some newer MinGW header files. 
Fix #1899.
 2017-04-15 00:55:49 +08:00
Yao Wei Tjong 姚伟忠
0e4060b61a Use no_weak_imports linker flag to ignore weak symbol during detection. 2017-04-13 19:35:23 +08:00
orefkov
e4c5001bfb Copy changes from AngelScript's sources, revision r2382. 
Fixed problem with calling function expecting @&in where the argument was itself a & argument.
https://www.gamedev.net/topic/686912-array-with-objects-handles/
 2017-04-08 20:50:44 +03:00
Yao Wei Tjong 姚伟忠
9daf887f10 Phasing out universal binary build for macOS platform. 
Close #1895.
 2017-04-09 00:04:41 +08:00
Yao Wei Tjong 姚伟忠
240e4d1c54 Fix unnecessary exposure of ik's generated header files. 2017-04-04 13:47:06 +08:00
Yao Wei Tjong 姚伟忠
b3f4b1d9a0 Include memory backtrace source code only when the option is enabled. 
Prevent Web platform to enable the memory backtracing build option.
 2017-04-01 23:32:14 +08:00
Yao Wei Tjong 姚伟忠
e62179f133 Integrate IK sub-library with Urho3D's build system. 2017-04-01 21:28:27 +08:00
Alex Murray
68f8d23411 Fixing issues raised by Mike3D (incorrect offset in sample, exposing auto solve) 2017-03-22 14:23:14 +01:00
TheComet
327965a40c Fixing build on windows, fixing segfault in release builds 2017-03-22 02:15:32 +01:00
TheComet
d2911ad455 Adding ik library to Urho3D thirdparty libs 2017-03-21 15:56:47 +01:00
Yao Wei Tjong
106bfcb919 Merge pull request #1849 from iSLC/master 
Remove duplicate macro in SDL windows joystick implementation.
 2017-03-08 21:42:11 +08:00
Lasse Öörni
48a1f3dcdd Take fix from AngelScript WIP version to fix temp variable corruption. Remove now unnecessary fix from Editor script code. Closes #1850. 2017-03-08 14:26:52 +02:00
Sandu Liviu Catalin
d94a10f488 Remove duplicate macro in SDL windows joystick implementation. 2017-03-07 21:38:50 +02:00
Yao Wei Tjong 姚伟忠
0c88c99112 Allow possibility of building Urho3D without C++ exceptions feature. 
Disallow Android build to turn off C++ RTTI feature.
 2017-03-05 08:46:22 +08:00
Yao Wei Tjong 姚伟忠
f32cbb72b0 Rename Urho3D-CMake-common.cmake module to UrhoCommon.cmake. 
To be consistent with the other modules. Drop the '3D' simply because it sticks out in 'Urho3DCommon'.
 2017-03-05 08:45:39 +08:00
Yao Wei Tjong 姚伟忠
ffd24cafa1 Take advantage of CMAKE_SYSROOT available in the newer CMake. 
Use CMAKE_SYSROOT to manage the sysroot automatically when cross-compiling instead of adding the '--sysroot' flag manually everywhere. We only need to add it manually in places where CMake does not, like in our custom GCC/Clang response file for PCH.
Differentiate between setting up header search path for system headers and for application headers so that GCC/Clang may suppress compilation warnings from the former, if any.
 2017-03-05 08:45:39 +08:00
Yao Wei Tjong 姚伟忠
3b02eeb5eb For CI - suppress all the 3rd-party libraries' warnings. 
Somehow after bumping up the CMake minimum version, CMake configures Xcode to work "better" with xcpretty that now the warnings are piping through the xcpretty's filter. Unfortunately when performing CI build, this is undesirable because not only now the log size is swelling, the build is slower too.
 2017-03-05 08:45:38 +08:00
Yao Wei Tjong 姚伟忠
73c97d9f64 Only add defines at the scope they are actually required. 2017-03-05 08:45:38 +08:00
Yao Wei Tjong 姚伟忠
3d9eb3f694 Bake CC and CXX env-vars in case they are short lived in init process. 2017-03-05 08:45:38 +08:00
Yao Wei Tjong 姚伟忠
bbbbdb0108 Check native compiler toolchain is available before proceeding. 
Some cross-compiling build tree configuration needs native compiler toolchain for host tool building via ExternalProject_Add(). This additional check ensures the native compiler toolchain is available up front before the build tree is even generated. Close #1300.
 2017-03-05 08:45:21 +08:00
Yao Wei Tjong 姚伟忠
9f19d51c08 Remove older constructs that have been earmarked previously. 2017-03-05 08:34:41 +08:00
Yao Wei Tjong 姚伟忠
3475afba54 Bump the CMake minimum version in the CMakeLists.txt files. 2017-03-05 08:34:41 +08:00
Yao Wei Tjong 姚伟忠
cdbb694c2a Bake 'SDL_USE_IME' compiler define into SDL config header. 2017-02-19 12:34:55 +08:00
Yao Wei Tjong 姚伟忠
45b1d173cf Realign SDL's CMakeLists.txt with the cherry-picked SDL commits. 
Those commits are mainly for fixing the keyboard input handling on RPI platform.
 2017-02-18 01:21:57 +08:00
Yao Wei Tjong 姚伟忠
4a738662ee Merge commit 'c109e4b51d143493be185f0e74ba7ba2a1411d6e' into cherry-picked-SDL-keyboard-fix 2017-02-18 00:54:58 +08:00
Lasse Öörni
011a8f9ad6 Merge remote-tracking branch 'Florastamine/master' into update-assimp 2017-02-17 11:11:18 +02:00
Lasse Öörni
472d0dc549 Merge remote-tracking branch '1vanK/master' 2017-02-16 12:16:38 +02:00
1vanK
c5014a8399 Update Box2D lib, add RigidBody2D::ApplyLinearImpulseToCenter() 
Avoid requirement C++11 by Box2D lib
 2017-02-15 14:50:27 +03:00
Lasse Öörni
6a490f05f2 Update LibCpuId to 0.4.0. Closes #1819. 2017-02-13 22:20:48 +02:00
Florastamine
74e234a63d Updated Assimp to v3.2 2017-02-12 14:10:43 +07:00
cosmy1
bf64ce42f2 Update SQLite to 3.16.2. 2017-02-05 21:22:12 +01:00
Lasse Öörni
b8ee493454 Restore FreeType gzip debug build fix. 2017-01-31 14:29:12 +02:00