NathanSweet
12245b9912
gitignore
2013-03-25 20:39:44 +01:00
NathanSweet
9d18556f15
Merge branch 'vinova-master'
2013-03-25 20:33:05 +01:00
NathanSweet
f2b6e73df8
Fixed up iOS project.
2013-03-25 20:27:59 +01:00
NathanSweet
554b6592b6
Fixed up Windows stuff.
2013-03-25 19:46:46 +01:00
NathanSweet
ba0227364d
Place cocos2dx here
2013-03-25 19:33:10 +01:00
NathanSweet
91244a7b15
Moved cocos2d location.
2013-03-25 19:27:30 +01:00
NathanSweet
4cb9a8b088
Merge branch 'master' of https://github.com/vinova/spine-runtimes into vinova-master
...
Conflicts:
spine-cocos2dx/example/Classes/ExampleScene.cpp
2013-03-25 19:20:45 +01:00
Stefan Nguyen
ef6140e4c1
scale SkeletonJson object to 0.5
2013-03-25 22:03:49 +07:00
Stefan Nguyen
ff62c847f2
fix proj.win32
2013-03-25 21:58:37 +07:00
NathanSweet
81a9c60b20
Added debug rendering. Thanks to Stefan Nguyen @ Vinova Pte Ltd! http://www.vinova.sg
2013-03-25 13:34:38 +01:00
NathanSweet
42d072ae8d
Simplified Timeline interface.
2013-03-25 12:49:02 +01:00
NathanSweet
75fc36eab6
Simplified all loading methods to take path, stream, or pointers.
2013-03-25 12:33:21 +01:00
NathanSweet
6e7e8c5512
Changed Atlas constructor to take a path.
2013-03-25 12:12:04 +01:00
Stefan Nguyen
510849c609
support multiple-resolutions
2013-03-25 15:58:28 +07:00
Stefan Nguyen
ee25feffbe
reorganize structure to match cocos2d-x multi-platform style; create a working iOS example
2013-03-25 14:36:39 +07:00
NathanSweet
6addb86a40
Changed file loading to use cocos2d-x API.
2013-03-24 22:39:29 +01:00
NathanSweet
17394e1851
cocos2d-x runtime!
2013-03-22 16:18:18 +01:00
NathanSweet
3aab744395
Utility methods to read from file and other minor improvements.
2013-03-22 16:18:03 +01:00
NathanSweet
6899b5249c
Added AnimationState.
...
Fixed bug with keeping attachments visisble when setting new skin.
Clean up. Always more clean up can be done, freaking C++...
2013-03-22 14:22:35 +01:00
NathanSweet
b075838c9e
Removed sysout
2013-03-22 12:57:23 +01:00
NathanSweet
159d076f79
Names for animation and skeleton.
2013-03-22 12:57:03 +01:00
NathanSweet
d07321c9e7
Javadocs
2013-03-22 12:41:57 +01:00
NathanSweet
6e0e420e0a
Javadoc
2013-03-22 12:23:50 +01:00
NathanSweet
a2f6e5006d
AnimationStateTest
2013-03-22 12:22:41 +01:00
NathanSweet
d6e7ae7a4a
Fixed test files.
2013-03-22 12:20:42 +01:00
NathanSweet
760319990f
Fixed region sequence for libgdx.
2013-03-21 14:57:30 +01:00
NathanSweet
0c2e2b1d3e
Refactored spine-corona to use an attachment loader like the other runtimes. This is more flexible than the old attachment resolver.
2013-03-20 15:44:05 +01:00
NathanSweet
462faef9aa
Fixed Lua license headers (oops).
2013-03-20 15:22:07 +01:00
NathanSweet
9d8791385e
Fixed Lua license headers (oops).
2013-03-20 15:21:40 +01:00
NathanSweet
6e9bcfd1d5
License headers for source files.
2013-03-20 14:58:59 +01:00
NathanSweet
a6a7200097
includes -> include
2013-03-20 14:22:16 +01:00
NathanSweet
d3949288f8
Separated SFML from spine-cpp.
2013-03-20 14:08:54 +01:00
NathanSweet
97974cfbe1
Fixed issue #16 .
2013-03-19 00:19:00 +01:00
NathanSweet
0812aaa091
Cleanup, javadocs.
2013-03-18 15:43:12 +01:00
Nathan Sweet
6d329a1196
Merge pull request #14 from Disk1of5/master
...
New test and added animation state.
2013-03-18 07:35:14 -07:00
Disk1of5
827cb592c9
**Updated AnimationStatesTest.Java to match the LwjglApplication launcher of the other examples.
...
-Disk1of5
2013-03-15 12:02:15 -06:00
NathanSweet
60d70e3a87
Renamed project to spine-cpp.
2013-03-15 18:58:56 +01:00
Disk1of5
3da5dcef69
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
spine-libgdx/.classpath
spine-libgdx/test/com/esotericsoftware/spine/MixTest.java
spine-libgdx/test/com/esotericsoftware/spine/SkeletonTest.java
*First Merge attempt.. may Gawd help us all. -Disk1of5.
2013-03-15 11:58:48 -06:00
Disk1of5
1c2554c178
Added:
...
*AnimationState.java
*AnimationStateTest.java
Updated:
*Git ignore to ignore all LibGDX libs.
*MixTest.Java -- Reverted back to LWJGL
*SkeletonTest.java -- Reverted back to LWJGL
A few Idea project files where added. I left these in for easy future development with
Intellij Idea.
2013-03-14 22:32:25 -06:00
NathanSweet
3bacf2a9e4
setToBindPose for new slots.
2013-03-15 02:36:38 +01:00
NathanSweet
43018798ab
Look in skin before default skin.
2013-03-15 02:25:15 +01:00
NathanSweet
5fdcfaca2e
Added fields to timeline classes, issue #8 .
2013-03-15 02:16:41 +01:00
NathanSweet
a1ad55f8a1
Documented memory ownership.
...
Clean up and minor improvements.
2013-03-15 01:41:24 +01:00
NathanSweet
a347994c52
Merge remote-tracking branch 'origin/master'
2013-03-14 23:00:08 +01:00
NathanSweet
3dc750be8d
We'll stay with LWJGL backend for the examples.
2013-03-14 22:59:55 +01:00
Nathan Sweet
179e47f41d
Merge pull request #9 from victorsavu3/master
...
Allow animations to be transformed and various memory problems
2013-03-14 14:57:18 -07:00
Victor Savu
b0f8468ddc
initialize variable
2013-03-13 00:40:18 +02:00
Victor Savu
c93bb14708
free the texture when we are done with it
2013-03-13 00:40:18 +02:00
Victor Savu
67aa830511
fix use after free
...
the string created by value.substr(index * 2, 2) is deleted after c_str()
but before strtoul executes. The solution is to use a temporary string
to store the value.
2013-03-13 00:40:18 +02:00
Victor Savu
f77459983f
use the states provided
...
This allows animations to be scaled/moved easily
2013-03-13 00:40:18 +02:00