Skip to content

Commit 0a76201

Browse files
committed
Remove PlayerCameraOverrides, it's bullshit
1 parent 0dd4e99 commit 0a76201

File tree

10 files changed

+1516
-518
lines changed

10 files changed

+1516
-518
lines changed

Assets/prefabs/player/Drone.prefab

Lines changed: 58 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
{
6161
"__type": "Facepunch.HealthComponent",
6262
"__guid": "4078a8a3-0850-481a-98a2-b8781bd82417",
63-
"IsGodMode": false
63+
"IsGodMode": false,
64+
"MaxHealth": 100
6465
},
6566
{
6667
"__type": "Facepunch.DroneSounds",
@@ -80,8 +81,10 @@
8081
"Gravity": true,
8182
"LinearDamping": 0,
8283
"Locking": {},
84+
"MassCenterOverride": "0,0,0",
8385
"MassOverride": 0,
8486
"MotionEnabled": true,
87+
"OverrideMassCenter": false,
8588
"RigidbodyFlags": 0,
8689
"StartAsleep": false
8790
},
@@ -91,7 +94,8 @@
9194
"Center": "0,0,0",
9295
"IsTrigger": false,
9396
"Scale": "40,40,10",
94-
"Static": false
97+
"Static": false,
98+
"SurfaceVelocity": "0,0,0"
9599
},
96100
{
97101
"__type": "Facepunch.PawnCameraController",
@@ -100,9 +104,9 @@
100104
"_type": "gameobject",
101105
"go": "4599308c-acab-4e57-8a3e-8fc83088350d"
102106
},
103-
"DefaultPlayerCameraPrefab": {
107+
"CameraObject": {
104108
"_type": "gameobject",
105-
"prefab": "prefabs/player/cameras/default_player_camera.prefab"
109+
"go": "012209ae-dc97-482a-9c4b-dbc1f738fc27"
106110
}
107111
}
108112
],
@@ -121,6 +125,20 @@
121125
"BodyGroups": 18446744073709551615,
122126
"CreateBoneObjects": true,
123127
"Model": "entities/drone/drone.vmdl",
128+
"Morphs": {},
129+
"Parameters": {
130+
"bools": {},
131+
"ints": {},
132+
"floats": {},
133+
"vectors": {},
134+
"rotations": {}
135+
},
136+
"RenderOptions": {
137+
"GameLayer": true,
138+
"OverlayLayer": false,
139+
"BloomLayer": false,
140+
"AfterUILayer": false
141+
},
124142
"RenderType": "On",
125143
"Tint": "1,1,1,1",
126144
"UseAnimGraph": true
@@ -158,14 +176,48 @@
158176
"Flags": 0,
159177
"Name": "Boom",
160178
"Position": "12.49848,0,0",
161-
"Enabled": true
179+
"Enabled": true,
180+
"Children": [
181+
{
182+
"__guid": "012209ae-dc97-482a-9c4b-dbc1f738fc27",
183+
"Flags": 0,
184+
"Name": "Camera",
185+
"Enabled": true,
186+
"__Prefab": "prefabs/player/cameras/default_player_camera.prefab",
187+
"__PrefabVariables": {}
188+
}
189+
]
162190
}
163191
],
164-
"__variables": []
192+
"__variables": [],
193+
"__properties": {
194+
"FixedUpdateFrequency": 50,
195+
"MaxFixedUpdates": 5,
196+
"NetworkFrequency": 30,
197+
"NetworkInterpolation": true,
198+
"PhysicsSubSteps": 1,
199+
"ThreadedAnimation": true,
200+
"TimeScale": 1,
201+
"UseFixedUpdate": true,
202+
"Metadata": {},
203+
"NavMesh": {
204+
"Enabled": false,
205+
"IncludeStaticBodies": true,
206+
"IncludeKeyframedBodies": true,
207+
"EditorAutoUpdate": true,
208+
"AgentHeight": 64,
209+
"AgentRadius": 16,
210+
"AgentStepSize": 18,
211+
"AgentMaxSlope": 40,
212+
"ExcludedBodies": "",
213+
"IncludedBodies": ""
214+
}
215+
}
165216
},
166217
"ShowInMenu": false,
167218
"MenuPath": null,
168219
"MenuIcon": null,
220+
"DontBreakAsTemplate": false,
169221
"ResourceVersion": 1,
170222
"__references": [
171223
"rust.drone#26713"

Assets/prefabs/player/cameras/default_player_camera.prefab

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"ExposureMethod": "RGB",
7171
"MaximumExposure": 2,
7272
"MinimumExposure": 1,
73-
"Mode": "ACES",
73+
"Mode": "ReinhardJodie",
7474
"Rate": 1
7575
},
7676
{
@@ -103,14 +103,36 @@
103103
}
104104
],
105105
"Children": [],
106-
"__variables": []
106+
"__variables": [],
107+
"__properties": {
108+
"FixedUpdateFrequency": 50,
109+
"MaxFixedUpdates": 5,
110+
"NetworkFrequency": 30,
111+
"NetworkInterpolation": true,
112+
"PhysicsSubSteps": 1,
113+
"ThreadedAnimation": true,
114+
"TimeScale": 1,
115+
"UseFixedUpdate": true,
116+
"Metadata": {},
117+
"NavMesh": {
118+
"Enabled": false,
119+
"IncludeStaticBodies": true,
120+
"IncludeKeyframedBodies": true,
121+
"EditorAutoUpdate": true,
122+
"AgentHeight": 64,
123+
"AgentRadius": 16,
124+
"AgentStepSize": 18,
125+
"AgentMaxSlope": 40,
126+
"ExcludedBodies": "",
127+
"IncludedBodies": ""
128+
}
129+
}
107130
},
108131
"ShowInMenu": false,
109132
"MenuPath": null,
110133
"MenuIcon": null,
111134
"DontBreakAsTemplate": false,
112135
"ResourceVersion": 1,
113136
"__references": [],
114-
"IsValid": true,
115137
"__version": 1
116138
}

Assets/prefabs/player/cameras/player_camera_with_aces.prefab

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)