townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,886 Commits 3 Branches 3 Tags 168 MiB
tmp
Commit Graph

9886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hdunderscore
c2f8af4e19 - Added correct behaviour for undoing/redoing script attributes. 
- Fixed drag slider undo/redo so that it creates a correct action representing old/new states.
 2014-11-26 19:27:53 +11:00
Yao Wei Tjong 姚伟忠
ec390c2913 Suppress CMake unused variable warning for Android platform. 2014-11-26 16:26:34 +08:00
Yao Wei Tjong 姚伟忠
f6e8f3b0fa Merge branch 'cleaning-up-build-scripts-for-android' into master. 2014-11-26 14:22:41 +08:00
hdunderscore
e20bf79dcd Added persistence of attributes for ScriptInstances in the editor, so that when an error occurs, the values are not reset to default. 2014-11-26 10:19:30 +11:00
aster2013
5f68fa2868 Only get enabled Drawable2D in Renderer2D. 2014-11-25 21:23:48 +08:00
Yao Wei Tjong 姚伟忠
46adfcfe46 Set the CPack default installation dir to be the same as CMake one. 
This is only applicable for CPACK when creating RPM and DEB software packages. The CPack and CMake installation dir are now both set to /usr/local.
This commit also makes it possible to generate Urho3D.pc for Android platform now. Note the default installation dir for Android is /user instead (Android has its own convention as set by android.toolchain.cmake).
 2014-11-25 13:40:35 +08:00
aster2013
b9be757f03 When index buffer data lost, reset index buffer data. 2014-11-25 00:01:21 +08:00
Yao Wei Tjong 姚伟忠
1e195bb186 For Travis CI - use HEAD instead of $TRAVIS_BRANCH for ci_rebase task. 
This is because the detached head may actually move due to API documentation update, so $TRAVIS_BRANCH environment variable may actually just point to HEAD~ in this scenario, which was not good as it would cause CI mirror branches became being pushed twice unnecessarily, one for HEAD~ and one for HEAD.
Using HEAD should work equally well for both normal commit and release tagging commit.
 2014-11-24 23:43:57 +08:00
urho3d-travis-ci
c1b51e611a Travis CI: API documentation update at 2014-11-24 15:10:14 UTC. 
[ci package]
 2014-11-24 15:10:14 +00:00
Lasse Öörni
9d78a85348 Add events for GPU context loss & restore. 2014-11-24 16:54:44 +02:00
urho3d-travis-ci
5ea049470b Travis CI: API documentation update at 2014-11-24 10:49:19 UTC. 
[ci package]
 2014-11-24 10:49:19 +00:00
aster2013
33f5612c30 Fixed tile map remove layer node bug. 2014-11-24 14:02:47 +08:00
aster2013
35735b11d3 Remove unused code, rename DefaultMaterial to Material. 2014-11-24 13:48:57 +08:00
aster2013
93cce995e8 Fix bug. 2014-11-24 13:27:48 +08:00
aster2013
ae33830dd2 rename DRAWABLE_PROXYGEOMETRY DRAWABLE_RENDERER2D 2014-11-24 13:01:43 +08:00
aster2013
511d6f461f Remove custom material from Drawable2D, Renderer2D will get all Drawable2D when HandleBeginViewUpdate. 2014-11-24 12:49:19 +08:00
aster2013
fb07e32cdd Remove Sprite2D from Drawable2D, make Drawable2D more general. 2014-11-24 12:12:41 +08:00
aster2013
aaa792609a Combine DrawableProxy2D and MaterialCache2D in to Renderer2D. 2014-11-24 11:42:17 +08:00
Yao Wei Tjong 姚伟忠
e7b0808b12 Misc. fixes in the build script to improve the release mechanism. 
The following changes address the shortcomings of our current release mechanism detected from our last release.
- Define and set RELEASE_TAG environment variable only when a git tag conform to a release tagging matching regex "\d+\.\d+".
- Change the logic to allow the automated rake tasks to be triggered on a 'tag' branch properly.
- Fix the 'git rebase' command to use the branch pointed by TRAVIS_BRANCH environment variable as baseline, instead of assuming it to be always 'origin/master' as before.
- Change Urho3D library versioning CMake module to omit the version patch number when there is none, i.e. 1.32 instead of 1.32.0.
 2014-11-23 20:01:32 +08:00
aster2013
ba1e0974d0 Remove COPY_BASE_ATTRIBUTES(Component); 2014-11-23 12:42:42 +08:00
urho3d-travis-ci
5c1f05ed10 Travis CI: API documentation update at 2014-11-22 15:30:34 UTC. 
[ci package]
 2014-11-22 15:30:34 +00:00
