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 姚伟忠
2dd22c82ef Attempt to enable ccache support for Emscripten compiler toolchain. 
Minor documentation update again on ccache usage.
 2015-04-17 17:33:33 +08:00
Yao Wei Tjong 姚伟忠
808c79412f Just show the usage instruction when the script is invoked wrongly. 2015-04-17 14:17:21 +08:00
Yao Wei Tjong 姚伟忠
5b7297669a Fix Xcode build. It does not like absolute path PCH include. 2015-04-17 09:59:40 +08:00
Yao Wei Tjong 姚伟忠
4e4d114015 Merge branch evolarium-fix_pch_build into upstream.master. 2015-04-17 07:49:49 +08:00
Yao Wei Tjong 姚伟忠
b76b1dabb9 Update contribute credits to README.md as well. 2015-04-17 07:48:36 +08:00
Yao Wei Tjong 姚伟忠
8776eb3c2d Merge branch 'fix_pch_build' of https://github.com/evolarium/Urho3D. 2015-04-17 07:25:34 +08:00
Yao Wei Tjong 姚伟忠
bfa54ece21 Need to stringify to guard against undefined environment variable. 2015-04-17 07:17:58 +08:00
Yao Wei Tjong 姚伟忠
810929d13c For Travis CI - readjust the rebase order so Emscripten comes last. 2015-04-17 01:41:08 +08:00
Yao Wei Tjong 姚伟忠
fd7d667b21 Enhance Emscripten toolchain file to support ccache (but disabled). 
It can only be enabled later when Emscripten has fixed https://github.com/kripken/emscripten/issues/3365.
 2015-04-17 01:24:39 +08:00
Yao Wei Tjong 姚伟忠
167f00771f Enhance Android toolchain file to support ccache (our way). 2015-04-17 00:58:22 +08:00
Lasse Öörni
9a3ec30b4a Add add-assign also for signed long and long long integers in String. Added contributor credit. 2015-04-16 16:51:10 +03:00
Lasse Öörni
213fa03120 Merge pull request #702 from marynate/PR-String-unsign-long 
Add unsigned long and unsigned long long support to String += operator
 2015-04-16 16:32:31 +03:00
Jordan Patterson
ebbb9d3e05 Fix PCH build with Clang 
Clang doesn't use include path (-I) when looking for PCH files.  Use full path to header instead.  Tested on Ninja and Make builds using GCC and Clang.
 2015-04-16 07:11:19 -06:00
marynate
7df29b9897 Add unsigned long and unsigned long long support to String += operator 2015-04-16 19:42:18 +08:00
Yao Wei Tjong 姚伟忠
541c6e0e29 Enhance Raspberry-Pi toolchain file to support ccache. 2015-04-16 17:52:46 +08:00
Yao Wei Tjong 姚伟忠
44e50b0ebe Minor documentation update on ccache usage. [ci skip] 2015-04-16 14:43:14 +08:00
Yao Wei Tjong 姚伟忠
f94d4d26d1 Enhance MinGW toolchain file to support ccache. 
This is in preparation for using ccache in the container-based CI builds later.
Reinstate MinGW 32-bit D3D9 build jobs which were accidentally got deleted.
 2015-04-16 14:34:06 +08:00
Lasse Öörni
ff8f4b7525 On Windows, when stdout/stderr has been redirected, use fprintf instead of WriteConsoleW() to allow capturing log output from tools. Closes #703. 2015-04-15 21:53:49 +03:00
Yao Wei Tjong 姚伟忠
2a75dbbe2f For Travis CI - revert back the multiplier as it is still not enough. 
Instead set the EMRUN timeout to the maximum value possible before the testing process being timeout by Travis CI itself.
 2015-04-13 21:31:52 +08:00
Yao Wei Tjong 姚伟忠
67ce3e48bd Increase the multiplier for the EMRUN time out setting. 
Emscripten has just released version 1.30 which, among others, fixes the EMRUN time out handling. In the previous version it did not time-out as expected. But now as EMRUN times out correctly, the build test failed on our Emscripten build due to Travis CI latency.
 2015-04-13 17:26:10 +08:00
Yao Wei Tjong 姚伟忠
9e8046efc7 Fine tune 'rake make' task to use physical CPU count for Emscripten. 2015-04-13 17:26:10 +08:00
Lasse Öörni
ce3575a8eb Merge pull request #701 from Stinkfist0/assetimporter-error-print 
Improve AssetImporter error print.
 2015-04-13 10:52:01 +03:00
Ali Kämäräinen
8332e68f56 Improve AssetImporter error print. 2015-04-13 10:17:22 +03:00
Yao Wei Tjong 姚伟忠
fb097bac5a Minor fix and code clean up on build scripts. 2015-04-10 18:11:54 +08:00
Yao Wei Tjong 姚伟忠
b7f0a1807f Minor documentation update on the build options section. 
Add a simple usage instruction on build scripts error.
Related to issues #697 and #698.
 2015-04-09 22:27:51 +08:00
