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
Yao Wei Tjong 姚伟忠
fcbc0030c5 Move the crowd navigation sample unit test out of primary AppVeyor CI. 
A new secondary AppVeyor CI mirro branch is now setup just for troubleshooting the offending sample.
Related to issue #1200.
 2016-02-25 23:32:53 +08:00
Lasse Öörni
cd6292d358 Merge pull request #1211 from TheComet93/AnimationTrack 
Exposing AnimationTrack class as part of the public API
 2016-02-25 10:49:39 +02:00
TheComet
b64f4a7c2e Exposing AnimationTrack class as part of the public API 2016-02-24 22:48:56 +01:00
dragonCASTjosh
6313b6f80e Initial Work (May not work) 2016-02-24 11:46:18 +00:00
Lasse Öörni
8c839265f0 Use camera's frustum for Renderer2D culling always. Closes #1191. 2016-02-24 11:51:09 +02:00
Yao Wei Tjong 姚伟忠
6e0a447ebb Break fix for SDL library build when using Raspbian Jessie. 
[ci only: RPI] [skip appveyor]
 2016-02-22 23:26:41 +08:00
Lasse Öörni
86adac5ff7 When a 2D rigidbody is parented, make sure the transforms are applied in parent->child order. Also apply the world position also for a static or sleeping rigidbody when it's parented, to make sure the simulation and rendering transforms stay in sync. Fix possible issue with null weakptr during physics 2D update. Closes #1183. 2016-02-21 14:14:16 +02:00
urho3d-travis-ci
c070f76ad8 Travis CI: API documentation update at 2016-02-21 10:22:26 UTC. 
[ci package]

Commit: 09e1330f5f

Message: Add Technique::Clone(). Improve Technique / Pass Lua bindings. Closes #1203.
 2016-02-21 10:22:27 +00:00
Lasse Öörni
09e1330f5f Add Technique::Clone(). Improve Technique / Pass Lua bindings. Closes #1203. 2016-02-21 12:12:53 +02:00
Yao Wei Tjong 姚伟忠
3582dccabb Partially revert back changes in the FileWatcher class. 
The thread needs to be stopped before closing the file watcher on OSX platform to avoid segfault.
Related to e1c5057bee.
 2016-02-21 10:31:23 +08:00
Lasse Öörni
4b7307ca2f Always disable use of aligned structs in Bullet API. Closes #1193 and #1134. 2016-02-20 23:18:29 +02:00
Lasse Öörni
281de051a5 Remember to copy shader parameter hash when a material is cloned. Closes #1192. 2016-02-17 19:40:23 +02:00
Lasse Öörni
e1c5057bee Merge remote-tracking branch 'TheComet93/iss1196' 2016-02-17 19:10:26 +02:00
Lasse Öörni
9fa87d54b6 Similar implicit conversion for WeakPtr. 2016-02-15 17:58:35 +02:00
Lasse Öörni
01d98cdf2c Tab to space. Added contributor credit. 2016-02-15 17:46:46 +02:00
Lasse Öörni
67a7c3f2bc Merge remote-tracking branch 'AntonPetrov83/sharedptr-implicit-conversion' 2016-02-15 17:31:24 +02:00
Lasse Öörni
46e434141e Apply & further improve WorldToHeightMap() fix from Lumak. 2016-02-15 17:00:33 +02:00
Lasse Öörni
614742412d Merge pull request #1198 from Enhex/master 
Updated PackageTool's options description.
 2016-02-15 13:38:31 +02:00
Yao Wei Tjong 姚伟忠
5e41f1fb2e For Travis CI - reduce number of parallel build process for Web-CI. 2016-02-14 15:00:23 +08:00
Enhex
38b2020875 Updated PackageTool's options description. 2016-02-13 18:09:53 +02:00
TheComet
a48f0e57ad fixes #1196 - Filewatcher no longer gets stuck in read() 2016-02-13 01:53:48 +01:00
Антон Петров
a6015e921b Allow implicit conversions of SharedPtr objects. 2016-02-13 01:39:19 +03:00
Lasse Öörni
213be51f92 Fix 2D particle emitter case where it would potentially try to emit more particles than there is space reserved for. Thanks yiown. Closes #1190. 2016-02-11 17:32:35 +02:00
Lasse Öörni
3e15c400ff Fix uninitialized bool variable in editor script. Closes #1189. 2016-02-11 17:24:11 +02:00
Lasse Öörni
30c9fcc8df Cleanup use of unsigned long from OBJ exporter code, as it's actually different sized on different platforms. 2016-02-10 11:11:23 +02:00
Lasse Öörni
e70ac370a2 Merge pull request #1187 from MonkeyFirst/Fix-obj-exporter-bugs 
fix obj exporter bugs
 2016-02-10 10:59:26 +02:00
