Skip to content

Staging #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jordan-Lane-Dev wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Staging #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f69dec7
added new intro into movies folder
jnrizvi Apr 9, 2019
b0d66cd
Updated intro cutscene
willfenton Apr 9, 2019
f33d6a1
Removed sprinting
willfenton Apr 9, 2019
559b2a2
note namechange
jalqueza Apr 9, 2019
5091135
End cutscene
willfenton Apr 9, 2019
67a0a80
Merge branch 'staging' of https://github.com/ProximitiGames/FrayedSys…
willfenton Apr 9, 2019
0ddb56c
Fix Terminator Android (Reset behavior)
Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions data/Map011.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions data/Map014.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions data/Map017.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions data/Map019.json
View file
Open in desktop

Large diffs are not rendered by default.

41 changes: 41 additions & 0 deletions data/Map021.json
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions data/MapInfos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ null,
{"id":8,"expanded":false,"name":"Floor 3 Reset","order":7,"parentId":7,"scrollX":832,"scrollY":640},
{"id":9,"expanded":false,"name":"Floor 2","order":4,"parentId":0,"scrollX":3483.428571428571,"scrollY":2681.142857142857},
{"id":10,"expanded":false,"name":"Floor 2 Reset","order":5,"parentId":9,"scrollX":1636,"scrollY":896},
{"id":11,"expanded":true,"name":"Floor 1","order":1,"parentId":0,"scrollX":4130,"scrollY":4869},
{"id":11,"expanded":false,"name":"Floor 1","order":1,"parentId":0,"scrollX":4928,"scrollY":640},
{"id":12,"expanded":true,"name":"Floor 1 Backup","order":3,"parentId":11,"scrollX":3428.5714285714284,"scrollY":3078.8571428571427},
{"id":13,"expanded":false,"name":"Notes","order":20,"parentId":0,"scrollX":1228.5,"scrollY":691.5},
{"id":14,"expanded":false,"name":"Floor 3 - Gameplay","order":14,"parentId":0,"scrollX":1946,"scrollY":2721},
{"id":13,"expanded":false,"name":"Notes","order":21,"parentId":0,"scrollX":1228.5,"scrollY":691.5},
{"id":14,"expanded":false,"name":"Floor 3 - Gameplay","order":14,"parentId":0,"scrollX":2637.3333333333335,"scrollY":2961.3333333333335},
{"id":15,"expanded":false,"name":"Floor 1 Reset","order":2,"parentId":11,"scrollX":3483.428571428571,"scrollY":2681.142857142857},
{"id":16,"expanded":true,"name":"Floor 3 - Gameplay","order":15,"parentId":14,"scrollX":3483.428571428571,"scrollY":2681.142857142857},
{"id":17,"expanded":true,"name":"Floor 5 (Server Room)","order":16,"parentId":0,"scrollX":2312,"scrollY":3575},
{"id":17,"expanded":true,"name":"Floor 5 (Server Room)","order":16,"parentId":0,"scrollX":4928,"scrollY":640},
{"id":18,"expanded":false,"name":"Floor 5 Reset","order":17,"parentId":17,"scrollX":1638,"scrollY":907},
{"id":19,"expanded":true,"name":"CEO Office","order":18,"parentId":0,"scrollX":1638,"scrollY":907},
{"id":20,"expanded":true,"name":"CEO Reset","order":19,"parentId":19,"scrollX":3483.428571428571,"scrollY":2681.142857142857}
{"id":19,"expanded":true,"name":"CEO Office","order":19,"parentId":0,"scrollX":816,"scrollY":640},
{"id":20,"expanded":true,"name":"CEO Reset","order":20,"parentId":19,"scrollX":1638,"scrollY":907},
{"id":21,"expanded":true,"name":"CEO Cutscene","order":18,"parentId":17,"scrollX":1638,"scrollY":907}
]
2 changes: 1 addition & 1 deletion data/System.json
View file
Open in desktop

Large diffs are not rendered by default.

0 img/pictures/Note1.PNG → img/pictures/Note1.png
View file
Open in desktop
File renamed without changes
Binary file added movies/intro_take2.mp4
View file
Open in desktop
Binary file not shown.
Binary file added movies/intro_take2.webm
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion save/config.rpgsave
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
N4IghgNg7mCeDOARM8AWIBcAzS8CmANCAMYD2AtuWAHYAmASnuUwEZ4BOmOE+RLA5uQBqpCAFdmmAIwAGGX37wR4yRgBs8kM2US80uUXw7VszQGUAKgFEA+hdRM9Gc9ZsAxURFJQuuQiEtbDwgvKAANTDUiQPdPbwBNTBkAXyAA=
N4IghgNg7mCeDOARM8AWIBcAzS8CmANCAMYD2AtuWAHYAmASnuUwEZ4BOmOE+RLA5uQBqpCAFdmmACwAGPv3gjxkjLKLMlEvJgBsckPk0q9RAMoAVAKIB9c6ibaM+izYBioiKShdchEC+t3CE8oAA1dMytAjy8ATUwZAF8gA