75 Commits

Author SHA1 Message Date
unknown
99c08fced6 Port more features 2019-07-02 17:51:47 +02:00
badlogic
7f7e5f0fec Updated license headers and LICENSE files. 2019-05-02 11:38:19 +02:00
badlogic
691cb23218 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-12-03 17:18:04 +01:00
badlogic
7a803f8b1b Updated example project exports. 2018-12-03 17:12:03 +01:00
badlogic
990ccc4606 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-11-15 15:58:42 +01:00
badlogic
c95af40579 Updated all exports, using PMA now where possible in all examples. Did not update UE4 and Unity assets, these need to be updated manually. 2018-11-15 10:58:30 +01:00
badlogic
bb1bdd7046 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-10-26 17:12:08 +02:00
sp-stefano-lanza
7183e3b0bd Feature/new skeleton culling (#1196)
* Fix culling of skeleton and clean up code

* Optionally draw the bounding rectangle of skeletons

* Add Visual Studio compiler support

* Fix indentation

* Fix indentation

* Fix indentation

* Revert some indentation changes
2018-10-16 15:46:49 +02:00
badlogic
f033239b54 [cocos2dx] Fixes tint black. 2018-08-13 16:56:05 +02:00
badlogic
cb22d5dab9 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-07-18 15:20:05 +02:00
badlogic
218d3b4737 [cpp][sfml][cocos2dx] skip rendering of skeletons/slots/attachment with alpha equal 0. 2018-07-18 14:27:57 +02:00
badlogic
f315f36956 [cocos2dx] Fixed batchers, MSVC projects. 2018-06-05 14:36:20 +02:00
badlogic
7e68a48189 [cocos2dx] More fixes to two color batching. 2018-06-05 13:30:00 +02:00
badlogic
162ce9f5aa Fixed meshes. 2018-05-30 18:31:36 +02:00
badlogic
878a6e6435 Refactored C++ runtime, added cocos2d-x cpp runtime. 2018-05-30 17:31:11 +02:00
badlogic
34bac82ee2 [c] Fixed parsing of dark slot colors for binary files. See #1097 2018-04-12 10:30:43 +02:00
badlogic
eecde9e871 [cocos2d-x] Closes #1075, added SkeletonRenderer:setSlotsRange and SkeletonRenderer::createWithSkeleton. Allows rendering parts of a single skeleton, mixed with other nodes. See SkeletonRendererSeparator.cpp for an example. 2018-02-06 15:16:23 +01:00
badlogic
7488383b15 [cocos2dx] Added support for vertex effects. See #898 2017-06-26 15:00:59 +02:00
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
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
137f95a20f [cocos2dx] Added debug meshes rendering. 2017-04-18 10:26:25 +02: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
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
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
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
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
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
89d9ee00dc [cocos2d-x] Cleaned up #716, added #712 manually to fix shared data rendering 2016-10-03 13:57:12 +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
eb3cb8a700 Cleaned up assets in runtime examples, runtimes.sh now copies all assets to the required locations, except for spine-unity. 2016-09-05 15:05:23 +02:00
Mario Zechner
eb540387e6 [c][sfml][cocos2d-x][cocos2d-objc] Updated to 3.3.07 (#629) 2016-07-05 19:53:24 +02:00
John
b9bd66b36b Updated spine-c, spine-sfml, spine-cocos2d-objc and spine-cocos2dx to 3.2.01
- Updated spine-c to 3.2.01, adding shearing and transform constraints plus various bug fixes
- Introduced CMake based system to generated IDE projects for spine-sfml, and download dependencies for all other runtimes
- Updated all spine-c based runtime READMEs with new usage and example instructions
- Moved spine-cocos2d-iphone v2 and spine-cocos2dx v2 to separate branches. These will no longer be updated
- Renamed spine-cocos2d-iphone to spine-cocos2d-iphone

Removed cocos2d-ios v2 Spine runtime. See branch cocos2d-ios-v2 for legacy apps

Moved cocos2d-ios v3 Spine runtime to top-level sphine-cocos2d-iphone directory

Added Visual Studio support to CMake build

Added Linux support for spine-sfml. Do apt-get install sfml-dev as a prerequisit, makes everyone's life easier

Refactored Mac OS X framework detection and linking, added SFML_STATIC define for Win32 build

Removed spine-cocos2dx v2 runtime. See cocos2dx-v2 branch on Github

Moved spine-cocos2dx v3 runtime to root of spine-cocos2dx

spine-c, spine-cocos2d-iphone, spine-cocos2dx, spine-sfml updated to 3.2.00

* Added CMake build for spine-c and spine-sfml
* Removed spine-cocos2dx v2 and spine-cocos2d-iphone v2. See the cocos2dx-v2 and cocos2d-ios-v2 branches if you need these runtimes still
* Added transform constraint rotate, scale, and shear offsets and mixes
* Added spTransformConstraintTimeline
* Added bone shearing
* Added spShearTimeline
* Changed spSkeleton_updateCache
* Changed JSON format, see http://esotericsoftware.com/spine-json-format

Ported 1be89d1c5766fedb91f080a23bffaef6609b86c3 to spine-c

Cleaned up spine-c, removed IDE specific files and unnecessary data/ folder. Use CMake to import into your most beloved IDE

Added spine-cocos2d-iphone to CMake, only downloads cocos2d-objc dependency. Use Xcode project in spine-cocos2d-iphone/ to run examples

Added -std=c98 -pedantic -Wall to spine-c CMake file, fixed up all warnings, fixed up .gitignore

Fixed warnings, replaced calls to stdlib cos/sin/atan2 with macros

New cocos2dx example project, for Windows, Linux and Mac OS X. Doesn't work on Windows/Linux yet

Fixed spine-cocos2dx Visual Studio projects

Reworked cocos2dx dependency resolution

Fixed up src/header paths in CMake files. Dependencies are only downloaded if you build a specific runtime example

Updated spine-sfml README with instructions for Windows

Updated spine-sfml README with instructions for Linux and Mac OS X

Fixed README formatting

More formatting, sorry, can't preview markdown...

More README changes

Renamed spine-cocos2d-iphone to spine-cocos2d-objc, fixed up Xcode project and README

Updated spine-cocos2d-objc README

Added context when exceptions are thrown during attachment and animation parsing.

Added JsonRollback, a tool for converting newer JSON so it can be loaded by an older Spine version.

[Unity] Update BoneFollower

Added coverting linkedmesh to weightedlinkedmesh.

[LUA] AnimationState trackCount bugfixes (#466)

* resolved conflict

* made trackCount keep count, not maximum track index.

Prettier with varargs.

Updated .gitignore to exclude cocos2dx dependencies

Fixed up READMEs of spine-c based runtimes with proper version info. Fixed cocos2d-x CMake build to delete outdated Spine runtime shipped by cocos2d-x
2016-06-22 15:23:31 +02:00
NathanSweet
e68c830876 cocos2d-x support for: 2.2.4, 3.0, 3.1alpha1 2014-05-16 16:33:30 +02:00
sbrednikhin
0dd179b4b4 vector and matrix names fixed
Vector -> Vec2
Matrix -> Mat4
according to cocos 2dx 3.1 alpha branch
2014-05-16 10:54:38 +03:00
NathanSweet
df959cb646 Meshes, FFD and skinning for cocos2d-x. 2014-05-14 21:49:35 +02:00
NathanSweet
7199d22417 Better AnimationState listeners, including on a TrackEntry. 2014-05-11 21:00:50 +02:00
NathanSweet
90ec4db279 C++11 AnimationState listener.
Because 2014.
2014-05-08 22:29:50 +02:00
NathanSweet
5c6ebf2c63 cocos2d-x updated to 3.1alpha0.
No meshes yet.
2014-05-08 19:21:50 +02:00
NathanSweet
9780af9524 Fixed premultiplied alpha. 2014-02-01 01:27:58 +01:00
NathanSweet
54ae334637 Update commented out code to test for memory leaks. 2013-12-05 19:03:42 +01:00
NathanSweet
51a0876561 Added call to update so it is called before the first draw. 2013-10-30 18:54:35 +01:00
NathanSweet
6862eec5af Made 0 scale use "content scale factor". Commented drawOrder animation. 2013-10-30 14:25:16 +01:00
NathanSweet
2bff08de4b Prefixed all spine-c structs and functions with "sp".
Holy refuctoring! Sorry for the change, but some libraries were having naming conflicts. You can define SPINE_SHORT_NAMES before including spine-c headers if you want to use structs and functions without the "sp" prefix, as it was before.
2013-10-09 03:43:16 +02:00
NathanSweet
a7913e35ba Better example. 2013-09-27 11:41:23 +02:00