Skip to content

Commit 720f411

Browse files
authored
Merge pull request #63 from JanSeliv/develop
Develop
2 parents 01975ca + 70d09a9 commit 720f411

File tree

481 files changed

+30373
-18829
lines changed

Some content is hidden

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

481 files changed

+30373
-18829
lines changed

.gitignore

Lines changed: 82 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -339,33 +339,89 @@ ASALocalRun/
339339
# BeatPulse healthcheck temp database
340340
healthchecksdb
341341

342-
**/Intermediate/
343-
**/Saved/
344-
**/Build/
345-
**/docs/
346-
**/Binaries/
347-
**/DerivedDataCache/
348-
**/Content/Developers/
342+
# Annoying auto configs
343+
**/HoloLensEngine.ini
344+
345+
# Documentation
346+
docs/
347+
doxygen.tag
348+
349+
# Rider
349350
**/Plugins/Developer/RiderLink/
351+
352+
# Visual Studio 2015 user specific files
353+
.vs/
354+
355+
# Compiled Object files
356+
*.slo
357+
*.lo
358+
*.o
359+
*.obj
360+
361+
# Precompiled Headers
362+
*.gch
363+
*.pch
364+
365+
# Compiled Dynamic libraries
366+
*.so
367+
*.dylib
368+
*.dll
369+
370+
# Fortran module files
371+
*.mod
372+
373+
# Compiled Static libraries
374+
*.lai
375+
*.la
376+
*.a
377+
*.lib
378+
379+
# Executables
380+
*.exe
381+
*.out
382+
*.app
383+
*.ipa
384+
385+
# These project files can be generated by the engine
386+
*.xcodeproj
387+
*.xcworkspace
350388
*.sln
351-
*.uproject
389+
*.suo
390+
*.opensdf
391+
*.sdf
392+
*.VC.db
393+
*.VC.opendb
394+
.vsconfig
395+
396+
# Precompiled Assets
397+
SourceArt/**/*.png
398+
SourceArt/**/*.tga
399+
400+
# Binary Files
401+
**/Binaries/*
402+
403+
# Builds
404+
Build/*
405+
406+
# Whitelist PakBlacklist-<BuildConfiguration>.txt files
407+
!Build/*/
408+
Build/*/**
409+
!Build/*/PakBlacklist*.txt
410+
411+
# Don't ignore icon files in Build
412+
!Build/**/*.ico
413+
414+
# Built data for maps
352415
*_BuiltData.uasset
353-
*Win64_DebugGame.*
354-
*.dll
355-
*.pdb
356-
*.modules
357-
*.target
358-
*.udd
359-
*.bak
360-
**/Binaries/UE4Editor-*-0*.dll
361-
**/Binaries/UE4Editor-*-1*.dll
362-
**/Binaries/UE4Editor-*-2*.dll
363-
**/Binaries/UE4Editor-*-3*.dll
364-
**/Binaries/UE4Editor-*-4*.dll
365-
**/Binaries/UE4Editor-*-5*.dll
366-
**/Binaries/UE4Editor-*-6*.dll
367-
**/Binaries/UE4Editor-*-7*.dll
368-
**/Binaries/UE4Editor-*-8*.dll
369-
**/Binaries/UE4Editor-*-9*.dll
370-
doxygen.tag
371416

417+
# Configuration files generated by the Editor
418+
Saved/*
419+
420+
# Compiled source files for the engine to use
421+
**/Intermediate/*
422+
423+
# Cache files for the editor to use
424+
DerivedDataCache
425+
426+
# Bomber specific
427+
Config/DefaultMetaCheatManager.ini

.gitmodules

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[submodule "Plugins/SettingsWidgetConstructor"]
2+
path = Plugins/SettingsWidgetConstructor
3+
url = git@github.com:JanSeliv/SettingsWidgetConstructor.git
4+
branch = develop
5+
[submodule "Plugins/PoolManager"]
6+
path = Plugins/PoolManager
7+
url = git@github.com:JanSeliv/PoolManager.git
8+
branch = develop
9+
[submodule "Plugins/MorphsPlayer"]
10+
path = Plugins/MorphsPlayer
11+
url = git@github.com:JanSeliv/MorphsPlayer.git
12+
branch = develop
13+
[submodule "Plugins/MetaCheatManager"]
14+
path = Plugins/MetaCheatManager
15+
url = git@github.com:JanSeliv/MetaCheatManager.git
16+
branch = develop
17+
[submodule "Plugins/FunctionPicker"]
18+
path = Plugins/FunctionPicker
19+
url = git@github.com:JanSeliv/FunctionPicker.git
20+
branch = develop
21+
[submodule "Plugins/CustomShapeButton"]
22+
path = Plugins/CustomShapeButton
23+
url = git@github.com:JanSeliv/CustomShapeButton.git
24+
branch = develop
25+
[submodule "Plugins/InstancedStaticMeshConverter"]
26+
path = Plugins/InstancedStaticMeshConverter
27+
url = git@github.com:JanSeliv/InstancedStaticMeshConverter.git

0 commit comments

Comments
 (0)