Skip to content

Commit d5619dd

Browse files
CauselessCauseless
committed
Merge branch 'development' into zip-save-files
2 parents 44a0d78 + 403fcb4 commit d5619dd

File tree

351 files changed

+53827
-8732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

351 files changed

+53827
-8732
lines changed

‎.github/workflows/meson.yml

Lines changed: 56 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,13 @@ on:
3838
type: string
3939
required: false
4040
default: "release"
41-
debug_level: # "full" | "minimal" | "release"
41+
debug_level: # "full" | "minimal" | "release"
4242
type: string
4343
required: false
4444
default: "release"
4545

46-
env:
47-
MESON_VERSION: "0.60.3"
48-
4946
jobs:
5047
build-linux:
51-
5248
runs-on: ubuntu-latest
5349
name: Linux Build
5450

@@ -60,8 +56,8 @@ jobs:
6056
- name: Install Dependencies
6157
run: |
6258
sudo apt-get update -yq
63-
sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libopengl-dev libfuse2 ninja-build
64-
sudo pip install meson==${{env.MESON_VERSION}}
59+
sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libsdl2-image-dev libopengl-dev libfuse2 ninja-build
60+
sudo pip install meson
6561
6662
- name: Setup Meson
6763
env:
@@ -76,14 +72,14 @@ jobs:
7672
CC: "gcc"
7773
CXX: "g++"
7874
run: meson configure -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
79-
75+
8076
- name: Build
8177
env:
8278
CC: "gcc"
8379
CXX: "g++"
8480
run: |
8581
meson compile -C build
86-
82+
8783
- name: Create AppDir
8884
if: ${{inputs.upload_artefacts}}
8985
run: |
@@ -116,52 +112,90 @@ jobs:
116112
if-no-files-found: error
117113

118114
build-macos:
119-
runs-on: macos-latest
115+
runs-on: macos-11
120116
name: MacOS Build
121-
117+
118+
env:
119+
GCC_VERSION: "13"
120+
MACOSX_DEPLOYMENT_TARGET: 10.15
122121
steps:
123122
- uses: actions/checkout@v3
124123
- uses: actions/setup-python@v3
125124

126125
- name: Install Dependencies
127126
run: |
128-
brew install pkg-config tbb sdl2 minizip lz4 flac luajit [email protected] libpng gcc@12 ninja meson
129-
130-
- name: Build
127+
brew install pkg-config tbb sdl2 minizip lz4 flac luajit [email protected] libpng gcc@${{env.GCC_VERSION}} ninja meson dylibbundler tree
128+
129+
- name: Setup Meson
131130
env:
132-
CC: "gcc-12"
133-
CXX: "g++-12"
131+
CC: "gcc-${{env.GCC_VERSION}}"
132+
CXX: "g++-${{env.GCC_VERSION}}"
134133
LDFLAGS: "-static-libgcc -static-libstdc++"
135134
run: |
136135
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build
136+
137+
- name: Configure for App Bundle
138+
if: ${{inputs.upload_artefacts}}
139+
env:
140+
CC: "gcc-${{env.GCC_VERSION}}"
141+
CXX: "g++-${{env.GCC_VERSION}}"
142+
LDFLAGS: "-static-libgcc -static-libstdc++"
143+
run: |
144+
meson configure \
145+
-Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
146+
--bindir=Contents/MacOS \
147+
--prefix="/" \
148+
build
149+
150+
- name: Build
151+
env:
152+
CC: "gcc-${{env.GCC_VERSION}}"
153+
CXX: "g++-${{env.GCC_VERSION}}"
154+
LDFLAGS: "-static-libgcc -static-libstdc++"
155+
run: |
137156
meson compile -C build
138157
158+
- name: Create App Bundle
159+
if: ${{inputs.upload_artefacts}}
160+
run: |
161+
DESTDIR="/tmp/Cortex Command.app" meson install -C build
162+
163+
- name: Tar files
164+
if: ${{inputs.upload_artefacts}}
165+
run: |
166+
tree /tmp/
167+
cd /tmp/
168+
tar -cvf CortexCommand.tar "Cortex Command.app"
169+
170+
- name: Move artefact
171+
if: ${{inputs.upload_artefacts}}
172+
run: cp /tmp/CortexCommand.tar .
173+
139174
- name: Artifact Deploy
140175
if: ${{inputs.upload_artefacts}}
141176
uses: actions/upload-artifact@v3
142177
with:
143178
name: CortexCommand (macOS)
144179
path: |
145-
build/CortexCommand
146-
build/CortexCommand_debug
180+
CortexCommand.tar
147181
if-no-files-found: error
148182

