UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 09:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,907 Commits 17 Branches 33 Tags
Commit Graph

478 Commits

Author SHA1 Message Date
badlogic
9971d1ed0b Merge branch '4.1' into 4.2-beta 2022-11-08 15:37:54 +01:00
badlogic
f3247caee3 [cocos2dx] Explicitely link to spine-cpp, closes #2189 2022-11-08 15:37:41 +01:00
Mario Zechner
8a2e25ba05 Merge branch '4.1' into 4.2-beta 2022-10-03 14:56:12 +02:00
Mario Zechner
09f1e0c95c [cpp] Fix formatting. 2022-10-03 14:56:04 +02:00
Mario Zechner
1c6de8ff47 [cocos2dx] Fix merged code. 2022-10-03 14:55:08 +02:00
Mario Zechner
63d3971ffe Merge branch '4.1' into 4.2-beta 
# Conflicts:
#	spine-cocos2dx/spine-cocos2dx/src/spine/spine-cocos2dx.cpp
 2022-10-03 14:51:30 +02:00
Mario Zechner
927fd637f0 [cocos2dx] Rework way meshes are generated to fix crash when attachment sources region from a sequence. Closes #2166. 2022-10-03 14:50:25 +02:00
Mario Zechner
c590944a51 Merge branch '4.1' into 4.2-beta 
# Conflicts:
#	spine-cocos2dx/README.md
#	spine-godot/spine_godot/SpineSprite.cpp
#	spine-sdl/src/spine-sdl-cpp.cpp
#	spine-sfml/cpp/src/spine/spine-sfml.cpp
 2022-09-15 08:39:43 +02:00
Mario Zechner
d890eed2dc [cocos2dx] Update README.md for M1. 2022-09-15 08:32:44 +02:00
Mario Zechner
1a676c14fc [cpp][cocos2dx][sfml][sdl] Fix up runtimes according to renderer object system changes. 2022-09-09 10:40:34 +02:00
Mario Zechner
4bba3f1822 Merge branch '4.0' into 4.1 2022-07-18 14:10:10 +02:00
一线灵
e964de68df
[cocos2d-x] Use backend shader definations (#2104) 2022-07-11 10:00:23 +02:00
Mario Zechner
771c526915 Formatting pass. 2022-05-31 12:26:05 +02:00
Mario Zechner
ee1c698197 [cocos2dx] Removed VertexEffect, see #2076 2022-05-30 14:30:36 +02:00
badlogic
3f6bdb5b01 [cocos2dx] Update instructions for Windows example build. 2022-03-26 01:46:17 +01:00
Mario Zechner
06df4554a6 [cocos2dx] Fix Android example project, update README.md 2022-03-26 01:12:36 +01:00
Mario Zechner
7617c30eda [cocos2dx] Fix CMake iOS build. 2022-03-25 23:08:16 +01:00
Mario Zechner
a963642e47 [cocos2dx] Unify example to single project for both cocos2d-x v3 and v4 2022-03-25 21:57:30 +01:00
Mario Zechner
685e7a193c [cocos2dx] Fix Xcode project. 2022-03-25 18:23:50 +01:00
Mario Zechner
1a1b551e8b [runtimes] Re-exported examples with 4.1.23-beta, populated runtime examples. 2022-03-25 13:40:03 +01:00
Mario Zechner
1cbe69d733 Fix formatting. 2022-01-23 22:27:23 +01:00
Mario Zechner
d7bb172c95 Fix fomatting script, apply formatting. 2022-01-20 19:49:10 +01:00
Mario Zechner
c80fd56ce3 Merge branch '4.0' into 4.1-beta 2022-01-19 16:01:27 +01:00
Mario Zechner
c312c373c0 [cocos2dx] Fix culling of clip attachments. See https://github.com/EsotericSoftware/spine-runtimes/pull/2011 2022-01-19 16:01:10 +01:00
Mario Zechner
899a9a80b9 [cocos2dx] Fix renderer compilation errors. 2021-12-22 16:23:08 +01:00
Mario Zechner
e87757ef57 Update version strings to 4.1(.xx) 2021-10-14 00:47:13 +02:00
badlogic
a0f1ed1b9b [runtimes] Fixed and updated example exports with 4.1.04-beta 
- Fixed SkeletonBinary.ts
- Updated dragon example to use sequences
 2021-10-13 17:52:34 +02:00
Nathan Sweet
96a998b82d Spine Runtimes License Agreement update (September 24, 2021). 2021-09-24 18:18:19 -10:00
Mario Zechner
67c0d39eab [runtimes] Fixed owl example project, export and runtime scripts 
The owl example project was not keying the control bone, leading to incorrect additive blending. The export.sh and runtimes.sh script in example/export did not account for the folder structure change in spine-ts.
 2021-09-14 00:02:04 +02:00
aismann
3560eb81a1
Fix 'Debug 64bit' build error on windows (VS2019) (#1946) 
Error (active)	E0075	operand of '*' must be a pointer but has type "bool"
 2021-09-01 14:21:41 +02:00
Mario Zechner
98ec2ab278 [cocos2dx] Fix Xcode project to be compatible with Xcode 12 
Does not fix compilation errors in cocos2dx itself, which we can not fix on our end.
 2021-08-24 16:01:34 +02:00
Nathan Sweet
7d6cdcd9d8 Applied oxipng. 2021-08-04 18:44:16 -04:00
badlogic
7cbb924d9d [cocos2dx] Minor fix-ups. 2021-07-01 11:27:56 +02:00
badlogic
87658c7d31 [c][cpp] Spotless formatter 2021-07-01 10:40:18 +02:00
Mario Zechner
de697385fc [runtimes] Fix up README.md files using correct editor version. 2021-06-14 15:31:17 +02:00
badlogic
653c06a6b8 [cpp] 4.0 port, half done. 2021-03-02 16:54:14 +01:00
badlogic
688d855006 [runtimes] Updated examples with Editor version 4.0.58-beta. 2021-03-01 10:05:26 +01:00
badlogic
81aee82c91 Merge branch '3.8' into 4.0-beta 2020-10-29 15:43:48 +01:00
RH
f06fd410e8
Fix to address issue introduced in PR #1787 where the same ProgramState was being used for each attachment, but would cause problems if the attachments did not use the same texture. (#1801) 2020-10-27 09:34:31 +01:00
badlogic
ee3f088e6c Merge branch '3.8' into 4.0-beta 2020-10-23 11:26:34 +02:00
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