Commit Graph

9869 Commits

Author SHA1 Message Date
urho3d-travis-ci
55abe19fab Travis CI: API documentation update at 2014-06-02 14:36:27 UTC.
[ci package]
2014-06-02 14:36:27 +00:00
aster2013
7050bb4ea9 Add imp license. 2014-06-02 22:04:05 +08:00
aster2013
fe3af57199 Merge branch 'spriter-animation' 2014-06-02 21:53:59 +08:00
aster2013
6bf9b2ad7e Fix spriter animation bone scaling, because Spriter's world transform calculation is different with Urho3D, so add Transform2D class to fix it. 2014-06-02 21:48:04 +08:00
aster2013
dc5288c4ac Move parent from Mainline to Timeline. 2014-06-02 17:04:04 +08:00
aster2013
370c15ad93 Fixed build hierarchy. current these is a bug for scaling. 2014-06-01 23:04:44 +08:00
aster2013
2bee9a334f Add bone animation support. 2014-06-01 21:20:01 +08:00
AGreatFish
08bb95e2fb Converted tabs to spaces to fix weird indentation 2014-06-01 13:29:04 +02:00
AGreatFish
116717da03 Tried to apply changes to HLSL shader.
I couldn't test it, so check for typos please.
2014-06-01 13:18:15 +02:00
AGreatFish
fabbd4422b Cleanup and optimization of FXAA3 GLSL Shader. Made Fast Pixel Offset work again. 2014-06-01 12:56:35 +02:00
aster2013
1848bd10ca Add tips. [ci skip] 2014-06-01 15:51:24 +08:00
aster2013
4c47170f8e Rename XAnimationSet2D to AnimationSet2D, Rename XAnimatedSprite2D to AnimatedSprite2D. 2014-06-01 15:43:32 +08:00
aster2013
e5a93022c4 Rename XAnimation2D to Animation2D 2014-06-01 15:28:18 +08:00
aster2013
53351462ce Remove old AnimatedSprite2D and Animation2D.h. 2014-06-01 15:21:04 +08:00
aster2013
3f1032667b Remove old GoldIcon animation.[ci skip] 2014-06-01 15:13:24 +08:00
aster2013
a99145a80c Update 24_Urho2DSprite sample with spriter animation. 2014-06-01 15:11:56 +08:00
aster2013
a5a0512cf8 Add hot spot in Sprite. 2014-06-01 15:05:38 +08:00
aster2013
4807ed7d37 Add Spriter animation Lua binding and sample. 2014-06-01 14:30:46 +08:00
aster2013
22d6ede8e6 Add spriter animation AS binding and sample. 2014-06-01 14:02:27 +08:00
aster2013
eee68aaf3c Add XAnimationSprite icon and XAnimationSet picker in editor.[ci skip] 2014-06-01 13:29:25 +08:00
aster2013
002292d01f Make XAnimatedSprite2D derived from Drawable, export attributes. 2014-06-01 13:27:00 +08:00
Lasse Öörni
e079878e40 Remove the gather4 path similarly from HLSL FXAA3. Fix FXAA2 tag name in the examples. Removed dead link from documentation. 2014-06-01 02:33:19 +03:00
AGreatFish
bcd873d385 Completely remove Gather4 from GLSL shader, fix conflicting tags 2014-06-01 00:03:23 +02:00
Lasse Öörni
44795ea9c0 Change __ to _ in the FXAA3 shader, as __ is reserved for GL internal use. 2014-05-31 23:30:44 +03:00
Lasse Öörni
f2e6e86a1d Rename EdgeFilter shader to FXAA2. Rename FXAA shader to FXAA3. Clean up FXAA3 GLSL code and port to HLSL. 2014-05-31 23:24:31 +03:00
Lasse Öörni
4d37bca7d3 Merge remote-tracking branch 'remotes/agreatfish/FXAA' 2014-05-31 21:11:41 +03:00
aster2013
07f5c97854 Fixed text format.[ci skip] 2014-06-01 00:01:37 +08:00
aster2013
6cea8b84f5 Add spriter animation sample in C++. 2014-05-31 23:58:48 +08:00
aster2013
587fca67f9 Add XAnimatedSprite2D class.[ci skip] 2014-05-31 23:49:30 +08:00
AGreatFish
c55a637384 Added FXAA 3.11 GLSL Shader
Please review the shader because I am rather new to this.
(This is the first time I actually "developed" something in GLSL.)
It should work on older GPUs now, but I wasn't able to test it on one,
so I can't guarantee it will actually work.
2014-05-31 17:19:58 +02:00
aster2013
928556918d Add animation set class. [ci skip] 2014-05-31 23:07:41 +08:00
aster2013
0f46863498 Add XAnimation2D class. name is temporary, I will name it to Animation2D laster. [ci skip] 2014-05-31 22:47:55 +08:00
aster2013
1515e41e4c Add spriter animation, imp download from https://github.com/treefortress/SpriterAS. [ci skip] 2014-05-31 22:28:14 +08:00
Amadeus
2014f5ee1a Fix incorrect use of PODVector in ValueAnimation, maybe related to #361 2014-05-31 13:47:42 +02:00
Lasse Öörni
5790875b23 Removed unnecessary construction of a SharedPtr object. 2014-05-30 20:04:06 +03:00
urho3d-travis-ci
5c71b28244 Travis CI: API documentation update at 2014-05-30 13:44:01 UTC.
[ci package]
2014-05-30 13:44:01 +00:00
Lasse Öörni
766a08060d Clean up ParticleEmitter API. Removed resetPeriod option from SetEmitting(), instead the period is always reset if the state changes. Added separate RemoveAllParticles(), ResetEmissionTimer() & Reset() functions. 2014-05-30 16:20:30 +03:00
Aster@中国上海
5ae71ba270 Fix user type attribute setting bug. Thanks Mike. 2014-05-30 11:24:01 +08:00
urho3d-travis-ci
319f996c5f Travis CI: API documentation update at 2014-05-28 06:18:37 UTC.
[ci package]
2014-05-28 06:18:37 +00:00
Lasse Öörni
fa5ce00ff5 Added SetCustomTriangleMesh() function to CollisionShape, which uses a CustomGeometry to define the collision shape. Exposed missing SetCustomConvexHull() function to Lua. 2014-05-28 02:37:14 +03:00
Lasse Öörni
2056be0bde Fix typos in comments. 2014-05-27 19:40:46 +03:00
Lasse Öörni
1c3302757c Clean up shader compiler error string on shader live reload to allow recovery. Closes #363. 2014-05-27 00:21:16 +03:00
Lasse Öörni
f3b6a718f7 Merge remote-tracking branch 'remotes/mike3d/master' 2014-05-26 23:27:09 +03:00
Lasse Öörni
a7f9747376 Fix compressed sound resourceref not being serialized. 2014-05-26 23:18:08 +03:00
Mike3D
c04bceb490 Update CMakeLists.txt 2014-05-24 07:22:43 +02:00
Yao Wei Tjong 姚伟忠
a690e6b2f4 Attempt to fix the bullet numbering issue in GitHub pages.
The numbering is fine locally for some reason. [ci skip]
2014-05-24 12:59:01 +08:00
urho3d-travis-ci
165fed63ef Travis CI: API documentation update at 2014-05-24 04:37:11 UTC.
[ci package]
2014-05-24 04:37:11 +00:00
Yao Wei Tjong 姚伟忠
96295b4923 Ensure the application logs are created in a writeable location.
- Add a new function to get application preferences directory and expose it to scripting.
- Change Editor to save/load configuration file from the application preferences directory.
- Standardized the location of log files generated by Urho3DPlayer and samples. Ensure it is created in a user writeable location to prevent application locked up during closing.
2014-05-24 12:16:18 +08:00
Yao Wei Tjong 姚伟忠
cf654822c4 Add initial support for CodeBlocks IDE. [ci skip] 2014-05-24 09:41:31 +08:00
Mike3D
bba58e1287 New Urho2D sample demonstrating constraints.
Thanks to Aster for his help.
2014-05-23 21:17:45 +02:00