Skip to content
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

Jump to bottom

Feature/nga 2023 #170

Merged
merged 8 commits into from
Oct 23, 2024
Merged

Feature/nga 2023 #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c13762
Tweaked skeleton chase distances and improved galleryInput.
Fueredoriku Mar 12, 2023
3ddc4e7
Fixed bug where player would respawn infintely at gameover.
Fueredoriku Mar 12, 2023
3b94780
Made turretcontrol be first-come first-served to avoid confusing beha…
Fueredoriku Mar 12, 2023
10d0e4c
Added toggle-able menu and improved base death animation.
Fueredoriku Mar 12, 2023
e969c1f
Added keyboard tutorial to pause menu.
Fueredoriku Mar 12, 2023
4f3f6e1
Added another small control tutorial at start of round.
Fueredoriku Mar 12, 2023
9c87ed0
Fixed various bugs related to playerUI menu state toggle.
Fueredoriku Mar 12, 2023
20396fd
Added short intro scene. Updated ratio of gamepad texture.
Fueredoriku Mar 12, 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
30 changes: 30 additions & 0 deletions Assets/InputSettings/PlayerControls.inputactions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@
"expectedControlType": "",
"processors": "",
"interactions": ""
},
{
"name": "Build",
"type": "Button",
"id": "0f32dc60-99a7-4bfe-b879-e62dd5de833d",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
}
],
"bindings": [
Expand Down Expand Up @@ -462,6 +470,28 @@
"action": "Join",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "36179d5c-e459-48a7-b483-65037e386747",
"path": "<Gamepad>/buttonWest",
"interactions": "",
"processors": "",
"groups": "Controller",
"action": "Build",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "1d81c03c-c3f5-49cf-b2a1-5dc6c38f9775",
"path": "<Keyboard>/space",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Build",
"isComposite": false,
"isPartOfComposite": false
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion Assets/Materials/Base/BaseMat2.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Material:
m_TexEnvs: []
m_Floats:
- BaseColor: 1.52
- Charge_Percent: 0.015789473
- Charge_Percent: 0.060526315
m_Colors:
- Color_Albedo: {r: 0, g: 0.40026736, b: 1, a: 0}
- EmissionColor: {r: 0, g: 0.2518901, b: 2.091783, a: 0}
Expand Down
8 changes: 8 additions & 0 deletions Assets/Movies.meta
View file
Open in desktop

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

Binary file added Assets/Movies/preview-movie.mp4
View file
Open in desktop
Binary file not shown.
18 changes: 18 additions & 0 deletions Assets/Movies/preview-movie.mp4.meta
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Assets/Prefabs/Enemy/Enemies/Skeleton.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ SphereCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 3.5
m_Radius: 3
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &2127989831378458320
GameObject:
Expand Down
223 changes: 218 additions & 5 deletions Assets/Prefabs/UI/PauseMenu.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7578182136137157790}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -767,6 +767,7 @@ RectTransform:
m_Children:
- {fileID: 5820653049465747186}
- {fileID: 8972834855378586841}
- {fileID: 8617435496792757602}
- {fileID: 1025107726187060797}
m_Father: {fileID: 1663500158680934234}
m_RootOrder: 1
Expand Down Expand Up @@ -1007,6 +1008,140 @@ MonoBehaviour:
m_EditorClassIdentifier:
buttonUp: {fileID: 1270107825}
buttonDown: {fileID: 1270107824}
--- !u!1 &2658137231285782986
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7440366373048708404}
- component: {fileID: 1207562616890494406}
- component: {fileID: 4291664164171672153}
m_Layer: 5
m_Name: Text (TMP) (6)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7440366373048708404
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2658137231285782986}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8972834855378586841}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 71, y: 109}
m_SizeDelta: {x: 118.64328, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1207562616890494406
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2658137231285782986}
m_CullTransparentMesh: 0
--- !u!114 &4291664164171672153
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2658137231285782986}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Build
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2}
m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &2790399334053288318
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1443,7 +1578,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 198, y: 204}
m_AnchoredPosition: {x: 197.6, y: 236.1}
m_SizeDelta: {x: 118.64328, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6458990605570123512
Expand Down Expand Up @@ -1474,7 +1609,9 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Sell
m_text: 'Sell/

Cancel'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f027972298acae14e978368df0ba88f4, type: 2}
m_sharedMaterial: {fileID: -1103543631157091081, guid: f027972298acae14e978368df0ba88f4, type: 2}
Expand Down Expand Up @@ -1513,7 +1650,7 @@ MonoBehaviour:
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacing: -63.67
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
Expand Down Expand Up @@ -1570,14 +1707,15 @@ RectTransform:
m_GameObject: {fileID: 6447248897094837798}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.57740825, y: 0.45, z: 1}
m_Children:
- {fileID: 6498509629497458895}
- {fileID: 7044538584297769839}
- {fileID: 396272782760415814}
- {fileID: 4609986345755607815}
- {fileID: 1607908488173965798}
- {fileID: 7259141408481325334}
- {fileID: 7440366373048708404}
m_Father: {fileID: 7578182136137157790}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1624,6 +1762,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7010104617340412742
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8617435496792757602}
- component: {fileID: 8892932716803222408}
- component: {fileID: 2406296427758806801}
m_Layer: 5
m_Name: Instructions (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8617435496792757602
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7010104617340412742}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.57740825, y: 0.6624, z: 1}
m_Children: []
m_Father: {fileID: 7578182136137157790}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8892932716803222408
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7010104617340412742}
m_CullTransparentMesh: 0
--- !u!114 &2406296427758806801
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7010104617340412742}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.7176471}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b3c096a45208aba4793e2919c3d7cbee, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7759117074323814611
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading