3647 Commits

Author SHA1 Message Date
Stephen Gowen
b50496fe05 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-11-23 13:00:21 -05:00
John
ad55ab9736
[unity] Handle SkeletonAnimator edit mode pose. 2017-11-23 14:09:33 +08:00
Stephen Gowen
e7ca5c8378 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-11-22 13:07:30 -05:00
John
ed8f238524
[csharp] Removed bad fix for #1024
based on 1514b4acbb (diff-2e690293d0fea3104ddda07be1d1e5c9)
2017-11-22 18:07:20 +08:00
Stephen Gowen
cf70f3b054 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-11-21 09:49:47 -05:00
minggo
5948e5a62f fix warnings (#1034) 2017-11-21 11:17:39 +01:00
Stephen Gowen
cfcc548b5f Merge branch 'EsotericSoftware/3.6' into 3.6 2017-11-20 11:50:50 -05:00
John
017b65198f
[unity] Fix some OnValidate behavior. 2017-11-20 08:26:27 +08:00
Stephen Gowen
5bba269f13 Changing RTTI to SPINE_RTTI and RTTI.h/cpp to SpineRTTI.h/cpp 2017-11-19 19:01:30 -05:00
Stephen Gowen
44194018ad Merge branch 'EsotericSoftware/3.6' into 3.6 2017-11-17 10:00:41 -05:00
badlogic
08451f2a8d [ts][webgl] Exposing the renderers in SceneRenderer. 2017-11-17 15:40:39 +01:00
badlogic
246c5310d4 [ts][webgl] SceneRenderer method to draw textures with manually set UVs. 2017-11-17 14:39:53 +01:00
badlogic
99b975f405 Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-11-17 10:57:49 +01:00
badlogic
49137a58ea [ts] Added AssetManager.loadTextureAtlas. Will automatically resolve and load any images the atlas references. AssetManager.get(atlasName) will then return an instance of spine.TextureAtlas. 2017-11-17 10:57:44 +01:00
Stephen Gowen
c4b7df2c2c The power of commenting stuff out! 2017-11-16 14:02:39 -05:00
Stephen Gowen
949eb15944 wip 2017-11-15 19:07:09 -05:00
Stephen Gowen
0b6c8411b7 wip 2017-11-14 20:15:56 -05:00
Stephen Gowen
bfbb48c1c2 Adding Pool class to be used inside the Triangulator 2017-11-13 17:55:36 -05:00
Stephen Gowen
cd8d950117 Fixing some mistakes in HashMap 2017-11-13 17:02:15 -05:00
Stephen Gowen
1b850a207f Merge branch 'EsotericSoftware/3.6' into 3.6 2017-11-13 16:07:43 -05:00
Stephen Gowen
9c1f7ff9bf Fixing a flaw I found in Vector copy constructor
_buffer wasn’t being initialized if the incoming vector had a zero size
2017-11-13 16:07:42 -05:00
John
54c20904fd
[unity] Fix editor Drag-and-Drop tooltip. 2017-11-14 04:37:56 +08:00
Stephen Gowen
0474b5db5c Merge branch 'EsotericSoftware/3.6' into 3.6 2017-11-13 08:47:41 -05:00
badlogic
adb11a221a Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-11-13 14:06:18 +01:00
badlogic
fe26844e3e [ue4] Forgot to commit new queue control functions. Closes #1038 2017-11-13 14:06:11 +01:00
Stephen Gowen
d80a00ead6 wip 2017-11-12 17:27:09 -05:00
Stephen Gowen
a48f650f03 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-11-12 11:21:26 -05:00
Stephen Gowen
175365a039 wip 2017-11-12 11:21:25 -05:00
badlogic
4850cb7a05 Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-11-10 11:27:30 +01:00
badlogic
843159b6c3 [cocos2dx] Updated Android.mk. Closes #1036 2017-11-10 11:27:23 +01:00
badlogic
33a00182ff [ue4] Need to temporarily disable queue draining of animation state when setting or adding new animations. Closes #1037 2017-11-10 11:13:33 +01:00
Stephen Gowen
2a00853fe2 Forgot some cpp flags
-fno-exceptions -fno-rtti
2017-11-09 12:19:03 -05:00
Stephen Gowen
7983a6e743 Adding CMakeLists.txt and fixing some compiler warnings 2017-11-09 12:01:17 -05:00
Stephen Gowen
e91a12cff1 wip 2017-11-09 11:04:29 -05:00
Stephen Gowen
c20f4a5c79 Forgot to add #include <stdlib.h> 2017-11-08 17:20:30 -05:00
Stephen Gowen
818d580531 Whoops, apparently I do not know how to use swap 2017-11-07 17:01:54 -05:00
Stephen Gowen
a3172ec584 Use swap instead of move (std::move was introduced in C++11) 2017-11-07 16:08:16 -05:00
Stephen Gowen
7c2b6b8271 wip 2017-11-06 16:54:39 -05:00
Stephen Gowen
04e0556c4e Removing section of HashMap that didn't seem to work at all... 2017-11-06 11:47:08 -05:00
Stephen Gowen
51f3306a72 Temporarily commenting out some sections so I can build 2017-11-02 13:41:56 -04:00
Stephen Gowen
ac0302d09c Merge branch 'EsotericSoftware/3.6' into 3.6 2017-11-02 11:55:46 -04:00
badlogic
361378b275 [c] Error in color parsing, off-by-one resulting in invalid memory access. Closes #1031. Thanks @minggo for the adress sanitizer hint. 2017-11-02 11:20:57 +01:00
badlogic
095fe71ff8 [cocos2dx] Updated to cocos2d-x 3.16. 2017-11-02 10:51:26 +01:00
Stephen Gowen
5619d05536 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-31 13:38:30 -04:00
John
06a18da27b
[unity] Fix Repacking caching. 2017-10-31 21:07:09 +08:00
Stephen Gowen
0e78d1d074 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-30 09:59:57 -04:00
badlogic
e6c2b75101 [ts] More test refactoring. 2017-10-30 14:12:03 +01:00
badlogic
470ae4a1f3 [ts] More test refactoring. 2017-10-30 14:09:56 +01:00
badlogic
de3acaf084 [ts] reworked example/tests 2017-10-30 14:06:41 +01:00
badlogic
ed24d3b33f [ue4] Updated to 4.18, fixed compilation error in RuntimeMEshComponentDetails.cpp, kept compatibility with older versions. 2017-10-30 10:11:07 +01:00