Lasse Öörni
de6828ff6e Merge pull request #1188 from MonkeyFirst/fix-for-ui-typing-in-b.mode 
fix-for-ui-typing-in-b.mode
 2016-02-10 10:46:55 +02:00
MonkeyFirst
17a8d6c450 fix-for-ui-typing-in-b.mode 2016-02-08 04:34:56 +06:00
MonkeyFirst
4a9fb69f62 fix obj exporter bugs 2016-02-06 15:57:37 +06:00
Yao Wei Tjong 姚伟忠
b528268d81 Correct copy-paste error on Matrix2 header file. 
[ci package]
 2016-02-06 00:05:30 +08:00
Yao Wei Tjong 姚伟忠
87b9d482ab For CI - attempt to free up some disk space by removing redundant SDKs. 
Close #1115.
 2016-02-06 00:04:12 +08:00
urho3d-travis-ci
64877df1e3 Travis CI: API documentation update at 2016-02-05 12:05:57 UTC. 
[ci package]

Commit: 45572769c6

Message: Merge remote-tracking branch 'TheComet93/matrix2'

# Conflicts:
#	Source/Urho3D/AngelScript/MathAPI.cpp
 2016-02-05 12:05:57 +00:00
Lasse Öörni
45572769c6 Merge remote-tracking branch 'TheComet93/matrix2' 
# Conflicts:
#	Source/Urho3D/AngelScript/MathAPI.cpp
 2016-02-05 13:51:07 +02:00
Lasse Öörni
548c551560 Merge branch 'master' of https://github.com/urho3d/Urho3D 2016-02-05 10:49:21 +02:00
TheComet
7446b5dfb2 Re-trying CI 2016-02-04 18:56:22 +01:00
TheComet
bfa6e3de91 Adding Lua bindings for Vector2::Angle() 2016-02-04 18:45:47 +01:00
TheComet
2281162d7a Adding AngelScript bindings for Vector2::Angle() 2016-02-04 18:44:27 +01:00
TheComet
d38c24d4f2 Wrote Angle() member function for Vector2 class 2016-02-04 18:42:45 +01:00
TheComet
217066baf2 Adding lua bindings for Matrix2 2016-02-04 18:41:38 +01:00
TheComet
a42299202c Adding AngelScript bindings for Matrix2 2016-02-04 18:41:23 +01:00
TheComet
ab2198ecb1 Added Matrix2 class 2016-02-04 17:20:52 +01:00
Yao Wei Tjong 姚伟忠
d5d4409bc1 Update OSX and iOS bundle info plist. 
Set the iOS initial device orientation and status bar flag to match with what will be set programatically later to avoid unwanted artifacts during app launches. Also set the new iOS key "UIRequiresFullScreen" to opt out from iOS 9 Slide-Over and Split-View. User making non-gaming apps using Urho3D may want to remove this iOS key though.
[ci skip]
 2016-02-04 12:07:44 +08:00
Lasse Öörni
4d486462aa Merge branch 'master' of https://github.com/urho3d/Urho3D 2016-02-03 13:35:39 +02:00
Yao Wei Tjong 姚伟忠
57986eafd6 Ignore (brew) bash completion cache file for rake command. 
[ci skip]
 2016-02-03 16:35:41 +08:00
Yao Wei Tjong 姚伟忠
7c2be809c0 Don't use Clang color diagnostics when building LuaJIT_universal. 2016-02-03 15:40:40 +08:00
Yao Wei Tjong 姚伟忠
911d26674a Fix luajit (interpreter) target dependency. 
It should just depend on LuaJIT_universal custom target instead of LuaJIT target when the custom target is available. This ensures parallel build always ends up in a deterministic/desired order. The issue was picked up thanks to Travis CI again.
[ci only: OSX] [skip appveyor]
 2016-02-03 11:48:11 +08:00
Yao Wei Tjong 姚伟忠
361e426704 Fix post build script to only do copy when it is absolutely required. 
[ci only: master, AppVeyor, OSX]
 2016-02-03 00:02:01 +08:00
Yao Wei Tjong 姚伟忠
1e311acb6a Speed up build for Debug configuration by building only active arch. 2016-02-02 22:19:57 +08:00
Yao Wei Tjong 姚伟忠
a854b58371 Remove CMake workaround for enabling c++11 standard for Clang. 
The bug appears to be fixed already in the latest CMake version.
 2016-02-01 12:48:49 +08:00
Yao Wei Tjong 姚伟忠
cb82cf181c Do not search for Readline on Android, iOS, and Web platforms. 2016-02-01 11:12:27 +08:00