Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
gstuitje
RingMaster
Commits
7b2678b1
Commit
7b2678b1
authored
Feb 05, 2019
by
mmaluschnig
Browse files
updated controls
parent
7ff1d08e
Changes
6
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
View file @
7b2678b1
<Properties
StartupConfiguration=
"{67A4F128-F6AC-CD88-DA35-F29416A0792A}|"
>
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp
PreferredExecutionTarget=
"Unity.Editor"
/>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/
Dayt
imeScripts/
CharacterInteractions
.cs"
>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/
M
imeScripts/
TriggerManager
.cs"
>
<Files>
<File
FileName=
"Assets/Scripts/DaytimeScripts/DaytimeManager.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/SpawnKeys.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterInteractions.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterInteractions.cs"
Line=
"68"
Column=
"116"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/TentInteractoins.cs"
Line=
"28"
Column=
"112"
/>
<File
FileName=
"Assets/Scripts/TrapezeScripts/TrapezePerson.cs"
Line=
"45"
Column=
"75"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/TriggerManager.cs"
Line=
"45"
Column=
"78"
/>
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace
ActiveConfiguration=
"Debug"
/>
...
...
RingMaster/RingMaster/.vs/RingMaster/xs/sqlite3/storage.ide-shm
deleted
100644 → 0
View file @
7ff1d08e
File deleted
RingMaster/RingMaster/.vs/RingMaster/xs/sqlite3/storage.ide-wal
deleted
100644 → 0
View file @
7ff1d08e
File deleted
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterInteractions.cs
View file @
7b2678b1
...
...
@@ -53,7 +53,7 @@ public class CharacterInteractions : MonoBehaviour {
{
if
(!
interacting
)
{
//if player presses up, begin the interaction.
if
(
Input
.
GetKeyDown
(
KeyCode
.
W
)
||
Input
.
GetKeyDown
(
KeyCode
.
UpArrow
))
{
if
(
Input
.
GetKeyDown
(
KeyCode
.
W
)
||
Input
.
GetKeyDown
(
KeyCode
.
UpArrow
)
||
Input
.
GetKeyDown
(
KeyCode
.
E
)
)
{
interacting
=
true
;
setText
(
speechBox
,
characterScript
.
GreetingMessage
(),
Mathf
.
Infinity
,
characterScript
.
getResponses
());
interactButton
.
gameObject
.
SetActive
(
false
);
...
...
@@ -65,7 +65,7 @@ public class CharacterInteractions : MonoBehaviour {
}
}
}
else
{
//if the player is currently interacting
if
(
Input
.
GetKeyDown
(
KeyCode
.
W
)
||
Input
.
GetKeyDown
(
KeyCode
.
UpArrow
))
{
if
(
Input
.
GetKeyDown
(
KeyCode
.
W
)
||
Input
.
GetKeyDown
(
KeyCode
.
UpArrow
)
||
Input
.
GetKeyDown
(
KeyCode
.
E
)
)
{
setText
(
speechBox
,
characterScript
.
converse
(),
Mathf
.
Infinity
,
characterScript
.
getResponses
());
}
}
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/TentInteractoins.cs
View file @
7b2678b1
...
...
@@ -25,7 +25,7 @@ public class TentInteractoins : MonoBehaviour {
void
Update
()
{
checkNearbyPlayers
();
if
(
interactable
)
{
if
(
Input
.
GetKeyDown
(
KeyCode
.
W
)
||
Input
.
GetKeyDown
(
KeyCode
.
UpArrow
))
{
if
(
Input
.
GetKeyDown
(
KeyCode
.
W
)
||
Input
.
GetKeyDown
(
KeyCode
.
UpArrow
)
||
Input
.
GetKeyDown
(
KeyCode
.
E
)
)
{
DaytimeManager
.
beginPerformance
();
}
}
...
...
RingMaster/RingMaster/Assets/Scripts/MimeScripts/TriggerManager.cs
View file @
7b2678b1
...
...
@@ -42,7 +42,7 @@ public class TriggerManager : MonoBehaviour
void
Update
()
{
//Check which key the player presses
if
(
Input
.
GetKeyDown
(
KeyCode
.
LeftArrow
))
if
(
Input
.
GetKeyDown
(
KeyCode
.
LeftArrow
)
||
Input
.
GetKeyDown
(
KeyCode
.
A
)
)
{
moveColliders
((
int
)
keys
.
left
);
Vector3
newScale
=
player
.
transform
.
localScale
;
...
...
@@ -50,7 +50,7 @@ public class TriggerManager : MonoBehaviour
player
.
transform
.
localScale
=
newScale
;
checkLowestKey
();
}
if
(
Input
.
GetKeyDown
(
KeyCode
.
RightArrow
))
if
(
Input
.
GetKeyDown
(
KeyCode
.
RightArrow
)
||
Input
.
GetKeyDown
(
KeyCode
.
D
)
)
{
moveColliders
((
int
)
keys
.
right
);
Vector3
newScale
=
player
.
transform
.
localScale
;
...
...
@@ -58,7 +58,7 @@ public class TriggerManager : MonoBehaviour
player
.
transform
.
localScale
=
newScale
;
checkLowestKey
();
}
if
(
Input
.
GetKeyDown
(
KeyCode
.
UpArrow
))
if
(
Input
.
GetKeyDown
(
KeyCode
.
UpArrow
)
||
Input
.
GetKeyDown
(
KeyCode
.
W
)
)
{
moveColliders
((
int
)
keys
.
up
);
Vector3
newPos
=
player
.
transform
.
position
;
...
...
@@ -66,7 +66,7 @@ public class TriggerManager : MonoBehaviour
player
.
transform
.
position
=
newPos
;
checkLowestKey
();
}
if
(
Input
.
GetKeyDown
(
KeyCode
.
DownArrow
))
if
(
Input
.
GetKeyDown
(
KeyCode
.
DownArrow
)
||
Input
.
GetKeyDown
(
KeyCode
.
S
)
)
{
moveColliders
((
int
)
keys
.
down
);
Vector3
newPos
=
player
.
transform
.
position
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment