Compare commits

...

42 Commits

Author SHA1 Message Date
Logan Simic 724963a4be holy tracks 2025-05-09 10:13:40 +10:00
Logan Simic b0b4fa1bde renaming and organisation + adding test train for fitting 2025-05-09 10:10:22 +10:00
Logan Simic cc63ea40c0 meow 2025-05-09 10:05:39 +10:00
Logan Simic 696cfd3df9 Merge pull request 'Upload files to "Assets/Models"' (#41) from Josh/HatCatter:master into master
Reviewed-on: #41
2025-05-09 00:05:22 +00:00
Josh b1315ffdb3 Upload files to "Assets/Models" 2025-05-09 00:03:55 +00:00
Logan Simic cc537c8d1e new version of SpencerSt 2025-05-06 11:09:07 +10:00
Logan Simic 3124a2f15f add lower platforms 2025-05-06 10:56:33 +10:00
Logan Simic 0ac073b2bd more work on SpencerSt 2025-05-06 10:38:58 +10:00
Logan Simic 2eafffd440 f 2025-05-05 15:03:20 +10:00
Logan Simic 017cf35d5c meow 2025-05-05 14:57:24 +10:00
Logan Simic b2ade2f756 fix a bunch of errors 2025-05-05 14:50:04 +10:00
Logan Simic 788dba1299 worked on a new platform + renamed the AI target in the demo 2025-05-05 14:29:41 +10:00
Logan Simic b55404569f terr 2025-05-05 14:13:14 +10:00
Logan Simic b678ab051c ai test 2025-05-05 13:39:22 +10:00
Logan Simic a00dcdcac4 the moving stairs work!!!!! 2025-05-05 13:19:02 +10:00
Logan Simic 6a53c621a2 meow 2025-05-05 11:07:54 +10:00
Logan Simic bdd9d135dd revert a89861da4c
revert arg
2025-05-05 01:05:57 +00:00
Logan Simic bee9306c7c ws 2025-05-02 13:36:52 +10:00
Logan Simic 2f8e77ef0f code comment 2025-05-02 12:44:00 +10:00
Logan Simic a1f6691e99 f 2025-05-02 12:41:22 +10:00
Logan Simic 2a469a2b44 add a lil message to this one 2025-05-02 12:39:00 +10:00
Logan Simic f8a4bcf938 oh my god 2025-05-02 12:36:54 +10:00
Logan Simic c3ea8ca629 trying to get this to work, not my best work 2025-05-02 12:35:32 +10:00
Logan Simic e5a643b1e3 oops 2025-05-02 12:05:08 +10:00
Logan Simic 514c83c7e0 added a test object for high speed trains 2025-05-01 12:54:06 +10:00
Logan Simic 7ae7724b90 look, im working on it 2025-05-01 12:53:03 +10:00
Logan Simic f25cc4982a change the Volume Slider 2025-05-01 12:52:42 +10:00
Logan Simic c78e43756c high speeeeed train code 2025-05-01 12:12:06 +10:00
Logan Simic 73c7dc6012 fix the volume slider 2025-05-01 12:03:50 +10:00
Logan Simic 2d1678b999 reorganisation of game assets 2025-05-01 11:09:42 +10:00
Logan Simic 392fd8820a readme stuff 2025-05-01 11:00:59 +10:00
Logan Simic 8ecd95ae6e Add README.md 2025-05-01 00:59:15 +00:00
Logan Simic d1e7e594b1 comment out useless code 2025-04-30 13:07:50 +10:00
Logan Simic 04a874fe8c proper main menu volume 2025-04-30 13:03:49 +10:00
Logan Simic c4a8a24503 scripting of the volume now works 2025-04-30 13:00:38 +10:00
Logan Simic 2e3d6de8cf start working on a settings menu, and global volume settings 2025-04-30 12:47:36 +10:00
Logan Simic 22ac783d14 i will do particles later 2025-04-30 11:55:13 +10:00
Logan Simic eb1e827f61 start work on particles 2025-04-30 10:58:56 +10:00
Logan Simic a89861da4c arg 2025-03-31 13:45:26 +11:00
Logan Simic 6d21e0d442 death on the tracks! and changes to DevOps configurations 2025-03-31 13:35:55 +11:00
Logan Simic ea1bc6ad4a adjust platform 2025-03-31 13:24:08 +11:00
Logan Simic fbd01b20cb duplicate to other side of platform 2025-03-31 13:19:45 +11:00
278 changed files with 40318 additions and 3160 deletions

8
Assets/Audio.meta Executable file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bebe0aa7c6c201910bf7c04ee7ddcf0a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

70
Assets/Audio/MainMixer.mixer Executable file
View File

@ -0,0 +1,70 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!241 &24100000
AudioMixerController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MainMixer
m_OutputGroup: {fileID: 0}
m_MasterGroup: {fileID: 24300002}
m_Snapshots:
- {fileID: 24500006}
m_StartSnapshot: {fileID: 24500006}
m_SuspendThreshold: -80
m_EnableSuspend: 1
m_UpdateMode: 0
m_ExposedParameters:
- guid: b4d7df62637baa532b9971c4bc7ea1d3
name: Master
m_AudioMixerGroupViews:
- guids:
- 1865711c82ac51dbd9404e9503b852d5
name: View
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 24500006}
--- !u!243 &24300002
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Master
m_AudioMixer: {fileID: 24100000}
m_GroupID: 1865711c82ac51dbd9404e9503b852d5
m_Children: []
m_Volume: b4d7df62637baa532b9971c4bc7ea1d3
m_Pitch: 602d0c0ff28d3b0928f1f906528815a8
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400004}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &24400004
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: b8b27fc7a96fb827682967aed4f306ce
m_EffectName: Attenuation
m_MixLevel: 93afe0924a6ec140386a0aa5d4067d7b
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!245 &24500006
AudioMixerSnapshotController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Snapshot
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: cbb9659e4f96c9a0a96435555f19a895
m_FloatValues: {}
m_TransitionOverrides: {}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 98bd928c1e9f4161685cc606b2ba49a5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 24100000
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Chipped_Stones_beside_Rail_Tracks.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 229 KiB

