Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
277007a
Working countdown timer and score viewer
mfj4000 Mar 28, 2023
811bb09
+ scoreboard and timer implementation
mrtn4000 Mar 28, 2023
21a5aa6
PickUp
Crybak20 Apr 11, 2023
c0c925a
Update SampleScene.unity
Crybak20 Apr 11, 2023
75cb8ee
c
EmilEngberg Apr 11, 2023
7b3a321
spurgt
EmilEngberg Apr 11, 2023
2701709
Points and timer
EmilEngberg Apr 11, 2023
dff3e97
wtf???
EmilEngberg Apr 11, 2023
131d6d3
x
Crybak20 Apr 11, 2023
4ebb6f1
Merge branch 'Points-and-timer' into PickUp
EmilEngberg Apr 11, 2023
488043e
Update default-2022.dwlt
EmilEngberg Apr 11, 2023
0d3c6d9
et eller andet
EmilEngberg Apr 11, 2023
b9f21ef
Victim
Blomsgaard Apr 11, 2023
f8adc32
stashed changes thing thing
mrtn4000 Apr 11, 2023
ac45428
Victims
Blomsgaard Apr 11, 2023
402ac6c
idk
EmilEngberg Apr 11, 2023
0c5ea5d
Merge branch 'Points-and-timer' into PickUp-(merger)
EmilEngberg Apr 11, 2023
7a49417
PICK UP THE MEN
Crybak20 Apr 11, 2023
57c3ec1
Layout
Blomsgaard Apr 11, 2023
bdac6cf
Merge branch 'Points-and-timer' of https://github.com/EmilEngberg/Gam…
Blomsgaard Apr 11, 2023
31eb688
MainMenu
EmilEngberg Apr 11, 2023
1df0bf9
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
EmilEngberg Apr 11, 2023
bc56777
something
EmilEngberg Apr 11, 2023
5a1c43a
VictimSpawnWorks
Blomsgaard Apr 18, 2023
89b9d2d
Some more assets
Blomsgaard Apr 18, 2023
0516a28
hvad fuck er det her?
EmilEngberg Apr 18, 2023
96fbda2
Merge branch 'Points-and-timer' into PickUp-(merger)
EmilEngberg Apr 18, 2023
3ca3462
VictimSpawner
EmilEngberg Apr 18, 2023
9ac8ef6
SomeArt
Blomsgaard Apr 18, 2023
7aea5a4
HalloDerEmil
Blomsgaard Apr 18, 2023
1ffa109
PickUpPoints
Blomsgaard Apr 18, 2023
5bdb4bf
Moreassest
Blomsgaard Apr 18, 2023
775bccc
Added End screen 1 :3
mrtn4000 Apr 18, 2023
899bb34
PowerUps in the making
EmilEngberg Apr 25, 2023
ea0e8d3
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
EmilEngberg Apr 25, 2023
c88e0d7
Minor changes
Blomsgaard Apr 25, 2023
e114955
jfjf
Blomsgaard Apr 25, 2023
3244ebe
Ryd op i PlayerMovement
EmilEngberg Apr 25, 2023
32ddf80
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
EmilEngberg Apr 25, 2023
4b92828
Movement speed in water decreased
mrtn4000 Apr 25, 2023
c298986
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
mrtn4000 Apr 25, 2023
f6dfcb5
jfjf
Blomsgaard Apr 25, 2023
b51b18b
PowerUpBoost Done
EmilEngberg Apr 25, 2023
aec7ba0
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
EmilEngberg Apr 25, 2023
fc8b942
comments
mrtn4000 Apr 25, 2023
4de5fc2
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
mrtn4000 Apr 25, 2023
c846e9d
Kommentarer i mine dejlige scripts :)))
mrtn4000 Apr 25, 2023
6d3970a
Prefab?
Blomsgaard Apr 25, 2023
51ed386
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
Blomsgaard Apr 25, 2023
5ddaba6
nårya hva'fanden?
EmilEngberg Apr 25, 2023
fe1e24b
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
EmilEngberg Apr 25, 2023
a9a5fea
Victims noew move
Blomsgaard Apr 25, 2023
59cccab
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
Blomsgaard Apr 25, 2023
502d50a
Walk cycle works :)
mrtn4000 Apr 25, 2023
6606020
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
mrtn4000 Apr 25, 2023
1484cd1
Chnaged How the victims is saved
Blomsgaard Apr 25, 2023
0facbb5
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
Blomsgaard Apr 25, 2023
1f55113
With Level DEsign
Blomsgaard Apr 25, 2023
1c6b6c2
End screen done
EmilEngberg Apr 25, 2023
256ec37
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
EmilEngberg Apr 25, 2023
2ff762e
Merge idk?
EmilEngberg Apr 25, 2023
819cc01
More stuff
Blomsgaard Apr 25, 2023
082047d
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
Blomsgaard Apr 25, 2023
b06ccf1
Various fixes
EmilEngberg Apr 25, 2023
35010de
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
EmilEngberg Apr 25, 2023
70e25c6
some details
EmilEngberg Apr 25, 2023
5bbd616
Stuff
Blomsgaard Apr 25, 2023
2c358ad
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
Blomsgaard Apr 25, 2023
61865be
textbox
EmilEngberg Apr 25, 2023
0aa393a
YouWinScreen done and dusted (kinda)
mrtn4000 Apr 26, 2023
c89cbad
Alle tiles er fikset nu yay
mrtn4000 Apr 27, 2023
04c309f
Better UI (workinprogress)
EmilEngberg Apr 28, 2023
6dc3bca
Tutorial functionality done
EmilEngberg Apr 30, 2023
812c324
idk wtf isgoinon
EmilEngberg Apr 30, 2023
7540a0c
Withsound
Blomsgaard May 1, 2023
e21a916
PowerUp tutorial
EmilEngberg May 1, 2023
53493f9
victim balancing
mrtn4000 May 1, 2023
68f08e1
now everything is working :))
mrtn4000 May 1, 2023
347ad2c
text stuff
mrtn4000 May 1, 2023
528dad8
FixedLayout
Blomsgaard May 1, 2023
0372440
Scales
Blomsgaard May 1, 2023
f3c4c1d
UI tweak
mrtn4000 May 1, 2023
ac495dd
idk something
EmilEngberg May 1, 2023
b8384bf
Merge branch 'PickUp' of https://github.com/EmilEngberg/Game-Design-P…
EmilEngberg May 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified .DS_Store
Binary file not shown.
55 changes: 55 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
}
6 changes: 6 additions & 0 deletions .vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
842 changes: 842 additions & 0 deletions Assembly-CSharp.csproj

Large diffs are not rendered by default.

Binary file added Assets/.DS_Store
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Animation.meta

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

72 changes: 72 additions & 0 deletions Assets/Animation/BackIdle.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BackIdle
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: 9cfe9a15a9a30ca4bb16c7fa9be5f7bd, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: 9cfe9a15a9a30ca4bb16c7fa9be5f7bd, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Assets/Animation/BackIdle.anim.meta

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

72 changes: 72 additions & 0 deletions Assets/Animation/FrontFaceIdle.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FrontFaceIdle
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: 0966e4f76ca34254b961dd0387db23a6, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: 0966e4f76ca34254b961dd0387db23a6, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Assets/Animation/FrontFaceIdle.anim.meta

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

72 changes: 72 additions & 0 deletions Assets/Animation/LeftIdle.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LeftIdle
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: aafa23ac05f09a141b2235542e234526, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: aafa23ac05f09a141b2235542e234526, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Assets/Animation/LeftIdle.anim.meta

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

Loading