Skip to content

😩 #59

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
toriko2 wants to merge 13 commits into
base: main
Choose a base branch
from
Open

😩 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9a2cb0b
added object physics
toriko2 Apr 19, 2023
b0b4902
added light switches
toriko2 Apr 19, 2023
9d03255
Merge branch 'main' into physxMergeTest
toriko2 Apr 30, 2023
f6e718d
added atmospherics and physx😩
toriko2 May 1, 2023
4ee0ac9
Merge branch 'main' into physxnewmergetest
toriko2 May 1, 2023
b1fa629
added sound and light switches
toriko2 May 1, 2023
cb6ee14
Merge branch 'main' into physxnewmergetest
toriko2 May 1, 2023
c58d72f
minor sound tweaks
toriko2 May 1, 2023
7a5b9a7
Merge branch 'main' into physxActualPR
toriko2 May 2, 2023
34a41d4
vefe
toriko2 May 2, 2023
cd335fc
defe
toriko2 May 2, 2023
60ac8b8
ligma
toriko2 May 2, 2023
828ddb4
Merge branch 'main' into physxActualPR
toriko2 May 2, 2023
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
10 changes: 5 additions & 5 deletions Assets/FastLighting.lighting
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ LightingSettings:
m_PrefabAsset: {fileID: 0}
m_Name: FastLighting
serializedVersion: 4
m_GIWorkflowMode: 1
m_GIWorkflowMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_RealtimeEnvironmentLighting: 1
m_BounceScale: 1
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 1
m_UsingShadowmask: 0
m_BakeBackend: 2
m_LightmapMaxSize: 1024
m_BakeResolution: 40
m_BakeResolution: 4
m_Padding: 2
m_LightmapCompression: 1
m_AO: 1
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 2
m_MixedBakeMode: 0
m_LightmapsBakeMode: 1
m_FilterMode: 1
m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_RealtimeResolution: 2
Expand Down
2 changes: 1 addition & 1 deletion Assets/Imports/PSX Shader/UniversalRenderPipelineAsset.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ MonoBehaviour:
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 1
m_StoreActionsOptimization: 0
m_SupportsHDR: 0
m_SupportsHDR: 1
m_MSAA: 1
m_RenderScale: 1
m_UpscalingFilter: 0
Expand Down
45 changes: 9 additions & 36 deletions Assets/Imports/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View file
Open in desktop

Large diffs are not rendered by default.

