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
Eugene Kozlov
048ed5cf3e Update test code. 2017-11-11 21:17:14 +03:00
Eugene Kozlov
22ed4a63e9 Remove non-obvious macro accessors generators. Fix out-of-Urho3D serializables compilation. 2017-11-11 21:17:02 +03:00
Eugene Kozlov
eb66698487 Temporarily add serialization test code. 2017-11-11 19:21:51 +03:00
Eugene Kozlov
1b0fec98de Add attributes with custom set and get functions. 2017-11-11 19:21:50 +03:00
Rokas Kupstys
d4c64c110f Remove headers few headers from Urho3DAll.h 
* Urho3D/IK/IKConverters.h - includes headers from third party ik library which is not bundled in the SDK.
* Graphics/GraphicsImpl.h - includes headers from third party GLEW library which is not bundled in the SDK.
 2017-11-11 13:25:51 +02:00
Eugene Kozlov
23a15c893a Fix CascadeParameters.splits_ AS binding. 2017-11-11 13:54:22 +03:00
Eugene Kozlov
7a3ec74ea4 Refactor attributes. Minor changes. 2017-11-11 13:00:35 +03:00
att-kin9
7ab0d69d0b
Deleted default parameter passed. 2017-11-08 22:49:02 +08:00
att-kin9
29e92fd246
Fixed failing for picking rigidbody. 
Fixed failing for picking rigidbody on touch devices.
 2017-11-07 11:42:03 +08:00
SuperWangKai
611fc1fbff
Merge pull request #7 from urho3d/master 
Sync with urho3d
 2017-11-05 16:37:30 +08:00
Yao Wei Tjong 姚伟忠
37cba9522d Disable URHO3D_SSE by default (as original intended) for old MinGW. 2017-10-31 21:43:07 +08:00
Eugene Kozlov
b84239a3ae Add missing Swap.h include in Ptr.h. 2017-10-28 22:18:16 +03:00
urho3d-travis-ci
0c43256b28 Travis CI: API documentation update at 2017-10-28 18:04:11 UTC. 
[ci package]

Commit: 56f4c6cb79

Message: Minor changes in ScriptInstance. Use &inout qualifier for AS Array::Swap.
 2017-10-28 18:04:11 +00:00
Eugene Kozlov
56f4c6cb79 Minor changes in ScriptInstance. Use &inout qualifier for AS Array::Swap. 2017-10-28 20:32:10 +03:00
orefkov
187a353d6b Improve serialization of ScriptInstance (#2156) 
* Added serialization of Array<String> and Array<Variant> attributes of ScriptInstance.

* Fix error in load content of Array<String> and Array<Vector> attributes in deserealization.
Add metod Swap in Array<T> script object for swap content of two arrays for avoid copy.

* Changes by code review.

* Fix error in deserialize String[] and Vector[] attributes of ScriptInstance in background scene loading.
 2017-10-28 20:29:28 +03:00
Yao Wei Tjong 姚伟忠
21ed39fad6 Remove support for old Visual Studio versions. 
Only newer versions that can handle C++11 features are supported now.
 2017-10-26 22:52:15 +08:00
Eugene Kozlov
272eea57c5 Merge pull request #2158 from Modanung/patch-1 
Removed a "been" from networking documentation
 2017-10-26 00:38:29 +03:00
Frode Lindeijer
5cd69855b2 Removed a "been" from networking documentation 2017-10-25 22:53:59 +02: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
orefkov
b8335f5059 In scripting optimize searching node's script object by their type name (#2154) 
Optimizing in scripting searching by type name in Node.GetScriptObject(const String&) and allow searching by implemented interfaces.
 2017-10-21 09:33:13 +08:00
Yao Wei Tjong 姚伟忠
d9249c56d8 For CI - fix normal OSX-CI build after a successful packaging build. 
[ci only: OSX] [skip appveyor]
 2017-10-16 23:28:47 +08:00
Eugene Kozlov
04c615822c Fix SharedPtr assignment. 2017-10-15 15:04:38 +03:00
urho3d-travis-ci
07024da809 Travis CI: API documentation update at 2017-10-15 11:49:59 UTC. 
[ci package]

Commit: 69ffd879f3

Message: Merge pull request #2140 from eugeneko/master

Add internal layout functions for ListView.
 2017-10-15 11:49:59 +00:00
Eugene Kozlov
69ffd879f3 Merge pull request #2140 from eugeneko/master 
Add internal layout functions for ListView.
 2017-10-15 14:38:30 +03:00
Eugene Kozlov
4475565749 Add AS and Lua bindings for ListView internal layout functions. 2017-10-14 12:37:47 +03: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 姚伟忠
192903ba32 Fix Android cross-compiling build on Windows host system. 
Close #2148.
 2017-10-14 12:53:07 +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 姚伟忠
9a7a590548 Update assimp version in the documentation. 2017-10-13 23:52:13 +08:00
Yao Wei Tjong 姚伟忠
661527824a Squashed 'Source/ThirdParty/Assimp/' content from commit 2531d22 
git-subtree-dir: Source/ThirdParty/Assimp
git-subtree-split: 2531d2226cd12d4dec69a540c87a31a7c1c45e36
 2017-10-12 22:58:00 +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
Eugene Kozlov
5e8a2756db Merge pull request #2143 from lieff/master 
fix typo in Quaternion opSub
 2017-10-10 22:45:24 +03:00
lieff
e269c0c082 fix typo in Quaternion opSub 2017-10-10 18:49:25 +03:00
Eugene Kozlov
8d49cbba00 Add internal layout functions for ListView. 2017-10-03 23:57:16 +03:00
Yao Wei Tjong 姚伟忠
69d3e55781 Update AngelScript version. 2017-10-01 17:23:54 +08:00
Yao Wei Tjong 姚伟忠
6f9bcea283 Squashed 'Source/ThirdParty/AngelScript/' content from commit 886dc42 
git-subtree-dir: Source/ThirdParty/AngelScript
git-subtree-split: 886dc42a4901a74fbd795adfd3c1aa27a3fb73d3
 2017-10-01 17:00:22 +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 姚伟忠
c7da2f52a3 For CI - rename the Travis-CI build stages. 2017-09-30 17:44:03 +08:00
Yao Wei Tjong 姚伟忠
6acd0d57f0 Add contributor. 2017-09-30 17:26:28 +08:00
Yao Wei Tjong 姚伟忠
6a2d2a7971 Merge branch 'alex-rass-88-master' into master. 2017-09-30 17:23:20 +08:00
Alexey Rassikhin
e66561464f Switch Lua gc mode to incremental step 2017-09-29 09:59:14 +03:00
Yao Wei Tjong
683a8d0aa4 Merge pull request #2134 from Modanung/docs-correction 
Two minor corrections in Network documentation.
 2017-09-28 22:53:35 +08:00
Frode Lindeijer
4482278841 Two minor corrections in Network documentation 2017-09-26 17:40:05 +02: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 姚伟忠
1e7efab8af Update nanodbc version. 2017-09-23 21:03:42 +08:00
Yao Wei Tjong 姚伟忠
d8d00567fb Rename nanodbc string type to match the upstream. 2017-09-23 21:01:09 +08:00
Yao Wei Tjong 姚伟忠
27d00d19c6 Merge commit 'c5706e2c884636104906ea75dbf444ad82abf0f4' into master. 2017-09-23 20:58:06 +08:00