159 Commits

Author SHA1 Message Date
NathanSweet
1f991ac234 Commit VS user file to for correct working dir. 2013-03-25 20:56:56 +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
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
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