Philip/Pasty-Protector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Pasty-Protector/Build/GAM110_3D_GAMEA_Data
History
JamieLeveridge 3a05d9521f Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository 
# Conflicts:
#	Unity-Files/Assets/Examples/Defender/Defender.unity
2021-11-10 16:54:10 +00:00
..
Managed
Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository
2021-11-10 16:54:10 +00:00
Resources
Do not push
2021-11-08 17:08:23 +00:00
app.info
Do not push
2021-11-08 17:08:23 +00:00
boot.config
Do not push
2021-11-08 17:08:23 +00:00
globalgamemanagers
Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository
2021-11-10 16:54:10 +00:00
globalgamemanagers.assets
Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository
2021-11-08 17:20:14 +00:00
level0
Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository
2021-11-08 17:20:14 +00:00
level1
Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository
2021-11-10 16:54:10 +00:00
resources.assets
Do not push
2021-11-08 17:08:23 +00:00
resources.assets.resS
Do not push
2021-11-08 17:08:23 +00:00
RuntimeInitializeOnLoads.json
Do not push
2021-11-08 17:08:23 +00:00
ScriptingAssemblies.json
Do not push
2021-11-08 17:08:23 +00:00
sharedassets0.assets
Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository
2021-11-08 17:20:14 +00:00
sharedassets0.assets.resS
Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository
2021-11-08 17:20:14 +00:00
sharedassets0.resource
Do not push
2021-11-08 17:08:23 +00:00
sharedassets1.assets
Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository
2021-11-08 17:20:14 +00:00
sharedassets1.assets.resS
Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository
2021-11-08 17:20:14 +00:00