After

Width:  |  Height:  |  Size: 229 KiB

0
Assets/Chipped_Stones_beside_Rail_Tracks.jpg.meta Normal file → Executable file
View File

0
Assets/Editor.meta Normal file → Executable file
View File

0
Assets/Editor/SimpleCustomEditor.cs Normal file → Executable file
View File

0
Assets/Editor/SimpleCustomEditor.cs.meta Normal file → Executable file
View File

0
Assets/Editor/SimpleCustomEditor.uss Normal file → Executable file
View File

0
Assets/Editor/SimpleCustomEditor.uss.meta Normal file → Executable file
View File

0
Assets/Editor/SimpleCustomEditor.uxml Normal file → Executable file
View File

0
Assets/Editor/SimpleCustomEditor.uxml.meta Normal file → Executable file
View File

0
Assets/InputSystem_Actions.inputactions Normal file → Executable file
View File

0
Assets/InputSystem_Actions.inputactions.meta Normal file → Executable file
View File

0
Assets/Materials.meta Normal file → Executable file
View File

0
Assets/Materials/Chipped_Stones_beside_Rail_Tracks.mat Normal file → Executable file
View File

View File

View File

@ -134,8 +134,8 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
- _Color: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
- _BaseColor: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1}
- _Color: {r: 0.16981128, g: 0.16981128, b: 0.16981128, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

0
Assets/FloorMat.mat → Assets/Materials/FloorMat.mat Normal file → Executable file
View File

View File

0
Assets/Models.meta Normal file → Executable file
View File

13606
Assets/Models/ComengTest1.obj Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,107 @@
fileFormatVersion: 2
guid: 9377740b2022f08dea76d4c389219379
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Models/StairLiftThing.obj Normal file → Executable file
View File

0
Assets/Models/StairLiftThing.obj.meta Normal file → Executable file
View File

0
Assets/Models/gun.obj Normal file → Executable file
View File

0
Assets/Models/gun.obj.meta Normal file → Executable file
View File

8
Assets/Models/terrain.meta Executable file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f21737144479d6cd88823aa60a184255
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Models/tracks.obj Normal file → Executable file
View File

2
Assets/Models/tracks.obj.meta Normal file → Executable file
View File

@ -35,7 +35,7 @@ ModelImporter:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
addColliders: 1
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1

0
Assets/Models/underTrackRocks-Var1.obj Normal file → Executable file
View File

0
Assets/Models/underTrackRocks-Var1.obj.meta Normal file → Executable file
View File

0
Assets/ModularFirstPersonController.meta Normal file → Executable file
View File

0
Assets/ModularFirstPersonController/DemoScene.meta Normal file → Executable file
View File

View File

View File

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Some files were not shown because too many files have changed in this diff Show More