90 changes: 90 additions & 0 deletions Assets/Inputs/InputActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,33 @@ public @InputActions()
""interactions"": ""Press(behavior=2)"",
""initialStateCheck"": false
},
{
""name"": ""Grab"",
""type"": ""PassThrough"",
""id"": ""c810259c-9626-4a52-8085-5578f14507a5"",
""expectedControlType"": ""Axis"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Throw"",
""type"": ""PassThrough"",
""id"": ""6aa121e3-cfbf-4fcc-b88d-337e433b3c00"",
""expectedControlType"": ""Axis"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Use"",
""type"": ""PassThrough"",
""id"": ""70584cdf-4281-438d-86cd-c70171f508d7"",
""expectedControlType"": ""Axis"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""ThrowObject"",
""type"": ""Button"",
Expand Down Expand Up @@ -211,6 +238,17 @@ public @InputActions()
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""0819115c-5bd3-48d9-b3b9-9c24584addba"",
""path"": ""<Keyboard>/p"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Grab"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""80138f6c-a17f-4cab-a1fe-fdedaa1211d9"",
Expand All @@ -222,6 +260,28 @@ public @InputActions()
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""f34e52f0-2925-4ad7-9047-9e494e2eeab7"",
""path"": ""<Mouse>/rightButton"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Throw"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""0ac96a0e-d10f-47a9-9355-69b4082742a2"",
""path"": ""<Mouse>/middleButton"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Use"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""1b151113-cce2-4278-8d5b-2e262ddf2cf0"",
Expand All @@ -246,6 +306,9 @@ public @InputActions()
m_Player_Objectives = m_Player.FindAction("Objectives", throwIfNotFound: true);
m_Player_PickUp = m_Player.FindAction("PickUp", throwIfNotFound: true);
m_Player_Crouch = m_Player.FindAction("Crouch", throwIfNotFound: true);
m_Player_Grab = m_Player.FindAction("Grab", throwIfNotFound: true);
m_Player_Throw = m_Player.FindAction("Throw", throwIfNotFound: true);
m_Player_Use = m_Player.FindAction("Use", throwIfNotFound: true);
m_Player_ThrowObject = m_Player.FindAction("ThrowObject", throwIfNotFound: true);
m_Player_Flashlight = m_Player.FindAction("Flashlight", throwIfNotFound: true);
}
Expand Down Expand Up @@ -313,6 +376,9 @@ public int FindBinding(InputBinding bindingMask, out InputAction action)
private readonly InputAction m_Player_Objectives;
private readonly InputAction m_Player_PickUp;
private readonly InputAction m_Player_Crouch;
private readonly InputAction m_Player_Grab;
private readonly InputAction m_Player_Throw;
private readonly InputAction m_Player_Use;
private readonly InputAction m_Player_ThrowObject;
private readonly InputAction m_Player_Flashlight;
public struct PlayerActions
Expand All @@ -325,6 +391,9 @@ public struct PlayerActions
public InputAction @Objectives => m_Wrapper.m_Player_Objectives;
public InputAction @PickUp => m_Wrapper.m_Player_PickUp;
public InputAction @Crouch => m_Wrapper.m_Player_Crouch;
public InputAction @Grab => m_Wrapper.m_Player_Grab;
public InputAction @Throw => m_Wrapper.m_Player_Throw;
public InputAction @Use => m_Wrapper.m_Player_Use;
public InputAction @ThrowObject => m_Wrapper.m_Player_ThrowObject;
public InputAction @Flashlight => m_Wrapper.m_Player_Flashlight;
public InputActionMap Get() { return m_Wrapper.m_Player; }
Expand Down Expand Up @@ -354,6 +423,15 @@ public void SetCallbacks(IPlayerActions instance)
@Crouch.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnCrouch;
@Crouch.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnCrouch;
@Crouch.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnCrouch;
@Grab.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnGrab;
@Grab.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnGrab;
@Grab.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnGrab;
@Throw.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnThrow;
@Throw.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnThrow;
@Throw.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnThrow;
@Use.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnUse;
@Use.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnUse;
@Use.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnUse;
@ThrowObject.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnThrowObject;
@ThrowObject.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnThrowObject;
@ThrowObject.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnThrowObject;
Expand Down Expand Up @@ -382,6 +460,15 @@ public void SetCallbacks(IPlayerActions instance)
@Crouch.started += instance.OnCrouch;
@Crouch.performed += instance.OnCrouch;
@Crouch.canceled += instance.OnCrouch;
@Grab.started += instance.OnGrab;
@Grab.performed += instance.OnGrab;
@Grab.canceled += instance.OnGrab;
@Throw.started += instance.OnThrow;
@Throw.performed += instance.OnThrow;
@Throw.canceled += instance.OnThrow;
@Use.started += instance.OnUse;
@Use.performed += instance.OnUse;
@Use.canceled += instance.OnUse;
@ThrowObject.started += instance.OnThrowObject;
@ThrowObject.performed += instance.OnThrowObject;
@ThrowObject.canceled += instance.OnThrowObject;
Expand All @@ -400,6 +487,9 @@ public interface IPlayerActions
void OnObjectives(InputAction.CallbackContext context);
void OnPickUp(InputAction.CallbackContext context);
void OnCrouch(InputAction.CallbackContext context);
void OnGrab(InputAction.CallbackContext context);
void OnThrow(InputAction.CallbackContext context);
void OnUse(InputAction.CallbackContext context);
void OnThrowObject(InputAction.CallbackContext context);
void OnFlashlight(InputAction.CallbackContext context);
}
Expand Down
60 changes: 60 additions & 0 deletions Assets/Inputs/InputActions.inputactions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,33 @@
"interactions": "Press(behavior=2)",
"initialStateCheck": false
},
{
"name": "Grab",
"type": "PassThrough",
"id": "c810259c-9626-4a52-8085-5578f14507a5",
"expectedControlType": "Axis",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Throw",
"type": "PassThrough",
"id": "6aa121e3-cfbf-4fcc-b88d-337e433b3c00",
"expectedControlType": "Axis",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Use",
"type": "PassThrough",
"id": "70584cdf-4281-438d-86cd-c70171f508d7",
"expectedControlType": "Axis",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "ThrowObject",
"type": "Button",
Expand Down Expand Up @@ -189,6 +216,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "0819115c-5bd3-48d9-b3b9-9c24584addba",
"path": "<Keyboard>/p",
"interactions": "",
"processors": "",
"groups": "",
"action": "Grab",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "80138f6c-a17f-4cab-a1fe-fdedaa1211d9",
Expand All @@ -200,6 +238,28 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f34e52f0-2925-4ad7-9047-9e494e2eeab7",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "Throw",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "0ac96a0e-d10f-47a9-9355-69b4082742a2",
"path": "<Mouse>/middleButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "Use",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "1b151113-cce2-4278-8d5b-2e262ddf2cf0",
Expand Down
Loading