Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,468 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

34 Commits

Author SHA1 Message Date
halx99 fb980f51ab Sync commit from pr: 
https://github.com/EsotericSoftware/spine-runtimes/pull/1947
 2021-09-14 11:54:19 +08:00
halx99 97fbec0b36 Merge: 95b9969365 80e0e3b941 
Merge pull request #485 from adxeproject/fix-spine-uniform-location-mismatch

Fix spine command pipeline state uniform location mismatch
 2021-08-30 18:57:36 +08:00
halx99 32b86c53c9 Update changelog 2021-08-30 17:55:00 +08:00
halx99 1a7d23eff5 Fix spine command pipeline state uniform location mismatch 2021-08-30 17:40:35 +08:00
aismann 74dfe14b16 Merge: 1c05947474 7dd7422abd 
Merge branch 'adxeproject:dev' into dev
 2021-08-27 08:33:22 +02:00
halx99 fc1c901209 Macro compatible 2021-08-27 13:54:05 +08:00
aismann 6632c5c3f6 Debug 64bit build error 
Severity        Code    Description     Project File    Line    Suppression State
Error (active)  E0075   operand of '*' must be a pointer but has type "bool"    cpp-tests       D:\______\GitHub\adxe\tests\cpp-tests\Classes\SpineTest\SpineTest.cpp   153
 2021-08-27 07:47:22 +02:00
halx99 5254edc733 Update spine-3.8 runtime to latest 
Maybe no further update until upgrade to spine-4.x
 2021-08-07 00:59:58 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
RH 0e2247a2d9 Merge: d1027ab263 ce6117fa65 
Merge pull request #7 from c4games/master

Sync with primary
 2021-04-26 10:32:25 +10:00
rh101 e6990d0b36 Remove unnecessary method call to close FileStream 2021-04-26 08:55:07 +10:00
halx99 be9bd61131 Fix tool script cocos 2021-04-25 09:22:07 -07:00
rh101 fa4ed8a975 Initialise member variable 2021-04-26 01:05:06 +10:00
halx99 87be236932 Merge: 8b8b015b02 b1da56d401 
Merge pull request #343 from rh101/curl-fix-filestream

Fix for downloader crash due to uninitialised variables
 2021-04-25 18:34:29 +08:00
rh101 5509d0f80d Update usage of createDownloadFileTask 2021-04-25 18:36:20 +10:00
RH c8c4c2d703 Merge: 6fbebe9617 8b8b015b02 
Merge pull request #6 from c4games/master

Sync with primary
 2021-04-25 18:14:50 +10:00
rh101 c26a5e7bd8 Ensure FileStream is used for file access where possible 2021-04-25 17:22:43 +10:00
halx99 964e515f48 Merge: 2a1459b27b 3d8884721f 
Merge pull request #341 from rh101/vfs-support

Add support for FileStream in ZipUtils and ZipFile
 2021-04-25 14:21:19 +08:00
rh101 cce67f688e Add support for FileStream in ZipUtils and ZipFile 2021-04-25 02:39:47 +10:00
halx99 c40b803244 Update spine runtimes 2021-04-24 18:14:30 +08:00
halx99 ba783a7b1f Update extension spine README.md 2020-11-04 23:28:51 +08:00
halx99 7d71da30c0 Tidy extension spine folder structure [ci build] 2020-11-04 23:17:05 +08:00
halx99 865c1e22ac Sync https://github.com/EsotericSoftware/spine-runtimes/pull/1801 2020-10-27 17:08:26 +08:00
halx99 83bec7092e Remove unused comment 2020-10-22 21:32:09 +08:00
halx99 82c864f2ed fix #234, spine custom shader doesn't work. 2020-10-17 22:00:53 +08:00
halx99 b9c58a8420 Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 8af53505c1 Merge: 3cf637418f 137ded73a5 
Merge branch 'master' of https://github.com/c4games/engine-x into master
 2020-08-05 18:12:31 +08:00
halx99 4713580381 Update features [skip appveyor] [skip travis] 2020-08-05 18:11:52 +08:00
halx99 ff5ec02d77 Merge: bda1fce2b1 f38f76c1a1 
Merge pull request #145 from halx99/spine-3.8

Sync spine code and resource to 3.8
 2020-08-05 02:38:59 -07:00
halx99 03816cd0c0 fix console output error on win32, see #144 2020-08-05 17:30:30 +08:00
halx99 e8765c88f8 Sync spine code and resource to 3.8 2020-08-05 17:04:57 +08:00
halx99 8b9a6bbbf1 fix android build issues 2020-08-03 20:31:47 +08:00
halx99 1e392c9dfe Refine readme [skip appveyor][skip travis] 2020-08-03 19:12:07 +08:00
halx99 3049b8f751 Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable 2020-08-03 17:51:40 +08:00