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
aster2013
5da25ace4e Remove WeakPtr from View3D, change View3D::SetView ownScene argument's default value to true, same like C++ and AngelScript. 2014-12-01 21:20:24 +08:00
urho3d-travis-ci
4950673692 Travis CI: API documentation update at 2014-12-01 13:16:56 UTC. 
[ci package]
 2014-12-01 13:16:57 +00:00
aster2013
d6234414b0 Merge branch 'refactor-animatedsprite2d' 2014-12-01 21:02:09 +08:00
urho3d-travis-ci
641c07630f Travis CI: API documentation update at 2014-12-01 10:46:20 UTC. 
[ci package]
 2014-12-01 10:46:20 +00:00
Lasse Öörni
09c023e788 ParticleEffect Load & Save overloads with XMLElement do not need to be virtual. 2014-12-01 11:45:28 +02:00
Lasse Öörni
a886667f14 Merge remote-tracking branch 'hdunderscore/Editor_ParticleEditor' 2014-12-01 11:36:52 +02:00
hdunderscore
4c81a9adda Minor fix so that all script instances have their values update when inspector is refreshed. Fixes an issue where, although the values are recalled, they would be unset on a save unless you select the ScriptInstance component (could occur when resource auto-reloads). 2014-12-01 12:45:10 +11:00
aster2013
8b8932fa7a Refactor AnimatedSprite2D, make it derived from StaticSprite2D, Fix issue #547. 2014-11-30 19:44:13 +08:00
hdunderscore
40bc695698 - Particle Editor undo/redo improved. 
- 'Edit' option added for ParticleEffect resource attributes.
- Swapped out PoisonStack.xml for Fire.xml, for improved variety.
 2014-11-30 19:53:38 +11:00
hdunderscore
95a4948f9c Bug fix: Angelscript binding for ParticleEffect::SetEmitting 2014-11-30 18:41:01 +11:00
hdunderscore
ed78af0f1f Initial Undo/Redo support added -- redo doesn't work for the Line Edits ? 2014-11-30 18:41:01 +11:00
hdunderscore
a8f20644f0 -Removed extra log entries. 
-Force reload resource cache when opening particles from file.
 2014-11-30 18:41:00 +11:00
Chris Friesen
80c811d22a Resource browser particle preview 2014-11-30 18:40:58 +11:00
Chris Friesen
2b35aecc29 Resource Browser particle editor support 2014-11-30 18:40:55 +11:00
hdunderscore
0ced3e43fb Fixed a texture frame bug, where the size of color frames was being checked instead. 
Moved some particle effect logic into the editor HandleUpdate event, so the particle effect will automatically restart when it stops.
 2014-11-30 18:40:54 +11:00
hdunderscore
b7fdb7083f Bug fix - can create new particle effects without crash. 2014-11-30 18:40:53 +11:00
hdunderscore
2906d3f789 Removing color frame and texture frame possible. 2014-11-30 18:40:53 +11:00
hdunderscore
5cf0a82dab Color frames + texture frames are now editable in editor. 
Several features still need to be implemented (and currently can cause crashes).
 2014-11-30 18:40:52 +11:00
hdunderscore
f75e915bc0 Working to add improved color frame editing. 2014-11-30 18:40:52 +11:00
hdunderscore
5e236ef204 Can now edit color frames (not create new entries...), save particles. 
Bugs:
Creating new particle effect = crash
no undo/redo
no texture frames
save as overwrites the current file too ?
 2014-11-30 18:40:51 +11:00
hdunderscore
5cce464c03 A functional particle editor for the Urho Editor, however saving/reverting, undoing/redoing, and displaying loaded attributes doesn't work yet 2014-11-30 18:40:50 +11:00
urho3d-travis-ci
292cf0452b Travis CI: API documentation update at 2014-11-29 13:47:31 UTC. 
[ci package]
 2014-11-29 13:47:31 +00:00
aster
bed13f408b Add ownScene option in View3D::SetView, The default value is true in C++ or AngelScript, and false for Lua. Fix issue #545. 2014-11-29 21:37:34 +08:00
aster2013
3f3fb2a7dc Restore custom material in Drawable2D. 2014-11-28 22:49:35 +08:00
Lasse Öörni
3589fa7830 Fix alpha materials in StaticModelGroup only displaying 1 instance. Closes #544. 2014-11-27 17:34:23 +02:00
Lasse Öörni
02e68ac7e5 Refactor to remove child node and its components from scene immediately when it is being removed from the parent. 2014-11-27 17:34:23 +02:00
Yao Wei Tjong 姚伟忠
aaec0d9200 For Travis CI - use Release build configuration when build on bad VM. 
Now this rule is applicable for all target platforms (Linux, Windows, Android, and Raspberry-Pi) which have their CI builds run on Linux/Ubuntu host VM. Mac OSX and iOS CI builds are not affected by this rule since they run on OSX host VM which is not susceptible to "bad VM" issue. The idea is to reduce memory consumption during the linking phase and thus avoiding the process being killed due to insufficient memory in the VM.
 2014-11-27 20:19:58 +08:00
aster2013
abfc1576e0 Merge pull request #543 from AtomicGameMachine/JME-FIX-SPRITE-SET 
When setting a new sprite, have to mark vertices dirty to pick up changes in rectangle, hotspot, etc
 2014-11-27 11:59:46 +08:00
Josh Engebretson
5e1a72e317 When setting a new sprite, have to mark vertices dirty to pick up changes in rectangle, hotspot, etc 2014-11-26 16:17:42 -08:00
Lasse Öörni
f461c8234b Use a global hash-to-varname mapping table in the editor, which is saved along with the editor config. This allows intelligible var names in prefabs across scenes. Closes #540. 2014-11-26 21:28:48 +02:00
Lasse Öörni
81d19ec037 Merge remote-tracking branch 'remotes/hdunderscore/Editor_ScriptInstance_Persistance' 2014-11-26 17:15:33 +02:00
hdunderscore
b999275b53 Updated to cover these cases: 
- Values are refreshed when scripts are changed.
- Loading/creating new scene clears the previously stored script attributes.
- Loading a scene will load the script attributes, so that if there was a script error after loading but before inspecting a ScriptInstance, the values are still known.
 2014-11-26 20:36:20 +11:00
Yao Wei Tjong 姚伟忠
e0d13d706e For Travis CI - simplify the ci_rebase rake task. 
On normal commit, use the origin/master. On git tagging commit, use the 'tag' branch.
Also when on git taggig commit, prevent API doc update on the master branch because it is already too late to do so as the commit won't be in the tag anyway.
 2014-11-26 16:57:23 +08:00
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