diff --git a/Animations/IntroBlankBackground/Default/000.png b/Animations/IS_BlankBG/Default/000.png similarity index 100% rename from Animations/IntroBlankBackground/Default/000.png rename to Animations/IS_BlankBG/Default/000.png diff --git a/Animations/IS_sky_lightened/Default/000.png b/Animations/IS_SkyBG/Default/000.png similarity index 100% rename from Animations/IS_sky_lightened/Default/000.png rename to Animations/IS_SkyBG/Default/000.png diff --git a/Animations/PreloaderBackground/Default/000.png b/Animations/L1PRE_BlankBG/Default/000.png similarity index 100% rename from Animations/PreloaderBackground/Default/000.png rename to Animations/L1PRE_BlankBG/Default/000.png diff --git a/Animations/MMBlankBackground/Default/000.png b/Animations/MM_BlankBG/Default/000.png similarity index 100% rename from Animations/MMBlankBackground/Default/000.png rename to Animations/MM_BlankBG/Default/000.png diff --git a/Animations/Preloader_BlankBG/Default/000.png b/Animations/Preloader_BlankBG/Default/000.png new file mode 100644 index 0000000..05f3853 Binary files /dev/null and b/Animations/Preloader_BlankBG/Default/000.png differ diff --git a/Event sheets/ES - Intro Scene.uistate.xml b/Event sheets/ES - Intro Scene.uistate.xml index a08f418..1e12c24 100644 --- a/Event sheets/ES - Intro Scene.uistate.xml +++ b/Event sheets/ES - Intro Scene.uistate.xml @@ -4,7 +4,7 @@ It is entirely optional and the project will load without it. If you are placing the project under source control, you probably do not want to add any .uistate.xml files to the repository.--> 1 - 0 + 2500 240 131 diff --git a/Event sheets/ES - Intro Scene.xml b/Event sheets/ES - Intro Scene.xml index 43b1adc..d14a695 100644 --- a/Event sheets/ES - Intro Scene.xml +++ b/Event sheets/ES - Intro Scene.xml @@ -3,9 +3,9 @@ ES - Intro Scene - 0 - 0 - 0 + 0 + 0 + 0 Intro Scene Storyline and Mechanics @@ -67,13 +67,13 @@ 0.25 - IntroSceneReadyToPlay + IS_IntroSceneReadyToPlay 1 1 - + 1 @@ -103,46 +103,46 @@ 1 - + 1 - + "*intercom ringing*" 1.8 - + "" 0.05 - + "COMMAND CENTER: " & newline & "Fox One, I am picking you up on the radar, you are now within base range. Over." 6 - + "" 0.05 - + newline & "Roger that. Fox One pulling down and reducing altitude. Over." 5.5 - + "" 0.05 - + "COMMAND CENTER: " & newline & "10-4. Reduce your altitude by 200 meters and-" @@ -151,10 +151,10 @@ 0 - + 0 - + "" @@ -163,31 +163,31 @@ 1 - + 1 0.3 - + "" 0.05 - + "COMMAND CENTER: " & newline & "Fox One, we're picking up a bogey coming directly towards you." 5.5 - + "" 0.05 - + newline & "A what? Oh no, it's a mis-" @@ -196,10 +196,10 @@ 0 - + 0 - + "" @@ -243,22 +243,22 @@ 1 - + 1 - + "COMMAND CENTER: " & newline & "Fox One, what happened!? Your readings have become irregular!!" 3.5 - + "" 0.05 - + "COMMAND CENTER: " & newline & "Fo... ...e, can yo... sti... ...r ... -" @@ -267,10 +267,10 @@ 0 - + 0 - + "" @@ -282,7 +282,7 @@ - IntroSceneReadyToPlay + IS_IntroSceneReadyToPlay 0 1 @@ -305,7 +305,7 @@ - PlaneRocketHits + IS_PlaneRocketHits 1 @@ -327,7 +327,7 @@ - PlaneRocketHits + IS_PlaneRocketHits 1 @@ -349,7 +349,7 @@ - PlaneRocketHits + IS_PlaneRocketHits 1 @@ -367,7 +367,7 @@ - PlaneRocketHits + IS_PlaneRocketHits 0 3 @@ -387,12 +387,12 @@ - PlaneRocketHits + IS_PlaneRocketHits 0 3 - PlaneGravityStop + IS_PlaneGravityStop 0 0 @@ -418,11 +418,11 @@ - PlaneRocketHits + IS_PlaneRocketHits 4 - PlaneGravityStop + IS_PlaneGravityStop 1 @@ -462,7 +462,7 @@ 27 (Esc) - IntroSceneReadyToPlay + IS_IntroSceneReadyToPlay 0 1 diff --git a/Event sheets/Event sheet 1.uistate.xml b/Event sheets/ES - Level 1 PRE.uistate.xml similarity index 94% rename from Event sheets/Event sheet 1.uistate.xml rename to Event sheets/ES - Level 1 PRE.uistate.xml index 09fdd20..f602df7 100644 --- a/Event sheets/Event sheet 1.uistate.xml +++ b/Event sheets/ES - Level 1 PRE.uistate.xml @@ -6,7 +6,7 @@ you probably do not want to add any .uistate.xml files to the repository.--> 1 0 240 - 30 + 80 80 80 diff --git a/Event sheets/ES - Level 1 PRE.xml b/Event sheets/ES - Level 1 PRE.xml new file mode 100644 index 0000000..400842f --- /dev/null +++ b/Event sheets/ES - Level 1 PRE.xml @@ -0,0 +1,8 @@ + + + + ES - Level 1 PRE + + Post Main Menu Intro Goes here + + diff --git a/Event sheets/ES - Main Menu.uistate.xml b/Event sheets/ES - Main Menu.uistate.xml index ecd517f..f86317e 100644 --- a/Event sheets/ES - Main Menu.uistate.xml +++ b/Event sheets/ES - Main Menu.uistate.xml @@ -4,7 +4,7 @@ It is entirely optional and the project will load without it. If you are placing the project under source control, you probably do not want to add any .uistate.xml files to the repository.--> 1 - 50 + 0 240 152 diff --git a/Event sheets/ES - Layout 1.xml b/Event sheets/ES - Sample Layout.xml similarity index 99% rename from Event sheets/ES - Layout 1.xml rename to Event sheets/ES - Sample Layout.xml index 788b49a..fa355c9 100644 --- a/Event sheets/ES - Layout 1.xml +++ b/Event sheets/ES - Sample Layout.xml @@ -1,7 +1,7 @@  - ES - Layout 1 + ES - Sample Layout Use the down arrow to allow the player to deliberately drop down through a jump-thru platform. diff --git a/Layouts/Intro Scene.xml b/Layouts/Intro Scene.xml index fc3f920..c7ad660 100644 --- a/Layouts/Intro Scene.xml +++ b/Layouts/Intro Scene.xml @@ -29,7 +29,7 @@ 0 0 - + Visible Default @@ -155,7 +155,7 @@ 0 0 - + Invisible Default @@ -512,7 +512,7 @@ 0 0 - + 16 16 diff --git a/Layouts/Level 1 PRE.uistate.xml b/Layouts/Level 1 PRE.uistate.xml new file mode 100644 index 0000000..1e39848 --- /dev/null +++ b/Layouts/Level 1 PRE.uistate.xml @@ -0,0 +1,30 @@ + + + + + 658.67 + 465 + 200 + 658.67 + 465 + 0 + + 0 + 0 + 32 + 32 + 0 + 0 + + + + + + + + + + + diff --git a/Layouts/Level 1 PRE.xml b/Layouts/Level 1 PRE.xml new file mode 100644 index 0000000..8631d2f --- /dev/null +++ b/Layouts/Level 1 PRE.xml @@ -0,0 +1,60 @@ + + + Level 1 PRE + 472446310083554 + ES - Level 1 PRE + + 1708 + 960 + + + 500 + 500 + + 0 + + + 1 + 255,255,255 + 0 + + 1 + 1 + + 1 + 1 + 0 + 0 + 0 + 0 + 0 + + + + Visible + Default + 0 + Enabled + + 0 + 0 + + 0 + 0 + 0 + 1741 + 987 + 0 + 0 + 0 + 0 + 1 + + + + + + + + + diff --git a/Layouts/Main Menu.xml b/Layouts/Main Menu.xml index faaef5e..6112f52 100644 --- a/Layouts/Main Menu.xml +++ b/Layouts/Main Menu.xml @@ -29,7 +29,7 @@ 0 0 - + Visible Default diff --git a/Layouts/Preloader.xml b/Layouts/Preloader.xml index e4c787e..f2818dc 100644 --- a/Layouts/Preloader.xml +++ b/Layouts/Preloader.xml @@ -29,7 +29,7 @@ 0 0 - + Visible Default diff --git a/Layouts/Layout 1.uistate.xml b/Layouts/Sample Layout.uistate.xml similarity index 100% rename from Layouts/Layout 1.uistate.xml rename to Layouts/Sample Layout.uistate.xml diff --git a/Layouts/Layout 1.xml b/Layouts/Sample Layout.xml similarity index 99% rename from Layouts/Layout 1.xml rename to Layouts/Sample Layout.xml index e13105c..9fc0720 100644 --- a/Layouts/Layout 1.xml +++ b/Layouts/Sample Layout.xml @@ -1,8 +1,8 @@  - Layout 1 + Sample Layout 775523505470606 - ES - Layout 1 + ES - Sample Layout 1280 1024 diff --git a/Resistance Saga FYP.caproj b/Resistance Saga FYP.caproj index d1f6fc5..09dd9e5 100644 --- a/Resistance Saga FYP.caproj +++ b/Resistance Saga FYP.caproj @@ -2,7 +2,7 @@ Resistance Saga FYP Resistance Saga FYP - 2.0.1.0331 + 2.0.1.0334 Yandols Zeon X admin@rail.zxicar.us https://yandols.xyz/resistancesaga @@ -132,7 +132,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -416,7 +416,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -600,19 +600,29 @@ + + + + + + + + Preloader.xml Intro Scene.xml Main Menu.xml - Layout 1.xml + Sample Layout.xml + Level 1 PRE.xml - ES - Layout 1.xml + ES - Sample Layout.xml ES - Preloader.xml ES - Main Menu.xml ES - Intro Scene.xml + ES - Level 1 PRE.xml diff --git a/Resistance Saga FYP.capx.backup1 b/Resistance Saga FYP.capx.backup1 index 91f6d9a..c57f7ea 100644 Binary files a/Resistance Saga FYP.capx.backup1 and b/Resistance Saga FYP.capx.backup1 differ diff --git a/Resistance Saga FYP.uistate.xml b/Resistance Saga FYP.uistate.xml index 755bdfa..2578b4e 100644 --- a/Resistance Saga FYP.uistate.xml +++ b/Resistance Saga FYP.uistate.xml @@ -12,10 +12,12 @@ you probably do not want to add any .uistate.xml files to the repository.--> Preloader Main Menu - Intro Scene + Intro Scene + Level 1 PRE ES - Preloader ES - Main Menu - ES - Intro Scene + ES - Intro Scene + ES - Level 1 PRE @@ -34,18 +36,18 @@ you probably do not want to add any .uistate.xml files to the repository.--> - - + + - + - + @@ -53,5 +55,6 @@ you probably do not want to add any .uistate.xml files to the repository.--> + diff --git a/Textures/IS_DialogueTF.png b/Textures/IS_TFDialogue.png similarity index 100% rename from Textures/IS_DialogueTF.png rename to Textures/IS_TFDialogue.png