149183
build-windows:
150184
runs-on: windows-latest
151185
name: Windows Build
152-
186+
153187
steps:
154188
- uses: actions/checkout@v3
155189
- uses: actions/setup-python@v3
156-
190+
157191
- name: Install Dependencies
158192
run: |
159193
pip install meson
160-
194+
161195
- name: Setup
162196
run: |
163197
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} --vsenv build
164-
198+
165199
- name: Build
166200
run: |
167201
meson compile -Cbuild

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
*.APS
99
*.user
1010

11+
/.idea
12+
1113
compile_commands.json
1214
/.ccls-cache
1315

1416
/build*
1517

1618
/enc_temp_folder
1719

20+
/.idea
1821
/_Bin
1922
/NATPunchServer/Server/NATCompleteServer/Debug
2023
/NATPunchServer/Server/NATCompleteServer/Release

‎Activities/ActorEditor.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
// Inclusions of header files
1313

1414
#include "ActorEditor.h"
15+
1516
#include "PresetMan.h"
1617
#include "MovableMan.h"
18+
#include "FrameMan.h"
1719
#include "CameraMan.h"
1820
#include "UInputMan.h"
1921
//#include "AHuman.h"
@@ -91,18 +93,13 @@ int ActorEditor::Create(const ActorEditor &reference)
9193

9294
int ActorEditor::ReadProperty(const std::string_view &propName, Reader &reader)
9395
{
96+
StartPropertyList(return EditorActivity::ReadProperty(propName, reader));
9497
/*
95-
if (propName == "CPUTeam")
96-
reader >> m_CPUTeam;
97-
else if (propName == "Difficulty")
98-
reader >> m_Difficulty;
99-
else if (propName == "DeliveryDelay")
100-
reader >> m_DeliveryDelay;
101-
else
98+
MatchProperty("CPUTeam", { reader >> m_CPUTeam; });
99+
MatchProperty("Difficulty", { reader >> m_Difficulty; });
100+
MatchProperty("DeliveryDelay", { reader >> m_DeliveryDelay; });
102101
*/
103-
return EditorActivity::ReadProperty(propName, reader);
104-
105-
return 0;
102+
EndPropertyList;
106103
}
107104

108105

@@ -224,7 +221,7 @@ void ActorEditor::Update()
224221
if (m_pEditedActor)
225222
{
226223
m_pEditedActor->SetPos(g_SceneMan.GetSceneDim() * 0.5);
227-
m_pEditedActor->Update();
224+
m_pEditedActor->FullUpdate();
228225
g_CameraMan.SetScrollTarget(m_pEditedActor->GetPos());
229226
}
230227

@@ -324,6 +321,9 @@ bool ActorEditor::LoadActor(const Entity *pActorToLoad)
324321
return false;
325322

326323
// Replace the old one
324+
if (MovableObject* asMo = dynamic_cast<MovableObject*>(m_pEditedActor)) {
325+
asMo->DestroyScriptState();
326+
}
327327
delete m_pEditedActor;
328328
// Make a copy of the picked object reference
329329
m_pEditedActor = dynamic_cast<Actor *>(pActorToLoad->Clone());

‎Activities/AreaEditor.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "WindowMan.h"
1717
#include "PresetMan.h"
1818
#include "MovableMan.h"
19+
#include "FrameMan.h"
1920
#include "UInputMan.h"
2021
#include "SettingsMan.h"
2122
#include "SLTerrain.h"
@@ -98,18 +99,13 @@ int AreaEditor::Create(const AreaEditor &reference)
9899

99100
int AreaEditor::ReadProperty(const std::string_view &propName, Reader &reader)
100101
{
102+
StartPropertyList(return EditorActivity::ReadProperty(propName, reader));
101103
/*
102-
if (propName == "CPUTeam")
103-
reader >> m_CPUTeam;
104-
else if (propName == "Difficulty")
105-
reader >> m_Difficulty;
106-
else if (propName == "DeliveryDelay")
107-
reader >> m_DeliveryDelay;
108-
else
104+
MatchProperty("CPUTeam", { reader >> m_CPUTeam; });
105+
MatchProperty("Difficulty", { reader >> m_Difficulty; });
106+
MatchProperty("DeliveryDelay", { reader >> m_DeliveryDelay; });
109107
*/
110-
return EditorActivity::ReadProperty(propName, reader);
111-
112-
return 0;
108+
EndPropertyList;
113109
}
114110

