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

40014 Commits

Author SHA1 Message Date
halx99 4b69a84292
Merge pull request #504 from adxeproject/freetype-sdf 
Replace SDF implementation with freetype
 2021-09-20 18:24:11 +08:00
halx99 b5e1e78417 Fix lua-cjson assert mismatch 2021-09-20 18:19:18 +08:00
halx99 23b6c1d549 Fix mac build [skip ci] 2021-09-20 18:18:52 +08:00
halx99 53272c6532 Fixup 2021-09-20 17:22:15 +08:00
halx99 e19d542d51 Install linux dep 2021-09-20 17:13:40 +08:00
halx99 8bcbffc5b5
Update before-install.sh 2021-09-20 17:06:01 +08:00
halx99 6181d09298
Update before-install.sh 2021-09-20 16:47:44 +08:00
halx99 dad1d4b4d1
Update pr-ci.yml 2021-09-20 16:18:08 +08:00
halx99 96420b8414
Update linux-ci.yml 2021-09-20 16:17:34 +08:00
halx99 3c916f5875
Update linux-ci.yml 2021-09-20 16:16:41 +08:00
halx99 8b71cf25fe Fixup 2021-09-20 14:49:00 +08:00
halx99 6ebd14f72a Fixup 2021-09-20 12:24:54 +08:00
halx99 5b53f005a5 Replace SDF implementation with freetype 2021-09-20 12:08:37 +08:00
halx99 7abc1e5454
Update CHANGELOG 2021-09-20 10:37:39 +08:00
halx99 352d57773e Refine code 2021-09-18 14:06:52 +08:00
halx99 c48390c1d8 Fix #502, avoid vector iterator damaged when remove child 2021-09-18 11:55:42 +08:00
halx99 1df1924d50
Merge pull request #501 from aismann/patch-10 
Update README.md
 2021-09-17 17:19:49 +08:00
halx99 1bba157267
Merge pull request #500 from aismann/patch-11 
Update README.md
 2021-09-17 16:11:45 +08:00
halx99 226ef68d96
Update pr-ci.yml 2021-09-17 16:10:46 +08:00
halx99 0d1f28cb80
Update pr-ci.yml 2021-09-17 16:09:00 +08:00
aismann 68eb67b9a2
Update README.md 2021-09-17 10:02:36 +02:00
aismann ac1d20ebd1
Update README.md 2021-09-17 10:01:19 +02:00
halx99 c866f5f598
Update README_CN.md 2021-09-14 12:53:22 +08:00
halx99 a35329907f
Update README.md 2021-09-14 12:52:27 +08:00
halx99 15be00be20 Sync commit from pr: 
https://github.com/EsotericSoftware/spine-runtimes/pull/1947
 2021-09-14 11:54:19 +08:00
halx99 8f04c7379c
Merge pull request #499 from aismann/dev 
Update PhysicsTest.cpp  (see the debugdraw bug on the small quader)
 2021-09-08 17:23:42 +08:00
aismann e785d1a5d7 Update PhysicsTest.cpp 2021-09-08 10:16:14 +02:00
halx99 3bdcdfdab8
Merge pull request #496 from aismann/patch-9 
Update README.md (link to third party lib for Live2D)
 2021-09-07 19:03:58 +08:00
aismann b59ffe6585
Update README.md 2021-09-07 12:35:58 +02:00
halx99 f1cdfdca52 Merge empty project 
a. Remove cpp-empty-test, use HelloCpp as starter
b. Remove lua-empty-test, use HelloLua as starter
 2021-09-07 17:24:07 +08:00
halx99 745cc2c0b0 Sync yasio 2021-09-05 22:19:19 +08:00
halx99 14a295af52 Add HttpClient::getInternalService 2021-09-05 22:18:42 +08:00
halx99 14b08f77cc
Merge pull request #495 from wzhengsen/dev 
[fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout.
 2021-09-05 21:17:11 +08:00
榆柳松 ac1aa636ac Merge remote-tracking branch 'upstream/dev' into dev 2021-09-05 20:45:32 +08:00
榆柳松 f5663f279c [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00
halx99 7c1b068396 Sync yasio 2021-09-04 19:25:17 +08:00
halx99 d73d937894 Fix #493, sync uri parse unit test 2021-09-04 00:22:47 +08:00
halx99 bc6ad50a4f Fix #492 for win64 require larger stack for cpp-tests: 41 2021-09-03 20:37:34 +08:00
halx99 7cc2d34398 LayerMultiplex use Node* to store layers 
a. Layer no specificed functions
 2021-09-03 11:13:15 +08:00
halx99 210999f9e7 Update some copyright notice 2021-09-03 10:59:08 +08:00
halx99 e11f489750 Fix #491 2021-09-03 10:49:44 +08:00
halx99 1401e61702
Merge pull request #488 from rh101/long-changes 
Usage of long and unsigned long changed to platform independent fixed-sized types where appropriate.
 2021-09-02 23:12:25 +08:00
rh101 ea4b212d1f Use %d for int32_t 2021-09-02 22:45:59 +10:00
rh101 ab2aa26242 Change %lu to %u 2021-09-02 22:43:10 +10:00
rh101 69d6039306 Update lua bindings 2021-09-02 21:24:45 +10:00
rh101 bc0a5f42f8 Windows callback requires `long` return type 2021-09-02 21:21:28 +10:00
rh101 456d26628c Change off_t to int64_t 2021-09-02 21:18:23 +10:00
rh101 9cfc16ee38 Support 64 bit versions of posix lseek 2021-09-02 20:43:37 +10:00
rh101 568e3612bd Remove getLong() method 
Change %du to %u, and %lx to %x
Use "stdint.h" instead of <cstdint> for TGAlib.h
 2021-09-02 20:30:20 +10:00
halx99 96e83c9cf6
Merge pull request #490 from wzhengsen/dev 
[fix]The problem of inaccurate maximum width limit when using system fonts.
 2021-09-02 17:48:42 +08:00