aster2013
0f1ce308e9 Merge branch 'mixed-accessor-attribute' 2014-11-22 23:12:40 +08:00
aster2013
4655ee1ee4 Submit code in LuaScript samples. 2014-11-22 16:23:17 +08:00
aster2013
f8879539fa Add space template function. 2014-11-22 16:05:29 +08:00
aster2013
09a33521aa Add space before template >, let GCC happy. 2014-11-22 15:47:21 +08:00
aster2013
c1ea1f9e06 Move attribute name as first parameter in ATTRIBUTE macro, same as other attribute macros. 2014-11-22 15:23:16 +08:00
aster2013
13d3f1c8ac Add attribute trait, treat ref attribute same with attribute. 2014-11-22 15:04:09 +08:00
aster2013
9e5172a959 Add EnumAttributeAccessorImpl class, remove all Variant::Get<> functions for enum type. 2014-11-22 13:22:37 +08:00
aster2013
cb819a5a6f Remove class name and variant type from attribute macros. 2014-11-22 12:43:23 +08:00
Yao Wei Tjong 姚伟忠
17b8150f31 For Travis CI - consider 'tag' branch as master branch. 2014-11-22 10:27:24 +08:00
Yao Wei Tjong 姚伟忠
dd01b749eb Enhance Rakefile to autoload other *.rake scripts in ".rake" directory. 
Also create symlink to Rakefile when scaffolding.
[ci skip]
 2014-11-22 01:10:24 +08:00
aster2013
d99b6e9a4e Remove type from MIXED_ACCESSOR_ATTRIBUTE macro, make it more cleaner. Other attribute macros will be modify later. 2014-11-22 00:54:28 +08:00
aster2013
5ea467ff23 Add GetVariantType functions, Fix compile warning in UI.cpp. 2014-11-22 00:44:36 +08:00
aster2013
5eed296f37 Add comment for modify third-party code. 2014-11-22 00:43:00 +08:00
Yao Wei Tjong 姚伟忠
60eeb45222 For Travis CI - skip APK test run when packaging. 
General build script cleanup:
- Constrain build option values in cmake-gui.
- Constrain build configuration for both multi-configuration and single-configuration generators.
- Mark cached variables as advanced or internal as appropriate.
 2014-11-22 00:39:48 +08:00
aster2013
605d113c9c Remove duplicated call of UpdateViewParameters.[ci skip] 2014-11-21 22:45:20 +08:00
aster2013
c7e248b13a Enable mouse visible in UIDrag sample. 2014-11-21 22:13:22 +08:00
aster2013
4058e45acb Fix compile warning in tolua. 2014-11-21 22:00:15 +08:00
aster2013
7e46f0c862 Add MIXED_ACCESSOR_ATTRIBUTE. 2014-11-21 18:26:45 +08:00
Lasse Öörni
0deb74d201 Change variable name to start with lowercase. 2014-11-21 11:19:29 +02:00
aster2013
657a7d9922 Make GetCPUData and GetAndroidCPUCount static. 2014-11-21 15:31:48 +08:00
Lasse Öörni
e6508e418b If reverse mapping of a node variable is not known, show the hexadecimal hash to allow editing the var in the editor. 2014-11-20 16:44:16 +02:00
Lasse Öörni
65ee2ca966 Add function to get CPU count on Android. For now returns the same for logical & physical. Closes #535. Update changelog. 2014-11-20 14:49:38 +02:00
urho3d-travis-ci
aa3f467da2 Travis CI: API documentation update at 2014-11-20 11:17:19 UTC. 
[ci package]
 2014-11-20 11:17:19 +00:00
aster2013
e24648ae47 remove empty line, rename variance. 2014-11-20 18:17:09 +08:00
aster2013
12aceffb82 Merge remote-tracking branch 'remotes/origin/Subscribe-to-Lua-Function' 2014-11-20 18:06:52 +08:00
Lasse Öörni
c7b07bdb10 supress -> suppress 2014-11-20 11:53:27 +02:00
Lasse Öörni
c13c9280e9 Merge remote-tracking branch 'hdunderscore/Input_MM_RELATIVE_FIX' 2014-11-20 11:43:33 +02:00
Lasse Öörni
159bda2928 Update inspector window right after creation to fix bugged layout. 2014-11-20 11:33:28 +02:00
hdunderscore
17118be70f Input::SetMouseMode and Console::SetVisible were keeping track of last mouse visible independently, which could cause mouse to become trapped in editor (eg: drag slider + open console + press escape). 
Now a unified way of hiding the mouse and recalling the 'true' visibility is provided via SetMouseVisible(bool enable, bool supressEvent) and ResetMouseVisible().
 2014-11-20 19:56:51 +11:00