3629 Commits

Author SHA1 Message Date
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
Stephen Gowen
87a18e22b8 wip
Almost ready to implement file loading
2017-10-29 20:54:08 -04:00
Stephen Gowen
c3e94bee82 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-29 15:57:13 -04:00
badlogic
3006353c8c [c] Fix handling of SP_MIX_POSE_CURRENT_LAYERED, closes #1028. 2017-10-28 16:23:27 +02:00
badlogic
ed2594deca [csharp] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:44:21 +02:00
badlogic
a8c5282653 [c] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:43:26 +02:00
badlogic
bb23c5e25c [lua] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:41:28 +02:00
badlogic
77c990c75e [as3] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:40:17 +02:00
badlogic
5b410bf2ba [ts] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1013 2017-10-28 09:37:28 +02:00
Nathan Sweet
882f49f5a9 Fix not returning to setup pose when multiple mixing from entries end at same time
#1024
2017-10-28 00:20:33 +02:00
Nathan Sweet
1514b4acbb Removed bad fix for #1024 2017-10-28 00:05:56 +02:00
Stephen Gowen
6916003d13 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-27 14:33:46 -04:00
badlogic
93d34666b0 Fixed typo in README.md 2017-10-27 10:45:29 +02:00
Stephen Gowen
d6215acf17 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-25 16:25:33 -04:00
John
b502aa3c23 [unity] Handle null preview texture in editor. 2017-10-25 20:30:23 +08:00
Stephen Gowen
873b4d397f wip 2017-10-24 20:54:27 -04:00
Stephen Gowen
8ef11955a7 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-24 17:56:29 -04:00
John
7c29b9573a [unity] Fix SkeletonGraphic shader alpha. 2017-10-24 18:29:01 +08:00
Stephen Gowen
10c2ae1514 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-23 12:55:34 -04:00