Skip to content

Commit 9a7e16f

Browse files
authored
Merge pull request #82 from JanSeliv/develop
Develop
2 parents 3b98a73 + 751bcff commit 9a7e16f

File tree

734 files changed

+28058
-10013
lines changed

Some content is hidden

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

734 files changed

+28058
-10013
lines changed

.gitignore

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,8 @@ paket-files/
294294
# JetBrains Rider
295295
.idea/
296296
*.sln.iml
297+
*/Plugins/Developer/RiderLink/
298+
.run/
297299

298300
# CodeRush personal settings
299301
.cr/personal
@@ -346,9 +348,6 @@ healthchecksdb
346348
docs/
347349
doxygen.tag
348350

349-
# Rider
350-
**/Plugins/Developer/RiderLink/
351-
352351
# Visual Studio 2015 user specific files
353352
.vs/
354353

@@ -423,5 +422,13 @@ Saved/*
423422
# Cache files for the editor to use
424423
DerivedDataCache
425424

425+
# Ignore scripts unless force pushed
426+
*.sh
427+
*.bat
428+
*.cmd
429+
430+
# Ignore auto-generated and dialogue-specific localization settings
431+
Config/Localization/*
432+
426433
# Bomber specific
427434
Config/DefaultMetaCheatManager.ini

.gitmodules

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@
2323
url = https://github.com/JanSeliv/InstancedStaticMeshConverter.git
2424
[submodule "Plugins/GameFeatures/ProgressionSystem"]
2525
path = Plugins/GameFeatures/ProgressionSystem
26-
url = https://github.com/h4rdmol/ProgressionSystem.git
27-
branch = main
26+
url = https://github.com/JanSeliv/ProgressionSystem.git
27+
branch = develop
2828
[submodule "Plugins/LevelSequencerAudioTrimmer"]
2929
path = Plugins/LevelSequencerAudioTrimmer
3030
url = https://github.com/JanSeliv/LevelSequencerAudioTrimmer.git
3131
branch = develop
32+
[submodule "Plugins/AdvancedSessionsPlugin"]
33+
path = Plugins/AdvancedSessionsPlugin
34+
url = https://github.com/JanSeliv/AdvancedSessionsPlugin.git

0 commit comments

Comments
 (0)