badlogic
6cf1d1fb30
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-11-28 16:27:44 +01:00
badlogic
7175cf98e7
[c][cpp] Closes #1213 , don't trim end of atlas file line.
2018-11-27 12:24:15 +01:00
badlogic
7ac4a3add8
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-11-06 18:44:33 +01:00
badlogic
f7a6b81f0f
Fixes #1200 , spColor_setFromFloats clamps the values now.
2018-11-06 18:43:48 +01:00
badlogic
2962d038ea
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-10-30 17:11:37 +01:00
badlogic
e4ab2c63f3
[c][cpp][csharp][lua][ts][as3] worldToLocalRotation and localToWorldRotation take shear into account. Fixes #1199 .
2018-10-30 17:11:23 +01:00
badlogic
b1f9d062a5
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-10-30 17:00:29 +01:00
badlogic
11e24df981
[c][cpp] Ported new fix for 0 timeScale not returning to setup pose. See #1194 .
2018-10-30 16:56:10 +01:00
badlogic
f825a1a0ae
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-10-26 17:44:33 +02:00
badlogic
3dd56a5a4f
[c][cpp] Port of fix for tangents at position 0 in PathConstraint. See #1198 .
2018-10-26 17:43:24 +02:00
badlogic
e91d4eeff4
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-10-16 15:44:11 +02:00
badlogic
a5023f521c
[c] IKCONSTRAINT_ENTRIES was incorrect. Closes #1197 .
2018-10-16 15:43:56 +02:00
badlogic
53d15a47a1
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-10-15 16:52:57 +02:00
badlogic
18258e9603
[c] Ported 0 timeScale fix, see #1194 .
2018-10-15 16:42:22 +02:00
badlogic
d6c047359d
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-09-11 15:41:29 +02:00
badlogic
0ff14743f5
[c] Ported holdPrevious in AnimationState. See #1169 .
2018-09-11 14:49:23 +02:00
badlogic
7c398be3b6
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-09-06 16:01:12 +02:00
badlogic
7e1a0c172d
[c] Added event volume and balance, see #1171 .
2018-09-06 15:05:13 +02:00
badlogic
dce7731855
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-09-05 15:31:42 +02:00
badlogic
1d3d425028
[cpp] Fixed parsing of points in skin. See #1168 .
...
[c] Fixed c unit tests.
2018-09-05 15:31:28 +02:00
badlogic
642687f882
Merge branch '3.6' into 3.7-beta
2018-09-05 15:24:31 +02:00
badlogic
3a1aedc035
[c] Json parser was missing parsing of points in skins. See #1168
2018-09-05 15:22:08 +02:00
badlogic
f5cc2933be
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-08-24 11:37:12 +02:00
badlogic
66236adea5
[c][cpp] Ported addition of uniform/compressed IK and rotation fix.
2018-08-23 16:30:16 +02:00
badlogic
e724231c5f
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-08-14 15:09:15 +02:00
badlogic
a506047242
[c] Ported stretchy IK, fixed warnings.
2018-08-14 15:05:40 +02:00
badlogic
253bda4ee4
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-08-10 11:54:49 +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
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
6515b5dcfd
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-07-24 13:06:30 +02:00
badlogic
5aab588928
[c][cpp] Ported flipX/flipY -> scaleX/scaleY change. See #1142 .
2018-07-23 15:16:21 +02:00
badlogic
908495819c
Merge branch '3.7-beta' into 3.7-beta-cpp
2018-07-19 16:54:20 +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
ca6a6fc930
Updated all READMEs.
2018-06-08 14:18:51 +02:00
badlogic
681584056b
[runtimes] Back ported fix for #1119 to 3.6.
2018-06-08 13:40:38 +02:00
badlogic
ff3cc660ca
Merge branch '3.7-beta' into 3.7-beta-ue4-cpp
2018-06-07 17:32:01 +02:00
badlogic
2726229071
[c][cpp] Ported fix for #1119
2018-06-07 16:54:32 +02:00
badlogic
4359a9e39f
Merge branch '3.7-beta' into 3.7-beta-ue4-cpp
2018-06-07 16:48:25 +02:00
badlogic
cd198815e5
Merge branch '3.6' into 3.7-beta
2018-06-07 16:47:50 +02:00
Ievgen Mukhin
cab8127626
[c] Optimized attachment lookup in skin. See #1117 . ( #1118 )
...
* [c] Optimized attachment lookup in skin. See #1117 .
* [c] Optimized attachment lookup in skin. See #1117 . Changes according to suggestions in PR #1118 .
2018-06-07 16:43:41 +02:00
badlogic
162ce9f5aa
Fixed meshes.
2018-05-30 18:31:36 +02:00
badlogic
89f116ae82
Final MSVC touches.
2018-05-24 17:26:37 +02:00
badlogic
265b18571c
Fixed all warnings on MSVC, fixed up usage of int instead of size_t, fixed some signatures.
2018-05-24 15:30:58 +02:00
badlogic
b7ae63f743
Fixed crashes on MSVC.
2018-05-24 14:31:26 +02:00
badlogic
eb69071a0a
Merge branch '3.6' into 3.7-beta
2018-05-16 11:46:01 +02:00
badlogic
1833f4211a
[c] Fixes completion event firing for 0 duration animations. See #1112 .
2018-05-16 11:40:30 +02:00