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

9869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yao Wei Tjong 姚伟忠
829d1923a6 Use force when pushing local subtree to remote. 2016-01-31 13:15:08 +08:00
Yao Wei Tjong 姚伟忠
17026be8eb Expose RenderPathCommand and RenderTargetInfo as Urho public API. 2016-01-31 09:06:38 +08:00
Lasse Öörni
f651101a28 Merge master AnimatedModel bone bounding boxes from the other AnimatedModels in the same node to prevent culling errors. Closes #1179. 2016-01-30 15:30:35 +02:00
urho3d-travis-ci
dc91be4dd1 Travis CI: API documentation update at 2016-01-30 10:43:25 UTC. 
[ci package]

Commit: dcdcccd541

Message: Added missing AS bindings for Quaternion
 2016-01-30 10:43:25 +00:00
Mike3D
dcdcccd541 Added missing AS bindings for Quaternion 2016-01-30 11:25:26 +01:00
Lasse Öörni
77fda46a2a Merge pull request #1177 from MonkeyFirst/avoid-double-adding-tags- 
fix double adding tag from scene
 2016-01-29 14:21:03 +02:00
MonkeyFirst
ff24dc3a12 fix double adding tag from scene 2016-01-29 00:11:16 +06:00
Lasse Öörni
a56665d5f6 Merge pull request #1173 from MonkeyFirst/tags-menu 
Tags menu
 2016-01-28 18:17:40 +02:00
Lasse Öörni
ab6294ee9d Merge remote-tracking branch 'MonkeyFirst/tags-menu' 2016-01-28 18:12:11 +02:00
Yao Wei Tjong 姚伟忠
16fd906363 For CI - Fix the scaffolding test on Mac VM using abs path. 
[ci only: master, OSX] [skip appveyor]
 2016-01-28 21:02:38 +08:00
Yao Wei Tjong 姚伟忠
1dbb27d3c0 Pardon our dust. Fix the scaffolding test on Win using abs path. 
[ci only: AppVeyor]
 2016-01-28 19:27:39 +08:00
Yao Wei Tjong 姚伟忠
9c42773439 Minor clean up on Rakefile and fix scaffolding rake task on Windows. 
Close #1174
 2016-01-28 19:00:01 +08:00
MonkeyFirst
f6ba2b1195 Add tags menu for editUIElement 2016-01-28 00:55:13 +06:00
Lasse Öörni
6b775d7537 Refactor rendertarget update handling, to ensure both always-update and manual-update respect the order of backbuffer views rendering first. Closes #1171. 2016-01-27 20:45:30 +02:00
MonkeyFirst
31e2f56808 tags menu 2016-01-27 23:40:02 +06:00
Yao Wei Tjong 姚伟忠
a30c075189 Use stronger hint for 64bit Debian-based distro for finding 32bit lib. 2016-01-27 14:21:08 +08:00
Yao Wei Tjong 姚伟忠
4e2a7d6b19 For CI - reduce sample count for iOS, otherwise artifact is too big. 2016-01-27 14:17:43 +08:00