115111

‎Activities/AssemblyEditor.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "WindowMan.h"
1717
#include "PresetMan.h"
1818
#include "MovableMan.h"
19+
#include "FrameMan.h"
1920
#include "UInputMan.h"
2021
#include "SettingsMan.h"
2122
#include "SLTerrain.h"
@@ -98,18 +99,13 @@ int AssemblyEditor::Create(const AssemblyEditor &reference)
9899

99100
int AssemblyEditor::ReadProperty(const std::string_view &propName, Reader &reader)
100101
{
102+
StartPropertyList(return EditorActivity::ReadProperty(propName, reader));
101103
/*
102-
if (propName == "CPUTeam")
103-
reader >> m_CPUTeam;
104-
else if (propName == "Difficulty")
105-
reader >> m_Difficulty;
106-
else if (propName == "DeliveryDelay")
107-
reader >> m_DeliveryDelay;
108-
else
104+
MatchProperty("CPUTeam", { reader >> m_CPUTeam; });
105+
MatchProperty("Difficulty", { reader >> m_Difficulty; });
106+
MatchProperty("DeliveryDelay", { reader >> m_DeliveryDelay; });
109107
*/
110-
return EditorActivity::ReadProperty(propName, reader);
111-
112-
return 0;
108+
EndPropertyList;
113109
}
114110

115111

‎Activities/BaseEditor.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "CameraMan.h"
1717
#include "PresetMan.h"
1818
#include "MovableMan.h"
19+
#include "FrameMan.h"
1920
#include "UInputMan.h"
2021
#include "SceneMan.h"
2122
#include "MetaMan.h"
@@ -92,18 +93,13 @@ int BaseEditor::Create(const BaseEditor &reference)
9293

9394
int BaseEditor::ReadProperty(const std::string_view &propName, Reader &reader)
9495
{
96+
StartPropertyList(return Activity::ReadProperty(propName, reader));
9597
/*
96-
if (propName == "CPUTeam")
97-
reader >> m_CPUTeam;
98-
else if (propName == "Difficulty")
99-
reader >> m_Difficulty;
100-
else if (propName == "DeliveryDelay")
101-
reader >> m_DeliveryDelay;
102-
else
98+
MatchProperty("CPUTeam", { reader >> m_CPUTeam; });
99+
MatchProperty("Difficulty", { reader >> m_Difficulty; });
100+
MatchProperty("DeliveryDelay", { reader >> m_DeliveryDelay; });
103101
*/
104-
return Activity::ReadProperty(propName, reader);
105-
106-
return 0;
102+
EndPropertyList;
107103
}
108104

109105

‎Activities/EditorActivity.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
// Inclusions of header files
1313

1414
#include "EditorActivity.h"
15+
1516
#include "PresetMan.h"
1617
#include "MovableMan.h"
18+
#include "FrameMan.h"
1719
#include "UInputMan.h"
1820
#include "AudioMan.h"
1921
#include "SLTerrain.h"
@@ -129,18 +131,13 @@ int EditorActivity::Create(const EditorActivity &reference)
129131

130132
int EditorActivity::ReadProperty(const std::string_view &propName, Reader &reader)
131133
{
134+
StartPropertyList(Activity::ReadProperty(propName, reader));
132135
/*
133-
if (propName == "CPUTeam")
134-
reader >> m_CPUTeam;
135-
else if (propName == "Difficulty")
136-
reader >> m_Difficulty;
137-
else if (propName == "DeliveryDelay")
138-
reader >> m_DeliveryDelay;
139-
else
136+
MatchProperty("CPUTeam", { reader >> m_CPUTeam; });
137+
MatchProperty("Difficulty", { reader >> m_Difficulty; });
138+
MatchProperty("DeliveryDelay", { reader >> m_DeliveryDelay; });
140139
*/
141-
return Activity::ReadProperty(propName, reader);
142-
143-
return 0;
140+
EndPropertyList;
144141
}
145142

146143

0 commit comments

Comments
 (0)