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
yushli
85bd13c172 Update 33_Urho2DSpriterAnimation.lua 
animationIndex is changed to spriterAnimationIndex
 2015-09-09 13:31:40 +08:00
Lasse Öörni
87e882e261 Fix Graphics::ResolveToTexture() erroneously reading current rendertarget instead of backbuffer on D3D11. Work around less-than-fullscreen viewport not resolving properly on D3D11. 2015-09-08 18:13:57 +03:00
Yao Wei Tjong 姚伟忠
ac2b2ba121 Add new JNI function to interface with AssetManager.list() method. 
Fix #855.
 2015-09-08 22:37:45 +08:00
aster2013
d1f22dd80a Add missing files. 2015-09-08 13:55:46 +08:00
aster2013
27aaabd6d7 Move spriter from ThirdParty to Urho2D, credit to @weitjong. 2015-09-08 13:52:30 +08:00
urho3d-travis-ci
fe5b01b56d Travis CI: API documentation update at 2015-09-07 11:31:39 UTC. 
[ci package]

Commit: 634393d7c8

Message: Add network replication for animations' removeOnCompletion flag. Add GetRemoveOnCompletion(). Add Lua binding for removeOnCompletion. Fix missing AngelScript binding for GetFadeTime().
 2015-09-07 11:31:39 +00:00
Lasse Öörni
634393d7c8 Add network replication for animations' removeOnCompletion flag. Add GetRemoveOnCompletion(). Add Lua binding for removeOnCompletion. Fix missing AngelScript binding for GetFadeTime(). 2015-09-07 14:23:03 +03:00
Lasse Öörni
29b178914c Merged hjmediastudios/master. Adds removeOnCompletion functionality to AnimationController. 2015-09-07 13:33:57 +03:00
urho3d-travis-ci
b159735d85 Travis CI: API documentation update at 2015-09-07 09:02:35 UTC. 
[ci package]

Commit: b61a239d51

Message: Merge pull request #877 from bjorn/fix-tmx-docs

Removed outdated warning in TMX documentation
 2015-09-07 09:02:35 +00:00
Lasse Öörni
b61a239d51 Merge pull request #877 from bjorn/fix-tmx-docs 
Removed outdated warning in TMX documentation
 2015-09-07 11:54:28 +03:00
Thorbjørn Lindeijer
6e2eb72a25 Removed outdated warning in TMX documentation 
No longer relevant since change 094d146c3c.
 2015-09-07 10:48:03 +02:00
aster2013
fc2a3805ea Remove line end spaces.[ci skip] 2015-09-07 12:22:29 +08:00
aster2013
60dff27440 Merge branch 'spine-spriter-new' 2015-09-07 12:19:24 +08:00
aster2013
5d50ad4b71 Change SetAnimtion function in AnimatedSprite2D. 2015-09-06 20:37:15 +08:00
aster2013
dc0e1023da Add entity attribute in AnimatedSprite2D. 2015-09-06 17:58:20 +08:00
aster2013
2de2f633c6 Minor Fix. 2015-09-06 17:05:20 +08:00
Yao Wei Tjong 姚伟忠
a3e0072e79 Suppress policy CMP0054 dev warnings on Android build. 
Enhance android rake task to have additional option to install the APK before testing it.
[ci only: Android]
 2015-09-06 13:05:30 +08:00
aster2013
0d20befa70 Fix build error on Ubuntu. 2015-09-06 12:02:46 +08:00
Yao Wei Tjong 姚伟忠
0a34f1cc97 Fix FindUrho3D.cmake to look for *.bc extension in Emscripten build. 
[ci only: Emscripten]
 2015-09-06 06:17:26 +08:00
Yao Wei Tjong 姚伟忠
7353063c3b For Travis CI - remove redundant job matrix for Emscripten CI build. 
[ci only: Emscripten]
 2015-09-06 00:29:00 +08:00
aster2013
5dedc993a9 Remove URHO3D_SPINE option, if exists ThirdParty/spine make URHO3D_SPINE enabled. 2015-09-05 23:44:45 +08:00
Yao Wei Tjong 姚伟忠
dbfd0ca65c Add new job matrix for linked LLVM bitcode Emscripten CI build. 
Upload HTML5 samples built from this new job matrix.
[ci package] [ci only: Emscripten]
 2015-09-05 23:21:23 +08:00
