Skip to content

feat: final touches #96

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

Merged
merged 1 commit into from
Dec 9, 2023
Merged

feat: final touches #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions Assets/Player/Models/PlayerAnimator.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AnimatorController:
m_AnimatorParameters:
- m_Name: speed
m_Type: 1
m_DefaultFloat: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
Expand Down Expand Up @@ -50,11 +50,11 @@ AnimatorState:
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 8149319799317669181}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!206 &1510578230492688263
BlendTree:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -111,18 +111,18 @@ AnimatorState:
m_TimeParameterActive: 0
m_Motion: {fileID: -203655887218126122, guid: 0b87f89d01130104cb97229365e5a116,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &5511037503630015393
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: speed
Expand Down Expand Up @@ -172,7 +172,7 @@ AnimatorStateTransition:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Name:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: speed
Expand Down
7 changes: 4 additions & 3 deletions Assets/Player/PlayerController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,11 @@ public void DrivenUpdate(bool isCurrent) {
Config.RotationSpeed * Time.deltaTime
);

var speed = Agent.velocity.magnitude;
var velocity = Agent.velocity;
velocity.y = 0;
var speed = velocity.magnitude;
if (Agent.remainingDistance > Agent.stoppingDistance + 1) {
speed = (Agent.velocity.magnitude + Agent.desiredVelocity.magnitude)
/ 2f;
speed = (speed + Agent.desiredVelocity.magnitude) / 2f;
}

_speedFactor = Mathf.Lerp(
Expand Down
18 changes: 18 additions & 0 deletions Assets/Typewriter/Tables/LoadingDocs.asset
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions Assets/Typewriter/Tables/LoadingDocs.tw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,9 @@ L_ask_bay_2_box_dark_here_2",bay_2_R_saw_box < 1,,,1,
L_ask_bay_2_box_dark_learns_2,speech,dialogue,RT,,FALSE,FALSE,"Back up a bit, let me look at this.",,,,,0,
L_ask_bay_2_box_dark_learns_3,speech,dialogue,LT,,FALSE,FALSE,"Oh, sorry.",,,,,0,
L_ask_bay_2_box_dark_learns_4,speech,dialogue,RT,,FALSE,FALSE,"Mm. Right, let's see...",,,,,0,
L_ask_bay_2_box_dark_learns_A_1,thought,dialogue,RT,,FALSE,FALSE,It looks like this could be a way to get into the building.,L_ask_bay_2_box_dark_learns_4,bay_R_identified_bays = 0,bay_R_identified_bays = 1,,1,
L_ask_bay_2_box_dark_learns_A_1,thought,dialogue,RT,,FALSE,FALSE,It looks like this could be a way to get into the building.,L_ask_bay_2_box_dark_learns_4,"bay_R_identified_bays = 0
bay_R_identified = 0","bay_R_identified_bays = 1
bay_R_identified = 1",,2,
L_ask_bay_2_box_dark_learns_A_2,thought,dialogue,RT,,FALSE,FALSE,"The wall here is replaced by a garage door, which is covered by a scissor gate.",,,,,0,
L_ask_bay_2_box_dark_learns_A_3,thought,dialogue,RT,,FALSE,FALSE,"Judging by the lights, it's powered, but... faulty, in some way.",,,,,0,
L_ask_bay_2_box_dark_learns_A_4,thought,dialogue,RT,,FALSE,FALSE,Which <i>would</i> explain why this service box is open.,,,bay_2_R_saw_box = 1,,0,
Expand Down Expand Up @@ -633,7 +635,9 @@ R_ask_bay_2_box_dark_knows_2,speech,dialogue,LT,,FALSE,FALSE,Oh. In the box?,,,,
R_ask_bay_2_box_dark_learns_1,speech,dialogue,LT,,FALSE,FALSE,Uhh... Gimme a sec.,"R_ask_bay_2_box_dark_away_4
R_ask_bay_2_box_dark_here_4",bay_2_L_saw_box < 1,,,1,
R_ask_bay_2_box_dark_learns_2,thought,dialogue,LT,,FALSE,FALSE,"What's going on, here?",,,,,0,
R_ask_bay_2_box_dark_learns_A_1,thought,dialogue,LT,,FALSE,FALSE,Looks like one of those gates they use for shipping-and-receiving stuff.,R_ask_bay_2_box_dark_learns_2,bay_L_identified_bays = 0,bay_L_identified_bays = 1,,1,
R_ask_bay_2_box_dark_learns_A_1,thought,dialogue,LT,,FALSE,FALSE,Looks like one of those gates they use for shipping-and-receiving stuff.,R_ask_bay_2_box_dark_learns_2,"bay_L_identified_bays = 0
bay_L_identified = 0","bay_L_identified_bays = 1
bay_L_identified = 1",,2,
R_ask_bay_2_box_dark_learns_A_2,thought,dialogue,LT,,FALSE,FALSE,"You back a big-rig into it, and the trailer slots right in.",,,,,0,
R_ask_bay_2_box_dark_learns_A_3,thought,dialogue,LT,,FALSE,FALSE,Lets 'em load and unload straight into the building.,,,,,0,
R_ask_bay_2_box_dark_learns_A_4,thought,dialogue,LT,,FALSE,FALSE,The gate's closed...,,,,,0,
Expand Down