Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8055b8e
WIP adding and modifying Chop chops camera system
Elfi0Kuhndorf Aug 15, 2024
2430065
WIP started creating custom camera system as alternative
Elfi0Kuhndorf Aug 15, 2024
cbc1128
removed own camera system and added plus modified boss rooms camera s…
Elfi0Kuhndorf Aug 20, 2024
f3b8a44
Fixed: CameraControl script and included chop chops camera system met…
Elfi0Kuhndorf Aug 21, 2024
1fd8398
Avatar prefab and scene changes
Elfi0Kuhndorf Aug 21, 2024
24a5e95
fixed: jittering of camera and that movement direction stays correct …
Elfi0Kuhndorf Aug 22, 2024
38a1534
Removed: cleanup of unneeded assets
Elfi0Kuhndorf Aug 22, 2024
05954cd
Merge branch 'develop' into feat/DistributedAuthoritySample-camera-sy…
Elfi0Kuhndorf Aug 26, 2024
cdb5d87
fixing CameraControl, AvatarTransform, AvatarPrefab and Hubscene afte…
Elfi0Kuhndorf Aug 26, 2024
bde905f
temporarily: adding projectID
Elfi0Kuhndorf Aug 26, 2024
0935ae3
Revert "temporarily: adding projectID"
Elfi0Kuhndorf Aug 26, 2024
9ad3e66
Upgrade to CM3, fix jitter
glabute Aug 28, 2024
3218b40
Use interpolation to fix jitter
glabute Aug 28, 2024
b805140
Apply Orbit changes to CMCameraPrefab
Elfi0Kuhndorf Aug 29, 2024
930d165
Merge branch 'develop' into feat/DistributedAuthoritySample-camera-sy…
Elfi0Kuhndorf Aug 29, 2024
6e34ebd
Simplifying camera script (using action inputs directly) and changing…
Elfi0Kuhndorf Aug 30, 2024
4a0b958
Merge branch 'develop' into feat/DistributedAuthoritySample-camera-sy…
Elfi0Kuhndorf Aug 30, 2024
e921ab9
Adjust scripts to make camera work with new collisions and controller…
Elfi0Kuhndorf Aug 30, 2024
a0e1c1f
Fix: disabling interpolation on Avatar prefab to fix jittering of mov…
Elfi0Kuhndorf Aug 30, 2024
8d4b412
Addressed feedback, making functions internal instead of public and a…
Elfi0Kuhndorf Sep 4, 2024
a9422a2
Merge branch 'develop' into feat/DistributedAuthoritySample-camera-sy…
Elfi0Kuhndorf Sep 4, 2024
c2e2b36
stylistic fixes and code cleanup
Elfi0Kuhndorf Sep 4, 2024
c9abdcc
Merge branch 'develop' into feat/DistributedAuthoritySample-camera-sy…
Elfi0Kuhndorf Sep 4, 2024
a345433
adjusting CMCamera prefab due to using new avatar model (different ch…
Elfi0Kuhndorf Sep 4, 2024
245482d
removed old unused MainCamera
Elfi0Kuhndorf Sep 4, 2024
707da1e
fixing namings
Elfi0Kuhndorf Sep 5, 2024
5336920
Merge branch 'develop' into feat/DistributedAuthoritySample-camera-sy…
Elfi0Kuhndorf Sep 5, 2024
4fb6c72
remove generate wrapper in Avatar Input Actions
Elfi0Kuhndorf Sep 5, 2024
884ac32
remove unneeded line
Elfi0Kuhndorf Sep 5, 2024
8a03d0b
Increase damping and height of lowest orbit to reduce jittering
Elfi0Kuhndorf Sep 5, 2024
a7a953c
Changing scene and height values
Elfi0Kuhndorf Sep 5, 2024
7f37bde
adjust camera position in hubscene
Elfi0Kuhndorf Sep 5, 2024
59ac8b7
Fix: Adjusting avatar and camera starting transforms to start camera …
Elfi0Kuhndorf Sep 5, 2024
ae335fe
Adjusting spawning locations in code and CMCameraPrefab
Elfi0Kuhndorf Sep 6, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,24 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Zoom",
"type": "Value",
"id": "4881e475-767f-419a-99b6-87299643edd7",
"expectedControlType": "Axis",
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "Rotate",
"type": "Button",
"id": "269db507-806a-4a49-ab1e-55e38eafd0a3",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand Down Expand Up @@ -472,6 +490,28 @@
"action": "Crouch",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "1929240f-6e51-4531-830c-380b63b3b195",
"path": "<Mouse>/scroll/y",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Zoom",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "68338c5f-a927-4676-b836-60c0cdadb297",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Rotate",
"isComposite": false,
"isPartOfComposite": false
}
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ GameObject:
- component: {fileID: 7543523986693376117}
m_Layer: 0
m_Name: Avatar
m_TagString: Untagged
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -54,7 +54,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 2473698027
GlobalObjectIdHash: 3001504883
InScenePlacedSourceGlobalObjectIdHash: 0
DeferredDespawnTick: 0
Ownership: 0
Expand Down Expand Up @@ -134,7 +134,7 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_Constraints: 80
m_CollisionDetection: 2
--- !u!114 &-8100831418301897270
MonoBehaviour:
Expand Down Expand Up @@ -163,8 +163,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: dcd1b4eb76b964f40afe6c0a3ca65c82,
type: 3}
m_Actions: {fileID: -944628639613478452, guid: dcd1b4eb76b964f40afe6c0a3ca65c82, type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
Expand Down Expand Up @@ -194,8 +193,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7e9f71718dd134b14b300e378e98c718, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractActionReference: {fileID: 1781555164194001046, guid: dcd1b4eb76b964f40afe6c0a3ca65c82,
type: 3}
m_InteractActionReference: {fileID: 1781555164194001046, guid: dcd1b4eb76b964f40afe6c0a3ca65c82, type: 3}
Move: {x: 0, y: 0}
Look: {x: 0, y: 0}
Sprint: 0
Expand All @@ -222,7 +220,6 @@ MonoBehaviour:
m_PickupLocChild: {fileID: 1191881578848548316}
m_LeftHandContact: {fileID: 8336303498504233401}
m_RightHandContact: {fileID: 4756851392954789958}
m_HoldTransform: {fileID: 3820763517226122587}
m_InteractCollider: {fileID: 4881592427634173612}
m_MinTossForce: 500
m_MaxTossForce: 1000
Expand All @@ -239,8 +236,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Rigidbody: {fileID: 4745766379562620470}
m_PhysicsPlayerControllerSettings: {fileID: 11400000, guid: 1dd99ce80f3e54d03b20bf78d6ff2a40,
type: 2}
m_PhysicsPlayerControllerSettings: {fileID: 11400000, guid: 1dd99ce80f3e54d03b20bf78d6ff2a40, type: 2}
--- !u!114 &7543523986693376117
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -360,63 +356,51 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 378099091213283077}
m_Modifications:
- target: {fileID: 4653874547743315895, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 4653874547743315895, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_ProvidesContacts
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_Name
value: PigChef_RigSetup
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
- target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
Expand All @@ -425,44 +409,29 @@ PrefabInstance:
- {fileID: 363683212551861616, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: [{targetCorrespondingSourceObject: {fileID: 8353930243667998089,
guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}, insertIndex: -1, addedObject: {
fileID: 3050276823525430539}}]
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
insertIndex: -1
addedObject: {fileID: 3050276823525430539}
m_SourcePrefab: {fileID: 100100000, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
--- !u!136 &36137897785899347 stripped
CapsuleCollider:
m_CorrespondingSourceObject: {fileID: 4653874547743315895, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4085133075368149463 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!95 &7006295767383679619 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 2391092429025954919, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_CorrespondingSourceObject: {fileID: 4653874547743315895, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1191881578848548316 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5809618227429677880, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_CorrespondingSourceObject: {fileID: 5809618227429677880, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!138 &3522541554063944713 stripped
FixedJoint:
m_CorrespondingSourceObject: {fileID: 8139998925785744109, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_CorrespondingSourceObject: {fileID: 8139998925785744109, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3745480105526614893 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_CorrespondingSourceObject: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3050276823525430539
Expand All @@ -477,15 +446,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4f398d1c0abd4744eb035893ea7619cf, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &4085133075368149463 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4756851392954789958 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 150371580926074530, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_CorrespondingSourceObject: {fileID: 150371580926074530, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!95 &7006295767383679619 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 2391092429025954919, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8336303498504233401 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3721660875845472093, guid: d1d89ad5a0ed99e499fe819ca87ae4c8,
type: 3}
m_CorrespondingSourceObject: {fileID: 3721660875845472093, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
m_PrefabInstance: {fileID: 4617738848981348068}
m_PrefabAsset: {fileID: 0}

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

Loading