halx99
|
21185a1fc3
|
fix
|
2020-10-16 18:46:13 +08:00 |
|
halx99
|
5bacfcd733
|
SkeletonTwoColorBatch also support custom program
|
2020-10-16 18:42:45 +08:00 |
|
halx99
|
84b0af8ac5
|
Fix custom program state not applied at cocos2d-x-4.0
|
2020-10-16 17:48:30 +08:00 |
|
Nathan Sweet
|
98a6c8f696
|
Exported examples with export.sh 4.0.05-beta and ran runtimes.sh.
|
2020-10-10 16:22:40 -07:00 |
|
badlogic
|
706a68761c
|
Merge branch '3.8' into 4.0-beta
|
2020-08-26 16:20:59 +02:00 |
|
badlogic
|
4927c2be63
|
[cocos2dx] Closes #1710, MALLOC is not available in cocos2dx 3.x.
|
2020-08-26 16:20:46 +02:00 |
|
badlogic
|
9f1ce2853b
|
Merge branch '3.8' into 4.0-beta
|
2020-08-26 16:16:49 +02:00 |
|
badlogic
|
1cc50fd09e
|
[cocos2dx] Closes #1734, simplify file I/O.
|
2020-08-26 16:16:36 +02:00 |
|
badlogic
|
585a6f0e39
|
Merge branch '3.8' into 4.0-beta
|
2020-08-26 16:14:59 +02:00 |
|
badlogic
|
0a42f4fe28
|
[cocos2dx] Closes #1733, missing JS bindings.
|
2020-08-26 16:14:48 +02:00 |
|
Nathan Sweet
|
896e6a419c
|
Merge branch '3.8' into 4.0-beta
|
2020-08-10 23:56:47 +02:00 |
|
Nathan Sweet
|
33e2aea7ff
|
Merge branch '3.8' into 4.0-beta
|
2020-08-10 23:53:10 +02:00 |
|
Nathan Sweet
|
13b3b2e011
|
Formatting.
|
2020-08-10 23:47:50 +02:00 |
|
Harald Csaszar
|
46a0ffce50
|
[cocos2d-x] Added early out check for MeshAttachment alpha == 0. Related to commit 254baf4. See #1708.
|
2020-06-22 16:48:14 +02:00 |
|
Harald Csaszar
|
254baf4d75
|
[cocos2d-x] Fixed broken mesh indices when RegionAttachment alpha == 0. Closes #1708.
|
2020-06-22 14:44:40 +02:00 |
|
badlogic
|
dd77657755
|
Merge branch '3.8' into 3.9-beta
|
2020-04-20 15:52:17 +02:00 |
|
badlogic
|
049adf7e2b
|
[cocos2dx] Apply node Z to debug node. Closes #1655.
|
2020-04-20 15:51:57 +02:00 |
|
Mario Zechner
|
29146937fd
|
Merge branch '3.8' into 3.9-beta
|
2020-02-03 15:53:07 +01:00 |
|
Mario Zechner
|
90c2a19364
|
[cocos2dx] Updated windows build for cocos2d-x v4.
|
2020-02-03 15:52:50 +01:00 |
|
badlogic
|
0dd2db2627
|
[cocos2dx] Improve CMake build for cocos2d-x v3 and v4 example projects, based on PR #1572.
|
2020-02-03 14:57:29 +01:00 |
|
badlogic
|
a0f33bb0c0
|
Merge branch '3.8' into 3.9-beta
|
2020-02-03 14:43:36 +01:00 |
|
badlogic
|
acee8d0bd4
|
[cocos2dx] Disable BUILD_EDITOR_SPINE in example project, so our sources in tree get used.
|
2020-02-03 14:43:19 +01:00 |
|
badlogic
|
934bec56b7
|
Merge branch '3.8' into 3.9-beta
|
2019-12-20 12:27:35 +01:00 |
|
badlogic
|
b67bf992a0
|
Single bone IK fix and license header update. Closes #1580, closes #1581.
|
2019-12-20 12:20:46 +01:00 |
|
Arnold
|
8c8b08f80b
|
[bugfix] spine-cocos2dx renderer issues (#1577)
* fix some bugs
* auto release program
|
2019-12-18 09:19:58 +01:00 |
|
badlogic
|
ae62a01d4d
|
Merge branch '3.8' into 3.9-beta
|
2019-12-12 16:27:34 +01:00 |
|
badlogic
|
1daedd3f1c
|
[cocos2dx] Disable cocos2d spine editor support for our example project.
|
2019-12-12 16:27:20 +01:00 |
|
badlogic
|
944b656517
|
Merge branch '3.8' of https://github.com/esotericsoftware/spine-runtimes into 3.8
|
2019-12-12 16:08:54 +01:00 |
|
badlogic
|
47db7878fc
|
[cocos2dx] Fix macOS target configuration.
|
2019-12-12 16:08:48 +01:00 |
|
badlogic
|
79fae539bf
|
Merge branch '3.8' into 3.9-beta
|
2019-12-12 15:56:51 +01:00 |
|
badlogic
|
9f0a361df0
|
[cocos2dx] Updated Windows build instructions.
|
2019-12-12 15:56:05 +01:00 |
|
badlogic
|
7f58a2f5da
|
[cocos2dx] Fix VS solution and instructions.
|
2019-12-12 15:12:11 +01:00 |
|
badlogic
|
63be983014
|
[cocos2dx] Updated instructions for running the example for cocos2dx v3 on Windows.
|
2019-12-12 14:51:05 +01:00 |
|
badlogic
|
ebe44b0e13
|
Merge branch '3.8' into 3.9-beta
|
2019-12-12 14:41:18 +01:00 |
|
badlogic
|
9974fec421
|
[cocos2dx] Need to duplicate assets in the example-v4 folder as the Android build doesn't like relative directories outside the root folder. Fixed linking for Android.
|
2019-12-12 14:35:55 +01:00 |
|
badlogic
|
8391097947
|
[cocos2dx] Don't cull if no visiting camera is set. Closes #1566.
|
2019-12-10 16:12:32 +01:00 |
|
badlogic
|
75da2e3d94
|
[cocos2dx] Fix for iOS. Updated README.md partially.
|
2019-12-10 15:48:24 +01:00 |
|
badlogic
|
cd77aa908a
|
[cocos2dx] spine-cocos2dx sources are build as a separate static library as part of the example for v4.
|
2019-12-10 15:16:27 +01:00 |
|
badlogic
|
9ab8c3817b
|
[cocos2dx] Merged SkeletonRenderer code for v3 and v4. Only the batchers remain in separate source files.
|
2019-12-10 15:00:32 +01:00 |
|
badlogic
|
d8f94bc18a
|
[cocos2dx] Unified SkeletonRenderer.h
|
2019-12-10 13:38:20 +01:00 |
|
badlogic
|
d950c32ba2
|
[cocos2dx] Unify SkeletonRenderer interface.
|
2019-12-10 13:38:01 +01:00 |
|
badlogic
|
bf14723dcc
|
[cocos2dx] Initial cocos2dx v4 support. Need to fix formatting, ensure v3 and v4 work on all supported platforms, unify headers where possible and minimize code duplication.
|
2019-12-10 13:30:06 +01:00 |
|
badlogic
|
c90ca1b08c
|
Merge branch '3.8' into 3.9-beta
|
2019-11-19 16:36:36 +01:00 |
|
badlogic
|
41cfd38049
|
[cpp][cocos2dx] Skin and attachment setters now handle empty strings correctly. Closes #1543.
|
2019-11-19 16:36:25 +01:00 |
|
badlogic
|
151cf5143b
|
Merge branch '3.8' into 3.9-beta
|
2019-10-28 15:35:07 +01:00 |
|
badlogic
|
015de8ed4c
|
[cocos2d-objc] Added IK example. Also added SkeletonAnimation preUpdateWorldTransformListener and postUpdateWorldTransformsListener which allow modifying a skeleton pre- and post-calculation of the world transformations. See #1532.
|
2019-10-28 15:34:53 +01:00 |
|
badlogic
|
2e5560ca0f
|
Merge branch '3.8' into 3.9-beta
|
2019-10-28 14:09:38 +01:00 |
|
badlogic
|
656b08a32e
|
[cocos2dx] Added IK example, see #1532. Also added SkeletonAnimation::setPreUpdateWorldTransformsListener() and SkeletonAnimation::setPostUpdateWorldTransformsListener().
|
2019-10-28 14:07:25 +01:00 |
|
badlogic
|
2bc4181fe0
|
Merge branch '3.8' into 3.9-beta
|
2019-09-23 16:43:30 +02:00 |
|
badlogic
|
5cb9afd2fa
|
[cocos2dx] Reimplemented culling. Works with both 2D and 3D projections, and possibly custom projections as well. Closes #1445.
|
2019-09-23 16:43:19 +02:00 |
|