halx99
449a596f3e
Merge: fd2cbdc331
a816a8ac64
...
Merge branch '1.x' into dev
# Conflicts:
# README.md
# README_CN.md
# install-pwsh.sh
# tools/console/axmol
2023-08-31 17:56:09 +08:00
halx99
c2e55c4cdc
Merge console-next from dev into 1.x
2023-08-31 17:48:39 +08:00
Deal
1f2f54f2ac
Axmol console next ( #1313 )
2023-08-30 08:34:33 +08:00
halx99
33bb9c1334
Move cmake/Modules/* to cmake/*
2023-08-28 13:47:24 +08:00
halx99
5183995a36
Merge: f9b6553e57
94be720d3f
...
Merge branch '1.x' into dev
2023-08-25 16:57:54 +08:00
halx99
2bf41d7d31
Fix ci
2023-08-25 16:57:38 +08:00
halx99
46f668b01b
Remove render backend setLineWidth [skip ci]
...
Due to not all of GL and Metal support it, so remove it unify behavior
developers shouldn't relay on it
2023-08-25 16:49:08 +08:00
halx99
f525d6c726
Update docs
2023-08-25 16:46:32 +08:00
halx99
a7011c2bcd
Fix axslc sync
2023-08-21 13:39:56 +08:00
halx99
bfe167121e
Add cmake option AX_GLES_PROFILE
...
Valid value of AX_GLES_PROFILE: 0, 200, 300
By default, the AX_GLES_PROFILE is:
- android: 200, allow axmol apps runs on: API 17 Android 4.2+ devices
- winuwp: 300
- Win32/linux/osx/ios/tvos: 0
For ios/tvos, will forcing AX_GLES_PROFILE to 300 if AX_GLES_PROFILE not 0
2023-08-14 20:40:05 +08:00
Deal
9dc9e9adc7
Update android.yml
2023-08-13 23:58:18 +08:00
halx99
bd0e1fef4b
Fix compile error
2023-08-13 22:09:02 +08:00
Deal
572bb2f700
Test use glad on android
2023-08-13 00:24:35 +08:00
halx99
65ebdafbbe
Update thirdparty libs
...
- llhttp: 8.1.1 --> 9.0.0
- xxhash: 0.8.1 --> 0.8.2
- yaml-cpp: 0.7.0 --> 0.8.0
2023-08-11 18:20:20 +08:00
halx99
cc9cbcbff9
Merge: eba7fc17ba
6bbdc273f8
...
Merge branch 'main' into dev
2023-08-10 18:53:35 +08:00
halx99
46ed10dac3
Update yasio to v4.1.0
2023-08-10 18:36:45 +08:00
halx99
f63932bb91
Update ios GLES to GLES3
2023-08-09 22:25:15 +08:00
halx99
1ec408812f
Fix cmake setup
2023-08-09 14:37:43 +08:00
Deal
969baf94d4
Update CHANGELOG [skip ci]
2023-08-09 13:52:28 +08:00
halx99
60bbd3b1a3
Auto pack axslc into android apk
2023-07-20 01:18:27 +08:00
halx99
1b4c9bbec8
Auto compile app/Sources/shaders to axslc/custom
2023-07-19 23:41:16 +08:00
halx99
7bd3b57809
Improve code style
2023-07-19 21:12:25 +08:00
halx99
04c5505fa2
Fix glDisable state guard
2023-07-19 18:35:05 +08:00
Deal
eae07123dc
Refer to #1278
2023-07-19 09:10:46 +08:00
halx99
1c669912b5
More easy for dev
2023-07-17 20:51:28 +08:00
Deal
071d9aa8ea
Remove gitter [skip ci]
...
It's only bakup IM room, discord is preferred
2023-07-17 12:39:19 +08:00
halx99
3ab3249700
Update glslcc to 1.8.1
...
Add dual outputs support, this is useful to handle normal map preprocessor
2023-07-16 14:14:41 +08:00
RH
95f352e0d0
Invert if condition checking for existence of the axmol bin path in the user path env variable ( #1275 )
...
Make list mutable to allow for inserting new path
2023-07-16 13:51:36 +08:00
halx99
9a384e39f2
Merge: 412e398651
1daf87c768
...
Merge branch 'main' into dev
2023-07-15 22:45:26 +08:00
Deal(涓€绾跨伒)
c5a61124c0
Add chat badges [skip ci]
2023-07-15 11:25:48 +08:00
halx99
2b30d8002f
Merge: 7afdd4f2c1
e5b197776c
...
Merge branch 'main' into dev
2023-07-15 01:17:32 +08:00
halx99
e34d02eb7d
Fix build1k cmake setup
2023-07-15 01:17:15 +08:00
halx99
8e39354e99
Merge: 83a830d011
cfcafd517a
...
Merge branch 'main' into dev
2023-07-15 01:00:31 +08:00
Deal(涓€绾跨伒)
4867fc8f2e
Update pull_request_template.md ( #1270 )
2023-07-15 00:21:23 +08:00
halx99
42fcb1f86e
glslcc workflow: metal init commit
2023-07-14 23:07:47 +08:00
halx99
94b5705bd3
Improve cmake script
...
- glslcc helper function
- Rename ax_add_shader to ax_target_compile_shaders
- Provide argument FILES for specify single or multi shader
source files support, i.e.
ax_target_compile_shaders(target_name FILES 1.frag 1.vert)
- Rename all _AX_ROOT_PATH to _AX_ROOT
2023-07-06 19:21:36 +08:00
halx99
0d5addaf39
Update setup.py to setup.ps1 in cmake [skip ci]
2023-07-06 14:00:21 +08:00
Deal(涓€绾跨伒)
2ff94f287e
Improve ci files ( #1247 )
...
* Improve ci files
* Fixup
* Fix ci
* Update DevSetup.md
* Remove duplicated code
* Fix setup_jdk
* Fix typo
* Check jdk setup
* Update build1k.ps1
* Update build.ps1
* Update build1k.ps1
2023-07-01 08:52:14 +08:00
Deal(涓€绾跨伒)
8a981d7242
Almost pwsh for ci ( #1244 )
2023-06-29 19:46:52 +08:00
CHP
f729bce152
Increment PROP_MIN_SDK_VERSION to 21 ( #1236 )
2023-06-20 20:49:48 +08:00
halx99
359ba3ab8b
Migrate templates includes
2023-06-11 17:42:53 +08:00
Deal(涓€绾跨伒)
bc82034ffd
Improve media-engine for android, linux ( #1228 )
...
* Improve media-engine
- Implement andorid,linux
- Improve local file uri scheme
* Fix ci
* Improve code style
* Improve
* Update VlcMediaEngine.cpp
* Update AvfMediaEngine.h
* Fix ci
* Improve code style
* Enable androidx gradle.properties [skip ci]
* Improve code style
* Remove unnecessary callbacks
* Rename VideoPlayer to MediaPlayer
2023-06-10 22:05:49 +08:00
halx99
fd88e2de3b
Update AGP to 7.4.2, gradle to 8.1
2023-04-20 08:54:24 +08:00
Deal(涓€绾跨伒)
46a21e729b
Building with ninja + official llvm-clang-cl support ( #1159 )
...
* Building with ninja + official llvm-clang-cl support
* Update gh ci for clang
* Fix ci
* Fix ci
* Fix ci
* FIx dll copy [skip ci]
* Fix ci warnings
* Update ci files and readme
* Update badges
2023-04-02 16:04:19 +08:00
aismann
2469c1506e
Fix: error C2360: initialization of 't' is skipped by 'case' label ( #1146 )
...
* Fix: error C2360: initialization of 't' is skipped by 'case' label
case ExampleGameState::update:
/////////////////////////////
// Add your codes below...like....
//
// UpdateJoyStick();
// UpdatePlayer();
// UpdatePhysics();
// ...
int t = 10;
break;
* Update HelloWorldScene.cpp
* Update HelloWorldScene.cpp
2023-03-30 21:41:44 +08:00
halx99
42567d0c98
Update ios splash images [skip ci]
2023-03-21 19:40:55 +08:00
aismann
d58d4198e4
improve cpp template (add more event handler) ( #1118 )
...
* improve cpp template (add more event handler)
* fix C-style pointer casting
2023-03-14 15:25:12 +08:00
halx99
760c59ab6e
[UWP] set VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION for all targets
2023-03-12 17:57:54 +08:00
RH
3f6847ebf0
Set default project in Visual Studio for UWP ( #1111 )
2023-03-12 12:34:51 +08:00
halx99
517ffeedc6
Update project url in sources
2023-03-12 01:44:55 +08:00