Yao Wei Tjong 姚伟忠
efe35b27a9 For Travis CI - temporarily reorder CI rebase sequence. 
This is for investigating random build error on Mac OS X build environment.
 2015-04-09 15:47:17 +08:00
Yao Wei Tjong 姚伟忠
b285bd2325 Enhance the rake make task to also support Ninja. 2015-04-08 17:09:55 +08:00
Lasse Öörni
4628a44a5a Removed table of contents from "simple" pages like Examples & Overall Structure. Added contributor credit. Closes #694. 2015-04-07 18:52:09 +03:00
Lasse Öörni
7188c4777f Merge remote-tracking branch 'raould/doc_toc' 2015-04-07 18:36:46 +03:00
Yao Wei Tjong 姚伟忠
c93327bf00 For Travis CI - wrap the 'make package' inside 'setarch' command. 
Related to fc14b30e42. [ci package]
 2015-04-07 18:08:26 +08:00
Lasse Öörni
4ddc71b769 Make glWrapMode related arrays & function static. 2015-04-07 11:44:13 +03:00
Lasse Öörni
1423c1cf29 Fix wrong enum for border clamp mode on GL3. Closes #695. 2015-04-07 11:40:33 +03:00
aster2013
21b90f6b86 Add Angelscript and Lua script API. 2015-04-07 16:37:40 +08:00
aster2013
32b12dcc57 Add GetDrawRectangle and GetTextureRectangle in Sprite2D. 2015-04-07 13:43:47 +08:00
Jon Slenk
7b548b5543 add table of contents to some doc pages. 2015-04-06 22:37:08 -07:00
aster2013
aeb1806f78 Add SourceBatch2D in Drawable2D; 
Add ViewBatchInfo2D in Renderer2D;
Remove texture and blend mode in Drawable2D;
Add blend mode in ParticleEffect2D;
Add blend mode and custom material in StaticSprite2D.
 2015-04-07 13:01:45 +08:00
Yao Wei Tjong 姚伟忠
fc14b30e42 Override the package arch when building for 32-bit on 64-bit host. 
Fix #691. [ci package]
 2015-04-07 12:38:39 +08:00
urho3d-travis-ci
cbdc0f4c48 Travis CI: API documentation update at 2015-04-06 18:22:43 UTC. 
[ci package]
 2015-04-06 18:22:43 +00:00
Lasse Öörni
ddb9362ef4 Added possibility to new a ParticleEffect from Lua, and exposed missing functions. Fixed crash if ParticleEffect has no color frames. Closes #689. 2015-04-06 20:47:43 +03:00
Lasse Öörni
be994d62e4 Remove extra parentheses from CreateObject(), as suggested by Modanung. 2015-04-06 19:55:35 +03:00
Lasse Öörni
3ca9b7d499 Add WorkQueue functions to remove items (single or multiple) before being assigned to worker threads. Closes #690. 2015-04-06 19:50:07 +03:00
urho3d-travis-ci
a626c9d6c8 Travis CI: API documentation update at 2015-04-04 10:32:48 UTC. 
[ci package]
 2015-04-04 10:32:48 +00:00
Lasse Öörni
97fb2638db Add fill mode to materials. 2015-04-04 02:40:38 +03:00
Lasse Öörni
79e89dfad3 Fix losing input focus right after startup on Linux. 2015-04-04 00:58:14 +03:00
Lasse Öörni
a716bbcf61 Fix mouse move jumps in mixed touch & mouse usage. 2015-04-03 23:40:57 +03:00
Lasse Öörni
03602fbd1c Use the "click to focus" mechanism on all desktop platforms in windowed & mouse-hidden mode. Code cleanup in Input. 2015-04-03 22:57:47 +03:00
Lasse Öörni
9d9ea418e3 Disable use of fullscreen space on OS/X to fix black screen on fullscreen switch. 2015-04-03 14:47:30 +03:00
Lasse Öörni
0285d50302 When making a triangle-level raycast to StaticModel, return the hit batch (submesh) index in the subObject field of the ray result. 2015-04-02 20:26:35 +03:00
Yao Wei Tjong 姚伟忠
b2c2bb372b Attempt to suppress some of the compiler warnings from iOS 64bit build. 
Something must have changed on the Travis CI Mac OS X build environment recently that causes the compiler to produce tons of warning on iOS 64-bit build. It not only slows down the CI build but also causes the log to be truncated in the Travis CI web interface.
 2015-04-02 23:59:26 +08:00
Yao Wei Tjong 姚伟忠
b468eac53e Only supply the CCACHE environment variable when user hasn't done it. 2015-04-02 16:17:35 +08:00