Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'openmultiplayer:master' into recursive-components
Browse files Browse the repository at this point in the history
myudev authored Sep 26, 2024
2 parents af67ffa + 6b222fc commit 4cdd90d
Showing 93 changed files with 281 additions and 16,209 deletions.
36 changes: 6 additions & 30 deletions .github/workflows/update-sdk.yml
Original file line number Diff line number Diff line change
@@ -9,14 +9,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Clone server repository
uses: actions/checkout@v3
with:
clean: true
path: "Server"
submodules: recursive
token: ${{ secrets.CI_TOKEN }}

- name: Clone SDK repository
uses: actions/checkout@v3
with:
@@ -27,30 +19,18 @@ jobs:
submodules: recursive
token: ${{ secrets.CI_TOKEN }}

- name: Update SDK files from server repository
- name: Update SDK files from dev branch
if: always()
shell: bash
run: |
rm -rf ./SDK/include/*
mv -f ./Server/SDK/include ./SDK
cd SDK
git config user.name open.mp
git config user.email open.mp@github.com
git add .
git commit -m "Update SDK" -m "with https://github.com/openmultiplayer/open.mp/commit/${{ github.sha }}" || true
git fetch
git rebase origin/dev
git push || true
update-network:
runs-on: ubuntu-latest
steps:
- name: Clone server repository
uses: actions/checkout@v3
with:
clean: true
path: "Server"
submodules: recursive
token: ${{ secrets.CI_TOKEN }}

- name: Clone Network repository
uses: actions/checkout@v3
with:
@@ -61,15 +41,11 @@ jobs:
submodules: recursive
token: ${{ secrets.CI_TOKEN }}

- name: Update Network files from server repository
- name: Update Network files from dev branch
if: always()
shell: bash
run: |
rm -rf ./Network/*
mv -f ./Server/Shared/Network/* ./Network
cd Network
git config user.name open.mp
git config user.email open.mp@github.com
git add .
git commit -m "Update Network" -m "with https://github.com/openmultiplayer/open.mp/commit/${{ github.sha }}" || true
git fetch
git rebase origin/dev
git push || true
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -302,3 +302,9 @@ conanbuildinfo*.*
conanfile.txt
conaninfo.txt
graph_info.json
cmake_install.cmake
*-config-version.cmake
*-config.cmake
*-targets.cmake
CTestTestfile.cmake
*Config.cmake
14 changes: 10 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -10,9 +10,15 @@
[submodule "lib/ttmath"]
path = lib/ttmath
url = https://github.com/openmultiplayer/ttmath.git
[submodule "SDK/lib/cmake-conan"]
path = SDK/lib/cmake-conan
url = https://github.com/openmultiplayer/cmake-conan.git
[submodule "lib/cpp-httplib"]
path = lib/cpp-httplib
url = https://github.com/ksenonadv/cpp-httplib.git
url = https://github.com/openmultiplayer/cpp-httplib.git
[submodule "lib/cmake-conan"]
path = lib/cmake-conan
url = https://github.com/openmultiplayer/cmake-conan.git
[submodule "SDK"]
path = SDK
url = https://github.com/openmultiplayer/open.mp-sdk
[submodule "Shared/Network"]
path = Shared/Network
url = https://github.com/openmultiplayer/open.mp-network
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.19)
project(open-mp LANGUAGES C CXX VERSION 1.2.0)
project(open-mp LANGUAGES C CXX VERSION 1.3.1)

set_property(GLOBAL PROPERTY USE_FOLDERS ON)

@@ -130,7 +130,7 @@ endfunction()

set(BUILD_SERVER TRUE CACHE BOOL "Whether to build the open.mp server")
set(BUILD_PAWN_COMPONENT TRUE CACHE BOOL "Whether to build the PAWN component")
set(BUILD_UNICODE_COMPONENT TRUE CACHE BOOL "Whether to build the Unicode component")
set(BUILD_UNICODE_COMPONENT FALSE CACHE BOOL "Whether to build the Unicode component")
set(BUILD_LEGACY_COMPONENTS TRUE CACHE BOOL "Whether to build the legacy components")
set(BUILD_TEST_COMPONENTS FALSE CACHE BOOL "Whether to build the test component")
set(BUILD_SQLITE_COMPONENT TRUE CACHE BOOL "Whether to build the SQLite component")
1 change: 1 addition & 0 deletions SDK
Submodule SDK added at 3dc9cf
72 changes: 0 additions & 72 deletions SDK/CMakeLists.txt

This file was deleted.

34 changes: 0 additions & 34 deletions SDK/README.md

This file was deleted.

268 changes: 0 additions & 268 deletions SDK/include/Impl/events_impl.hpp

This file was deleted.

65 changes: 0 additions & 65 deletions SDK/include/Impl/network_impl.hpp

This file was deleted.

690 changes: 0 additions & 690 deletions SDK/include/Impl/pool_impl.hpp

This file was deleted.

76 changes: 0 additions & 76 deletions SDK/include/Server/Components/Actors/actors.hpp

This file was deleted.

71 changes: 0 additions & 71 deletions SDK/include/Server/Components/Checkpoints/checkpoints.hpp

This file was deleted.

60 changes: 0 additions & 60 deletions SDK/include/Server/Components/Classes/classes.hpp

This file was deleted.

81 changes: 0 additions & 81 deletions SDK/include/Server/Components/Console/console.hpp

This file was deleted.

53 changes: 0 additions & 53 deletions SDK/include/Server/Components/CustomModels/custommodels.hpp

This file was deleted.

179 changes: 0 additions & 179 deletions SDK/include/Server/Components/Databases/databases.hpp

This file was deleted.

52 changes: 0 additions & 52 deletions SDK/include/Server/Components/Dialogs/dialogs.hpp

This file was deleted.

47 changes: 0 additions & 47 deletions SDK/include/Server/Components/Fixes/fixes.hpp

This file was deleted.

144 changes: 0 additions & 144 deletions SDK/include/Server/Components/GangZones/gangzones.hpp

This file was deleted.

17 changes: 0 additions & 17 deletions SDK/include/Server/Components/LegacyConfig/legacyconfig.hpp

This file was deleted.

87 changes: 0 additions & 87 deletions SDK/include/Server/Components/Menus/menus.hpp

This file was deleted.

299 changes: 0 additions & 299 deletions SDK/include/Server/Components/Objects/objects.hpp

This file was deleted.

471 changes: 0 additions & 471 deletions SDK/include/Server/Components/Pawn/Impl/pawn_impl.hpp

This file was deleted.

1,366 changes: 0 additions & 1,366 deletions SDK/include/Server/Components/Pawn/Impl/pawn_natives.hpp

This file was deleted.

293 changes: 0 additions & 293 deletions SDK/include/Server/Components/Pawn/pawn.hpp

This file was deleted.

123 changes: 0 additions & 123 deletions SDK/include/Server/Components/Pickups/pickups.hpp

This file was deleted.

29 changes: 0 additions & 29 deletions SDK/include/Server/Components/Recordings/recordings.hpp

This file was deleted.

220 changes: 0 additions & 220 deletions SDK/include/Server/Components/TextDraws/textdraws.hpp

This file was deleted.

111 changes: 0 additions & 111 deletions SDK/include/Server/Components/TextLabels/textlabels.hpp

This file was deleted.

39 changes: 0 additions & 39 deletions SDK/include/Server/Components/Timers/Impl/timers_impl.hpp

This file was deleted.

64 changes: 0 additions & 64 deletions SDK/include/Server/Components/Timers/timers.hpp

This file was deleted.

12 changes: 0 additions & 12 deletions SDK/include/Server/Components/Unicode/unicode.hpp

This file was deleted.

59 changes: 0 additions & 59 deletions SDK/include/Server/Components/Variables/variables.hpp

This file was deleted.

280 changes: 0 additions & 280 deletions SDK/include/Server/Components/Vehicles/Impl/vehicle_models.hpp

This file was deleted.

743 changes: 0 additions & 743 deletions SDK/include/Server/Components/Vehicles/vehicle_colours.hpp

This file was deleted.

472 changes: 0 additions & 472 deletions SDK/include/Server/Components/Vehicles/vehicle_components.hpp

This file was deleted.

285 changes: 0 additions & 285 deletions SDK/include/Server/Components/Vehicles/vehicle_models.hpp

This file was deleted.

235 changes: 0 additions & 235 deletions SDK/include/Server/Components/Vehicles/vehicle_seats.hpp

This file was deleted.

Loading

0 comments on commit 4cdd90d

Please sign in to comment.