2820 Commits

Author SHA1 Message Date
John
620461494c Update CHANGELOG.md 2017-03-11 06:43:01 +08:00
John
38179a3a95 Update CHANGELOG.md 2017-03-11 06:41:40 +08:00
badlogic
2b087a6023 Fix C# header 2017-03-10 11:33:10 +01:00
badlogic
babcfde8fe Updated CHANGELOG 2017-03-10 11:32:13 +01:00
badlogic
4935284449 [starling] Added two color tinting. Closes part of #843 2017-03-10 11:28:51 +01:00
badlogic
711c731b0f Added changes for libGDX 2017-03-09 14:47:40 +01:00
badlogic
06f229d149 Fixed formatting of CHANGES 2017-03-09 14:41:42 +01:00
badlogic
38a1d1ee43 Fixed formatting of CHANGES 2017-03-09 14:37:42 +01:00
badlogic
56ef82b843 [as3][starling] Formatting. 2017-03-09 14:34:09 +01:00
badlogic
8eba84856e [starling] two color tint baby steps 2017-03-09 10:12:18 +01:00
badlogic
aeff32bf58 [runtimes] More formatting for CHANGELOG 2017-03-07 15:01:40 +01:00
badlogic
acb4b83c3f [runtimes] More formatting for CHANGELOG 2017-03-07 15:00:56 +01:00
badlogic
5c7c2f72a3 [runtimes] Different CHANGELOG format 2017-03-07 14:47:04 +01:00
badlogic
f1d5fbd6d1 [runtimes] Updatd CHANGELOG.md 2017-03-07 14:20:39 +01:00
badlogic
1bb212a110 [ts] Merged with master. 2017-03-07 11:57:19 +01:00
badlogic
3fd5c62588 [ts] Updated JS builds. 2017-03-07 11:53:21 +01:00
badlogic
94f100a1cf [ts][widget] Actually use config.loop field. Closes #853. 2017-03-07 11:52:27 +01:00
badlogic
d5297334c0 [ts][widget] Fix handling of config.atlasContent and config.jsonContent. Closes #854 2017-03-07 11:50:25 +01:00
John
1bbb120e5b [unity] Fix merge duplicate line. 2017-03-04 23:51:44 +08:00
badlogic
6a4a667458 Merged master manually 2017-03-02 13:35:36 +01:00
badlogic
8a7ac93f6f [ts][widget] Added jsonContent and atlasContent fields to widget configuration. Allows to pass content directly instead of fetching it from a URL. See README.md. Closes #844 2017-03-02 13:33:00 +01:00
badlogic
c019550d2d [ue4] Fixed packaging. Closes #850 2017-03-02 13:19:14 +01:00
badlogic
1ad8e6b63c Merged with master, resolved conflicts 2017-03-02 13:04:44 +01:00
badlogic
7e0df8fa6d [ts][canvas] Fixed alpha tinting 2017-03-02 11:50:46 +01:00
badlogic
d5cc4d598a [ts][canvas] Added support for alpha tinting, rgb tint is ignored 2017-03-02 11:41:45 +01:00
badlogic
f5b4310350 [ts][canvas] Cleanup 2017-03-02 11:09:45 +01:00
badlogic
3bb27040c4 [ts][canvas] Fixed superfluous paranthesis 2017-03-02 11:08:03 +01:00
badlogic
e8df948d9d [ts][canvas] Canvas renderer now supports shearing and non-uniform scale. Closes #851 2017-03-02 11:04:11 +01: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
Shinsuke Sugita
30d52282af fix typo (#847)
receive is correct
2017-03-01 08:58:11 +01:00
Shinsuke Sugita
8887a1f5e3 fix typo (#846)
recieve => receive
2017-03-01 08:57:53 +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
a7ca424e3f Merge branch '3.6-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.6-beta 2017-02-28 16:07:57 +01:00
badlogic
e5d6f3f202 [cocos2dx] Fixed Android build of example 2017-02-28 16:07:52 +01:00
pharan
54de3b2b5e Merge branch '3.6-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.6-beta 2017-02-28 22:57:09 +08:00
pharan
93ea3a56c2 [unity] Moved AtlasRegionAttacher and SpriteAttacher to Sample Components. 2017-02-28 22:55:46 +08:00
pharan
033edb5680 [unity] Updated examples for 3.6 2017-02-28 22:55:16 +08: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
82899299f8 Merge branch '3.6-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.6-beta 2017-02-28 15:40:12 +01:00
badlogic
ca23700db0 [cocos2dx] Fixed formatting, removed printf... 2017-02-28 15:40:07 +01:00
John
3697e431ee [csharp] Fix reading dark color from binary. 2017-02-28 22:37:46 +08:00
badlogic
6fdded7bf8 Merge branch '3.6-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.6-beta 2017-02-28 15:36:12 +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
John
d7d6177372 [csharp] Fix disabled inheritance when yDown==true (#834)
http://esotericsoftware.com/forum/Flipped-bones-during-runtime-using-XNA-sample-project-7873
2017-02-28 04:23:09 +08:00
pharan
1c5866a3a7 [unity] Fix disabling preprocessor defines. 2017-02-27 18:09:32 +08:00