Commit Graph

74 Commits

Author SHA1 Message Date
halx99 323ed9431b Renaming extension ImGuiEXT to ImGui
The singleton class ImGuiEXT also was renamed to ImGuiPresenter
2022-02-25 19:03:09 +08:00
halx99 58281f4145 Fix linux ci 2022-02-24 19:00:49 +08:00
halx99 13d90b76ee Enable video player test case for windows 2022-02-24 18:30:58 +08:00
halx99 cd98e6c880 Fix #570
a. fix lua build error
b. still use separated link jni libs
2022-01-04 09:40:27 +08:00
halx99 def5f9e2bc Rename core folder name 2021-12-31 14:39:08 +08:00
deal f32280ff42 Merge: 687d15f16e 369de31853
Merge pull request #560 from adxeproject/ahead

Merge ahead to dev
2021-12-31 12:12:40 +08:00
halx99 64d7b55366 Update ci branch name 2021-12-31 11:00:35 +08:00
halx99 8710707a3e Fix android ci 2021-12-29 13:44:39 +08:00
halx99 6e1f8f5953 Optimize cmake scripts 2021-10-12 15:39:37 +08:00
halx99 8d83891f30 Improve lua workflow on windows
a. Use working directory as default resource root on windows
b. Don't copy res and scripts to build binary dir on windows
c. Always build plainlua as dll on windows for fast debug
d. Remove 64bit spec search path for lua script
2021-10-07 18:44:34 +08:00
rh101 c9c003a03f [setup.py] Add download support. Add NuGet CLI download to tools folder.
Download NuGet Microsoft.Web.WebView2 package version 1.0.992.28
Add support for WebView for Windows builds.
2021-10-04 18:55:01 +11:00
姒嗘煶鏉? 35b658c90e Merge: f5663f279c d73d937894
Merge remote-tracking branch 'upstream/dev' into dev
2021-09-05 20:45:32 +08:00
姒嗘煶鏉? 0aff165959 [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00
halx99 a3d51468f7 Fix #492 for win64 require larger stack for cpp-tests: 41 2021-09-03 20:37:34 +08:00
halx99 3905654659 Fix xcode build warnings 2021-08-12 15:54:16 +08:00
halx99 84a84a8931 Merge: 39eb09daad 861c356bb4
Merge pull request #447 from aismann/Box2D_TestBed_improvement

Box2D_TestBed_improvement
2021-08-12 15:34:24 +08:00
aismann d0a18036b5 Update README.md 2021-08-12 07:03:14 +02:00
aismann 24a99d6e27 update CMakeList.txt 2021-08-12 06:02:01 +02:00
halx99 dc3b5292d7 Xcode Embed Frameworks support
refer to: https://gitlab.kitware.com/cmake/cmake/-/issues/22412#note_997156
2021-08-10 11:43:16 +08:00
halx99 48505bc10f Update cmake link 2021-08-10 10:46:11 +08:00
aismann b5d0326e6e Add DebugDraw to Box2DTest, Improve Box2D-Testbed add some new classes to physics-nodes (#444)
* Update AppDelegate.cpp

Add '*Debug*' on the title

* Update CCPhysicsDebugNodeBox2D.h

* Improve Box2D-TestBed

* improvements

* Update CCPhysicsDebugNodeBox2D.cpp

* Improve the 2d physics stuff

* dirty fix for build android:

* Fix fatal error: 'GLFW/glfw3.h' file not found

* Add DebugDraw to  Box2DTest, Improve Box2DTestBed, Add some new physicnodes

* fix settings, unknow  labelDebugDraw;
2021-08-05 17:23:55 +08:00
aismann a46bc403ae Merge pull request #423 from aismann/dev
Enable box2d testbed on linux/macos
2021-07-07 02:29:38 +08:00
aismann 76b5bf8038 Merge pull request #419 from aismann/Box2D-TestBed
* Starting "Box2D - TextBed" adaption (most demos working)

* fix CMakeList.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update Box2dTest.cpp

* Update tests.h

* Update CCPhysicsDebugNodeBox2D.cpp

* Update controller.cpp
2021-07-06 21:02:47 +08:00
halx99 46a3ec8d6b Merge: 2f570e4b64 3c25f74ef1
Merge pull request #420 from halx99/chipmunk-testbed

Chipmunk testbed adapt non-win platform compile issue
2021-07-06 20:46:56 +08:00
halx99 83bc1b77d6 Update CHANGELOG 2021-07-06 19:01:35 +08:00
halx99 d65529ea93 Fix case for linux 2021-07-06 18:46:07 +08:00
halx99 46d9f5cbf5 ChipmunkTestBed non-win platform adapte 2021-07-06 18:40:24 +08:00
halx99 97425dc655 Fix #413 2021-07-04 16:40:34 +08:00
halx99 3436c968e2 Remove yasio test since we implement HttpClient based on it [ci build] 2021-07-02 19:02:38 +08:00
aismann 289f2b0552 Update CMakeLists.txt 2021-06-24 00:21:36 +08:00
halx99 510cf21197 Tidy thirdparty [ci build] 2021-06-24 00:04:29 +08:00
aismann 6a0120644c Update CMakeLists.txt 2021-06-23 17:32:34 +02:00
aismann bd10049c23 Improved Chipmunk2D - TestBed (#381)
* Improved Chipmunk2D - TestBed

* for windows only (at this moment)

* Update CmakeLists.txt

* fix CmakeLists.txt

* some more fixes

* more fixes

* more fixes

* Create ChipmunkDemo.h

* Fix CMakeList.txt; improve Chipmunk TestBed
2021-06-17 14:22:52 +08:00
aismann a8f7a7d7c1 Improve the "Physics part" (#379)
* 1. Add "initial" Chipmunk - TestBed

More demos comes later.

* 2. Removed unused source

* Update CMakeLists.txt

* Some fixes #1

* workaround #1

* workaround #1
2021-06-16 19:34:09 +08:00
halx99 827d384eef Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00
rh101 95cf5b5c2b Merge: 2aa2d69151 b7506fed0c
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
2021-04-23 00:01:47 +10:00
rh101 54ffa13dff Move PosixFileStream class to its own files
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
2021-04-23 00:01:32 +10:00
RH 1e15ed4839 Merge: 2cef9f2e76 844119d162
Merge pull request #3 from c4games/master

Sync with master
2021-04-22 21:48:49 +10:00
rh101 7540c06fd3 Use FileStream to write JPG images to disk 2021-04-22 21:36:26 +10:00
halx99 8ed6d34234 Explicit set cmake minimum version at app/build.gradle [ci build] 2021-04-22 11:40:53 +08:00
rh101 2bf12b2226 Add support for virtual file system via custom FileStream and FileUtils implementations. 2021-04-22 03:15:49 +10:00
halx99 473e51cee7 Set cmake min version to 3.10 [ci build] 2021-04-21 14:05:44 +08:00
Eismann d126affebf Update CMakeLists.txt 2020-11-20 06:38:09 +01:00
Eismann 232fea1442 add Box2D to CMakeList 2020-11-20 06:19:30 +01:00
halx99 db2e468e91 CMake, use file TO_CMAKE_PATH instead string replace [ci build] 2020-11-12 22:47:35 +08:00
halx99 534b2acc39 Lock name 2020-10-24 21:57:36 +08:00
halx99 0830fe9c14 Only needs updateUniformID when set a unstable uniform variable 2020-10-23 15:07:18 +08:00
halx99 cff35a61b8 Set CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET at toolchain file ios.mini.cmake 2020-10-22 17:50:25 +08:00
halx99 253b82c617 Make setup.py works with python3 2020-10-22 16:53:28 +08:00
halx99 b8a0e0a478 Finsih rename 2020-10-22 10:58:10 +08:00