townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,192 Commits 3 Branches 3 Tags 168 MiB
wtest
Commit Graph

10192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lasse Öörni
bfd968f9d7 Removed the base batch / non-base batch separation from BatchGroup. This is only needed for light queues, so rather have LightBatchQueue have separate queues for base & non-base. 
Removed useScissor -flag from render path commands, as it can be automatically determined when it should be used.
 2014-02-23 21:16:54 +02:00
Yao Wei Tjong 姚伟忠
da6c5e54ad For Travis CI - fix Linux RPM packaging and iOS 64-bit packaging. 
[ci package]

Travis-CI Ubuntu build environment requires additional software package to generate RPM package.
Travis-CI does not like iOS 64-bit build that generates >4MB log and kills the build process. Workaround by trying to rebuild universal binary quietly, hopefully the rebuild would not exceeds 10 minutes or otherwise Travis-CI would kill the process again for the other reason: no log activity. Finger cross.
 2014-02-24 02:10:49 +08:00
Yao Wei Tjong 姚伟忠
82b707e66b For Travis CI - more tweaks on the packaging setup. [ci package] 
- Prevent packaging from being accidentally invoked by a pull request or a commit on non-master branch.
- Generate documentation before packaging if it is not yet generated in previous step.
- When packaging for iOS platform, rebuild Urho3D library as Mach-O universal binary.
- When packaging for Linux platform, also invokes RPM and Debian CPack generators.
 2014-02-24 00:16:53 +08:00
Yao Wei Tjong 姚伟忠
dae56f4d0c Fix Bullet's btVector3.cpp compile error on 64-bit iOS platform. 
See https://code.google.com/p/bullet/source/detail?r=2716
 2014-02-24 00:06:14 +08:00
Yao Wei Tjong 姚伟忠
544c738b5a For Travis CI - change the private key and secure key. [ci package] 2014-02-23 13:42:06 +08:00
Yao Wei Tjong 姚伟忠
dd6f06c8da For Travis CI - supplying keys for automatic package upload. 
[ci package]
 2014-02-23 13:18:52 +08:00
urho3d-travis-ci
ce234504f0 Travis CI: API documentation update at 2014-02-22 20:32:27 UTC. 
[ci skip]
 2014-02-22 20:32:27 +00:00
Lasse Öörni
973b353a08 Safeguard CollisionShape against empty models to prevent Bullet asserts. 
Reset Font type to none when (re)loading.
 2014-02-22 22:01:03 +02:00
Lasse Öörni
263a624fe4 Possibility in ResourceCache to enable returning resources which failed to load. This is used in the editor to overcome eg. failed scripts disappearing from a ScriptInstance's script file slot. 
Moved editor gizmo materials to CoreData directory.
Removed the Default.xml material, instead Material sets itself automatically to the same state by default (no textures, default parameters, NoTexture technique.)
Clear Technique when loading it.
 2014-02-22 21:20:59 +02:00
urho3d-travis-ci
5fdab16972 Travis CI: API documentation update at 2014-02-22 13:07:34 UTC. 
[ci skip]
 2014-02-22 13:07:34 +00:00
Lasse Öörni
d84873df62 Merge pull request #209 from friesencr/editor-quickmenuitem-sort 
remove shameful editor bubblesort
 2014-02-22 14:33:25 +02:00
Lasse Öörni
ff1e1e8e8d Merge pull request #208 from friesencr/editor-warnings 
Get rid of some warnings when loading the editor
 2014-02-22 14:33:16 +02:00
Yao Wei Tjong 姚伟忠
b4ffce6af9 For Travis CI - fix commit message parsing that contains quotes. 
Look 'here' [ci package]
 2014-02-22 15:32:20 +08:00
Yao Wei Tjong 姚伟忠
08271fda85 For Travis CI - misc. tweaks. [ci package] 
- Perform shallow clone when building site documentation to speed up cloning process.
- Perform unshallow pull when packaging so that 'git describe' gives correct commit count since last tag.
- Only perform packaging when all the previous steps are successful. Reduce chances of binary package with not up-to-date documentation.
- When packaging for iOS platform, generate the documentation quietly (no stdout but still stream error to stderr).
 2014-02-22 14:43:22 +08:00
Chris Friesen
7aa825551b remove shameful editor bubblesort 2014-02-21 23:51:16 -06:00
Chris Friesen
00f26ddfd9 Get rid of some warnings when loading the editor 2014-02-21 23:39:53 -06:00
Yao Wei Tjong 姚伟忠
b4132990f2 Attempt to fix doxygen not able to find dot on OSX build environment. 2014-02-22 12:18:25 +08:00
Yao Wei Tjong 姚伟忠
c7fe5f6267 For Travis CI - fix packaging for iOS platform. [ci package] 2014-02-21 23:55:16 +08:00
Yao Wei Tjong 姚伟忠
5099928b58 Fix Windows build using Urho3D as external lib in Release config. 
Detected by Travis CI build. With this change, FindUrho3D module should be able to find Urho3D libs in the following scenarios:
- only debug version is available
- only release version is available
- both debug version and release version are available

Request CI build to use a Release build configuration [ci package].
 2014-02-21 21:54:32 +08:00