aster2013
0f6983b3fe rename variable. 2015-09-05 22:57:48 +08:00
aster2013
03f61b0e2d Remove generated sprite sheet for spriter animation. 2015-09-05 22:54:33 +08:00
aster2013
7ee85555a7 typo 2015-09-05 22:37:42 +08:00
aster2013
5bcb12afa2 Fix comment. 2015-09-05 22:28:39 +08:00
aster2013
0cded698e4 Merge from spine-spriter branch. 
Main changes:
     Make spriter as a lib
     Enable spine support in AnimatedSprite2D and Animation2D.
 2015-09-05 22:23:35 +08:00
Lasse Öörni
0fa04d4c3f Keep track of animation being dirtied while model was invisible, and force update in that case during UpdateGeometry(). Potentially a fix for #875. 2015-09-04 16:35:04 +03:00
Yao Wei Tjong 姚伟忠
3e765ba446 Minor code clean up for build system. 
Suppress tolua++ tool not found message in the stderr stream on initial build.
Raise a fatal error message when user attempting to generate VS2008 project with spaces in the source/build tree path.
 2015-09-04 13:14:52 +08:00
Yao Wei Tjong 姚伟忠
bf6ae1a0a3 Make the new ABI build option unavailable for MSVC compiler. 
[ci skip]
 2015-09-04 11:33:57 +08:00
Yao Wei Tjong 姚伟忠
c4a138ae4f Add new build option to allow host tool building to use native ABI. 
Possibly fix issue #872.
 2015-09-04 11:20:26 +08:00
Lasse Öörni
0d54cb1b7f Fallback for VS2008, do not enclose library names in quotes for the librarian. Downside is that build path with spaces will not work (again.) Closes #873. 2015-09-03 18:23:41 +03:00
Yao Wei Tjong 姚伟忠
353ee7f870 Remove force include as now export header is auto-included once again. 2015-09-03 22:40:13 +08:00
Yao Wei Tjong 姚伟忠
2731e48405 Improve build robustness. Prevent make clean to remove toluabind.c. 2015-09-03 20:14:23 +08:00
Yao Wei Tjong 姚伟忠
d8fcc094b9 Minor documentation page update. [ci only: master] 2015-09-03 17:56:26 +08:00
Lasse Öörni
c2301bfc6f Remove the mechanism to comment out "attribute" as the COMPILEVS / COMPILEPS define mechanism already takes care of that, as long as it's also used for user-defined custom attributes. Fixes #870. 2015-09-03 11:35:22 +03:00
Yao Wei Tjong 姚伟忠
86194164b5 Avoid name clash with EMSCRIPTEN environment variable. Close #871. 
[ci only: Emscripten]
 2015-09-03 13:41:31 +08:00
urho3d-travis-ci
1486904964 Travis CI: API documentation update at 2015-09-02 15:48:49 UTC. 
[ci package]

Commit: 5bd672f02a

Message: Add missing Lua bindings to SplinePath. Make hierarchy & inspector windows the same width on editor startup. Remove unnecessary attributes from EditorHierarchyWindow.xml.
 2015-09-02 15:48:49 +00:00
Lasse Öörni
5bd672f02a Add missing Lua bindings to SplinePath. Make hierarchy & inspector windows the same width on editor startup. Remove unnecessary attributes from EditorHierarchyWindow.xml. 2015-09-02 18:07:42 +03:00
MonkeyFirst
eb8bdd67f2 fix HW width 2015-09-02 18:07:35 +03:00
MonkeyFirst
77c7460342 add one space after "if" and fight with other spaces 2015-09-02 18:07:35 +03:00
MonkeyFirst
150865c3ee change icons default size 2015-09-02 18:07:35 +03:00
MonkeyFirst
f484bfe915 add for B.mode distance related camera move 2015-09-02 18:07:34 +03:00
MonkeyFirst
4ee86ced6f revert group-types-clear-commits 2015-09-02 18:07:34 +03:00
MonkeyFirst
7c403d88d9 collapse hierarchy then loading new scene 2015-09-02 18:07:34 +03:00
MonkeyFirst
50502df4a4 add option for IDs show and oneclick button for collapse tree to scene-root scope 2015-09-02 18:07:33 +03:00
MonkeyFirst
3232b79cbe clear old updateIcons placement 2015-09-02 18:07:33 +03:00
MonkeyFirst
14f35757cd add SplinePath check for length 2015-09-02 18:07:33 +03:00
MonkeyFirst
06e186bd73 fix-ghost-icons 2015-09-02 18:07:33 +03:00
MonkeyFirst
aafca39d39 add length property for scripts 2015-09-02 18:07:32 +03:00