badlogic
|
5a78663bfa
|
[cocos2dx] Resolved merge conflict that got accidentially commited.
|
2018-08-10 11:57:11 +02:00 |
|
badlogic
|
253bda4ee4
|
Merge branch '3.7-beta' into 3.7-beta-cpp
|
2018-08-10 11:54:49 +02:00 |
|
badlogic
|
1c86d63941
|
[cpp] Fixes #1159, illegal memory access in Vector.
|
2018-08-10 11:52:59 +02:00 |
|
badlogic
|
d3e37284fc
|
Merge branch '3.6' into 3.7-beta
|
2018-08-10 11:14:01 +02:00 |
|
badlogic
|
a578be88e0
|
[cocos2dx][c] Fixed call to spVertexAttachment_computeWorldVertices, as well as count calcalculation.
|
2018-08-10 11:11:15 +02:00 |
|
badlogic
|
c405dcd165
|
[cocos2dx][cpp] More changes to computeWorldVertices.
|
2018-08-09 15:27:26 +02:00 |
|
badlogic
|
f12728f0d2
|
Merge branch '3.7-beta' into 3.7-beta-cpp
|
2018-08-09 15:18:15 +02:00 |
|
badlogic
|
4005ff2ad4
|
Merge branch '3.6' into 3.7-beta
|
2018-08-09 15:02:55 +02:00 |
|
badlogic
|
9a428a02b8
|
[c] Fixes #1148, revert changes to spVertexAttachment_computeWorldVertices. Vertex size must be a multiple of 4, which explains why #1148 failed.
|
2018-08-09 14:59:09 +02:00 |
|
badlogic
|
58d98ee667
|
[love] Fixed crash in Love 0.11, blend mode multiply requires everything to be PMA.
|
2018-08-07 10:10:36 +02:00 |
|
Mario Zechner
|
8621472bb4
|
[as3] Ported stretchy IK. See #1142.
|
2018-08-06 16:08:47 +02:00 |
|
Mario Zechner
|
cdc2d5bc88
|
[ts] Ported stretchy IK. See #1142.
|
2018-08-06 15:09:08 +02:00 |
|
Mario Zechner
|
ac7fe7ca80
|
Updated examples to 3.7, including stretchy ik.
|
2018-08-03 14:57:10 +02:00 |
|
pharan
|
b4db3b2114
|
[unity] Handle varying CopyTexture support.
|
2018-08-02 10:20:46 +08:00 |
|
Mario Zechner
|
6b56eb0d95
|
[as3][starling] Updated to Player version 30.0.
|
2018-08-01 16:30:13 +02:00 |
|
Mario Zechner
|
13924a04e9
|
Final ignores.
|
2018-08-01 16:16:10 +02:00 |
|
Mario Zechner
|
141b0035c6
|
And more ignores.
|
2018-08-01 16:15:37 +02:00 |
|
Mario Zechner
|
2d52ca9673
|
More git ignores.
|
2018-08-01 16:07:07 +02:00 |
|
|
|
79d1876cba
|
Added .metadata to .gitignore.
|
2018-08-01 15:51:03 +02:00 |
|
pharan
|
b0a19f30c4
|
[unity] Remove old Texture.Apply calls.
This is a breaking change to the AtlasRegion.ToTexture API. But the callers only need to remove the applyImmediately arg for it to work correctly.
|
2018-08-01 17:15:03 +08:00 |
|
pharan
|
70cebf6dcc
|
[unity] Use nonallocating texture copy.
|
2018-08-01 17:01:21 +08:00 |
|
badlogic
|
5917c25961
|
[sfml] Fixed C++ sample.
|
2018-08-01 10:16:13 +02:00 |
|
badlogic
|
93b56b4754
|
[ue4] fixed sample binary format...
|
2018-07-24 16:46:51 +02:00 |
|
badlogic
|
393e0405c0
|
Merge branch '3.7-beta' into 3.7-beta-cpp
|
2018-07-24 16:33:49 +02:00 |
|
badlogic
|
2199b5a2ea
|
Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta
|
2018-07-24 16:33:27 +02:00 |
|
badlogic
|
5087cd0373
|
[cpp] Closes #1149, C++ EventTimeline had a bug that prevented it from firing events.
|
2018-07-24 16:33:20 +02:00 |
|
badlogic
|
8ebf1e34d6
|
[ue4] Fixed sample regarding flipX/flipY -> scaleX/scaleY, example projects require 4.18 now.
|
2018-07-24 16:13:49 +02:00 |
|
badlogic
|
51f73fab6e
|
[ue4] Fixed flipx/flipy in samples.
|
2018-07-24 15:47:47 +02:00 |
|
badlogic
|
77d495bc6d
|
[ue4] Ported flipX/flipY -> scaleX/scaleY change. See #1142.
|
2018-07-24 15:16:23 +02:00 |
|
badlogic
|
54653d3a9e
|
Merge branch '3.7-beta' into 3.7-beta-cpp
|
2018-07-24 15:01:36 +02:00 |
|
badlogic
|
84dcd6ba25
|
[lua] Ported flipX/flipY -> scaleX/scaleY change. See #1142.
|
2018-07-24 15:01:20 +02:00 |
|
badlogic
|
fb67ada3d8
|
[as3] Ported flipX/flipY -> scaleX/scaleY change. See #1142.
|
2018-07-24 14:39:54 +02:00 |
|
badlogic
|
9d8e5d4cd3
|
Fixed gitignore for differences between 3.7-beta and 3.7-beta-cpp.
|
2018-07-24 13:07:14 +02:00 |
|
badlogic
|
6515b5dcfd
|
Merge branch '3.7-beta' into 3.7-beta-cpp
|
2018-07-24 13:06:30 +02:00 |
|
badlogic
|
486fa7eebf
|
Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta
|
2018-07-24 13:03:11 +02:00 |
|
badlogic
|
5aab588928
|
[c][cpp] Ported flipX/flipY -> scaleX/scaleY change. See #1142.
|
2018-07-23 15:16:21 +02:00 |
|
badlogic
|
172bf22d84
|
[ts] Ported flipX/flipY -> scaleX/scaleY change. See #1142.
|
2018-07-23 14:43:19 +02:00 |
|
pharan
|
c4c9743d8d
|
[unity] Fix new folders AnimationReferenceAsset.
|
2018-07-20 03:19:40 +08:00 |
|
pharan
|
3b750c2612
|
[unity] Fix new folders AnimationReferenceAsset.
|
2018-07-20 03:16:28 +08:00 |
|
pharan
|
ad224c4ef4
|
[unity] Docs/handling for SkeletonGraphicMirror.
|
2018-07-20 02:56:52 +08:00 |
|
pharan
|
9791d3a0d5
|
[unity] Docs/ handling for SkeletonGraphicMirror.
|
2018-07-20 02:56:15 +08:00 |
|
pharan
|
04b7edc617
|
Merge branch '3.6' into 3.7-beta
# Conflicts:
# spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs
|
2018-07-20 02:41:55 +08:00 |
|
pharan
|
7d90095aca
|
Merge branch '3.6' of https://github.com/EsotericSoftware/spine-runtimes into 3.6
|
2018-07-20 02:35:44 +08:00 |
|
pharan
|
5ce7642cf1
|
[unity] Add SkeletonGraphic mirroring.
|
2018-07-20 02:35:13 +08:00 |
|
badlogic
|
908495819c
|
Merge branch '3.7-beta' into 3.7-beta-cpp
|
2018-07-19 16:54:20 +02:00 |
|
badlogic
|
b878d16eac
|
Merge branch '3.6' into 3.7-beta
|
2018-07-19 16:54:10 +02:00 |
|
badlogic
|
e897dcafa5
|
[c] Closes #1148, count in vertex attachment computation was wrong when stride was <> 2.
|
2018-07-19 16:53:59 +02:00 |
|
badlogic
|
8a14924859
|
[c] Closes #1148, count in vertex attachment computation was wrong when stride was <> 2.
|
2018-07-19 16:53:00 +02:00 |
|
badlogic
|
cb22d5dab9
|
Merge branch '3.7-beta' into 3.7-beta-cpp
|
2018-07-18 15:20:05 +02:00 |
|
badlogic
|
0284abe548
|
[cpp][sfml] Removed Atlas::dispose, merged into destructor. Destructor calls TextureLoader::unload now. Fixed up SFML backend accordingly.
|
2018-07-18 15:05:23 +02:00 |
|