Yao Wei Tjong 姚伟忠
22f38857cc For Travis CI - Use Release configuration when packaging. [ci package] 2014-02-21 19:36:17 +08:00
Yao Wei Tjong 姚伟忠
a857cff97e For Travis CI - fix commit message parsing. [ci package] 2014-02-21 18:13:43 +08:00
Yao Wei Tjong 姚伟忠
89836f11fc For Travis CI - attempt to make packages on demand. [ci package] 2014-02-21 17:47:04 +08:00
Lasse Öörni
076b333124 Simplify pointer usage in HelloGUI example. 2014-02-21 10:25:33 +02:00
Yao Wei Tjong 姚伟忠
4d565aa401 Add new 'package' CMake built-in target for generating binary packages. 
This is in preparation for setting up Travis CI build to upload binary packages to a central hosting server.
 2014-02-21 15:43:31 +08:00
Yao Wei Tjong 姚伟忠
d3382cbb13 Convert 1.3 lw-tag to annotated tag at the time of its creation. 2014-02-20 21:20:51 +08:00
Lasse Öörni
8337ea6813 Merge pull request #206 from Amadeus-osa/master 
Do not crash when cloning components without attributes.
 2014-02-20 13:01:58 +02:00
Amadeus
cfd3cdc048 Do not crash when cloning components without attributes. 2014-02-20 10:43:53 +01:00
Lasse Öörni
af11693a35 Use safe form of pointer for the work item in WorkItemCompleted event. 2014-02-19 15:39:52 +02:00
aster2013
9b17bc6328 Remove fullName_ member variance. 2014-02-19 16:40:18 +08:00
aster2013
8fc76e81fd Replace tab with space. 2014-02-19 14:15:04 +08:00
aster2013
9b31d29a54 Add GetFullName in ShaderVariation, make code more clear. 2014-02-19 13:37:39 +08:00
aster2013
dd16f85568 Change the copyright for 2014. 2014-02-19 12:32:08 +08:00
urho3d-travis-ci
07b50c597d Travis CI: API documentation update at 2014-02-19 01:44:03 UTC. 
[ci skip]
 2014-02-19 01:44:03 +00:00
Yao Wei Tjong 姚伟忠
71458a5eb3 Fix tolua++ binding for Drawable::IsInView(). 
Expose the method as 'inView' readonly property, similar to how it is being exposed in AngelScript API.
 2014-02-19 09:28:46 +08:00
urho3d-travis-ci
83dc9892cf Travis CI: API documentation update at 2014-02-18 15:44:03 UTC. 
[ci skip]
 2014-02-18 15:44:03 +00:00
Yao Wei Tjong 姚伟忠
5ec3c02025 Revert back the logic to auto generate pkg list. 2014-02-18 23:24:31 +08:00
Lasse Öörni
92611f1249 Avoid string based duplicate detection in ShaderPrecache when possible. 2014-02-18 15:17:22 +02:00
Yao Wei Tjong 姚伟忠
30807ff796 For Travis CI - fix a typo in error handling execution path. [ci skip] 2014-02-18 20:58:38 +08:00
Lasse Öörni
77db4a4743 Removed extra slash from filename, added line break to prints. 2014-02-18 14:01:46 +02:00
Lasse Öörni
e10ef520cd Merge remote-tracking branch 'remotes/mike3d/master' 2014-02-18 12:29:03 +02:00
Lasse Öörni
592f0db8ce Fixed null exception when toggling orthographic camera in UI element selection mode. Updated editor documentation. 2014-02-18 11:52:18 +02:00
Mike3D
4d70e65254 Lua script compiler 2014-02-18 10:20:56 +01:00
Chris Friesen
0ad0ded90b editor orthographic camera & switch to zoom for mousewheel 2014-02-18 01:21:31 -06:00
Yao Wei Tjong 姚伟忠
48eb60fd8e Rename 'magic' module to 'common' module to reflect its purpose better. 
The purpose of Urho3D-CMake-common module is to store all the commonly used CMake commands and macros in one place so that they can be reused by other external projects using Urho3D as external library by simply including this module in their own CMakeList.txt.
 2014-02-18 12:55:13 +08:00
Yao Wei Tjong 姚伟忠
ea1372e05b Add copyright protection for Travis CI setup. 2014-02-18 12:35:32 +08:00
Lasse Öörni
2c255f7c53 More fixes for outdated documentation. 2014-02-17 23:57:13 +02:00
Lasse Öörni
5a6a11c521 Minor documentation / comment fixes. 2014-02-17 23:43:59 +02:00
Lasse Öörni
0e5d11541f Fix missing root of shader precache file if loading it fails. Reset (clear) XMLFile when loading fails so that no illegal content will be saved when it's programmatically modified and then saved. 2014-02-17 22:56:03 +02:00
Lasse Öörni
cc9e5e1994 Moved to XML based shader precache files. Refactored shader precaching code to its own class. Closes #199. 2014-02-17 22:19:55 +02:00
Yao Wei Tjong 姚伟忠
cb4257a599 For Travis CI - main repo only has amalgamated build option for LuaJIT. 2014-02-17 23:04:00 +08:00