265 Commits

Author SHA1 Message Date
badlogic
b443e6e609 [Lua] Fixed path constraint sorting and type check in case attachment of target is null. [cocos2dx] Fixed samples. 2017-06-19 17:49:01 +02:00
badlogic
9bd1153518 Updated examples and runtime demo code 2017-06-19 16:47:28 +02:00
badlogic
1af2089157 [cocos2dx] Fixed tinting and cascaded colors. Closes #902, closes #901 2017-05-17 11:03:34 +02:00
badlogic
676b740269 [c] Added stride to spSkeletonClipping_clipTriangles. [cocos2dx] Added clipping. 2017-04-30 19:13:11 +02:00
badlogic
d52ac2afd4 [c][sfml] Added clipping. [cocos2dx] Added stub for clipping and assets. [c] Fixed handling of indices short -> unsigned short 2017-04-28 14:31:18 +02:00
badlogic
26c1bfe8b4 [cocos2dx] Fixed #877, support for ETC1. Note that ETC1 is not supported when two color tinting is enabled! 2017-04-18 10:31:57 +02:00
badlogic
137f95a20f [cocos2dx] Added debug meshes rendering. 2017-04-18 10:26:25 +02:00
badlogic
8920840ecf [starling] Fixed renderer, ignores path attachments. Fixed samples, click on sprites to advance to next sample. Updated assets 2017-04-11 13:11:02 +02:00
badlogic
0b40dd7a9f Updated exports 2017-03-27 10:19:51 +02:00
badlogic
0be704dc66 [cocos2d-objc] Added batcher, incomplete 2017-03-02 08:47:15 +01:00
badlogic
8c6a91c2a1 [cocos2dx] Batching of adjacent two color tinted skeletons. See README.md for rules on what does and doesn't break batching 2017-03-01 11:28:29 +01:00
badlogic
4bb4c4d17a Merge branch '3.6-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.6-beta 2017-02-28 16:57:08 +01:00
badlogic
1c0076bce7 [cocos2dx] Updated example to cocos2d-x 3.14.1 2017-02-28 16:52:41 +01:00
badlogic
19ef777937 Merge branch '3.6-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.6-beta 2017-02-28 16:46:18 +01:00
badlogic
f93486e11b [cocos2dx] Fixed Windows build of example 2017-02-28 16:46:10 +01:00
badlogic
e5d6f3f202 [cocos2dx] Fixed Android build of example 2017-02-28 16:07:52 +01:00
badlogic
4fa4f9009e [cocos2dx] Updated README.md 2017-02-28 15:53:12 +01:00
badlogic
bc8ac2e379 [cococs2dx] Reverted temporary changes to samples 2017-02-28 15:50:35 +01:00
badlogic
ca23700db0 [cocos2dx] Fixed formatting, removed printf... 2017-02-28 15:40:07 +01:00
badlogic
1be3c1a6b4 [c] Implemented two color tinting. We use our own batching/shader, see SkeletonTwoColorBatch. Currently, every two color tinted skeleton is its own batch. Enable two color tinting by SkeletonRenderer::setTwoColorTint(true) for a specific skeleton instance 2017-02-28 15:36:04 +01:00
badlogic
6c581880b0 [cocos2d-x] Fixed up scaling factor in BatchingExample 2017-02-23 13:21:51 +01:00
badlogic
38c3687e85 [cocos2dx] Fixed mesh rendering 2017-02-20 10:22:51 +01:00
badlogic
aa33f980d2 [cocos2dx] First try at optimizing renderer by removing allocation. Meshes temporarily broken 2017-02-20 10:00:57 +01:00
badlogic
25fb5b1bff [cocos2dx] Ported to 3.6, no two color batching yet 2017-01-30 16:55:04 +01:00
badlogic
fe8eae4b8e [c] Ported 3.6 changes, two color timeline, changed updateWorldVertices to computeWorldVertices, point attachment, transform constraint local and relative mode. Does not actually render two color tinted slots yet. Also updated example exports 2017-01-30 16:31:16 +01:00
badlogic
4dacc8c67c [cocos2dx] Updated README 2016-12-27 11:06:59 +01:00
badlogic
b9ee3bfc5d [cocos2dx] Add missing new AnimationState methods. Closes #807 2016-12-20 10:45:24 +01:00
badlogic
e37416d935 [cocos2dx] Fixed up Visual Studio project for new spine-c location 2016-11-28 16:19:20 +01:00
badlogic
9960402e39 [cocos2dx][cocos2dobj] Fixed up cocos2d-x and cocos2d-objc xcode projects for new spine-c directory 2016-11-28 16:15:35 +01:00
badlogic
387b0afb80 [c] Added spine-c-tests (thanks @jpoag), fixed up CMake build 2016-11-28 16:00:46 +01:00
badlogic
7fc9d1a26a [c] fixed bug in spAnimationState_addPropertyID, didn't keep track of #properties. Closes #774 2016-11-24 15:01:23 +01:00
badlogic
a7fe570148 [ts] Ported AnimationState changes 2016-11-24 12:48:45 +01:00
NathanSweet
d52d2e72ee Updated READMEs, supported version is 3.5.xx. 2016-11-15 23:29:27 +01:00
NathanSweet
36000e3c55 Updated to v3.5 (merge dev branch).
# Conflicts:
#	spine-c/src/spine/AnimationState.c
2016-11-15 23:10:23 +01:00
NathanSweet
c0fdc454a2 Fixed inconsistent newlines.
License header was followed by \n\n and files ended with \n. Changed to \r\n.
2016-10-15 23:45:16 +02:00
NathanSweet
f63561085a List explicit Spine editor version that is supported. 2016-10-13 22:55:04 +02:00
badlogic
ef50131431 [runtimes] Updated all LICENSE files and README.mds 2016-10-13 15:21:05 +02:00
badlogic
5aa27771c3 [runtimes] Updated ALL sources to use latest Spine Runtimes License v2.5. Manually checked all the things... 2016-10-13 15:12:05 +02:00
badlogic
32b022d0bc [cocos2dx] Clean-up 2016-10-11 16:06:49 +02:00
badlogic
c2274020be [cocos2dx] Updated README.md 2016-10-11 15:10:59 +02:00
badlogic
b34e6dbb78 [cocos2dx] Added Android project for testing, see README.md for instructions 2016-10-11 14:44:36 +02:00
badlogic
25be5370b2 [cocos2d-x] Fixed up binary loader support 2016-10-03 14:18:57 +02:00
badlogic
89d9ee00dc [cocos2d-x] Cleaned up #716, added #712 manually to fix shared data rendering 2016-10-03 13:57:12 +02:00
Ricardo Quesada
efe0b55dbb Adds Binary support to cocos2d-x (#716)
- it simplifies the constructors/initializors
- the binary API is ::createWithBinaryFile()
- the JSON API is :: createWithJsonFile()
- the old API ::createWithDataFile() is deprecated and calls
createWithJsonFile()
2016-10-03 13:37:34 +02:00
Wilson E. Alvarez
3c12d54653 Fix mismatched memory deallocator in SkeletonRenderer.cpp (#702) 2016-09-23 12:57:53 +02:00
halx99
2f5e549475 Fix memory leak of c++ objects (#697)
We used C malloc/free which can't properly destruct C++ objects.
2016-09-13 11:28:17 +02:00
badlogic
48c5b06676 [cocos2dx] Closes #611, cocos2d-x v3 auto-batcher does it's work, makes SkeletonBatch a lot simpler 2016-09-11 13:26:51 +02:00
badlogic
48568cda2f [cocos2dx] Updated to cocos2dx 3.13 2016-09-05 15:40:39 +02:00
badlogic
030a28022a [cocos2dx] Fixed GL context attribute initialization for iOS 2016-09-05 15:32:29 +02:00
badlogic
cb949715f3 [cocos2dx] Added dependency on CoreText to iOS example 2016-09-05 15:27:26 +02:00