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.

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

Milestone 6 #249

Merged
merged 48 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
07c0efb
Add animated chip for future level design
Fueredoriku Aug 30, 2023
1ece21d
Merge pull request #223 from hackerspace-ntnu/feature/addtional-inter…
Fueredoriku Aug 31, 2023
c705f5a
👷(deps): Bump tibdex/github-app-token from 1.8.0 to 1.8.2
dependabot[bot] Sep 4, 2023
80c87f4
Merge pull request #224 from hackerspace-ntnu/dependabot/github_actio…
Fueredoriku Sep 6, 2023
9b014da
👷(deps): Bump tibdex/github-app-token from 1.8.2 to 2.0.0
dependabot[bot] Sep 11, 2023
39e1d2a
Merge pull request #225 from hackerspace-ntnu/dependabot/github_actio…
Fueredoriku Sep 11, 2023
31ee6e6
Created some platforms
karofmah Sep 21, 2023
ef4050b
👷(deps): Bump tibdex/github-app-token from 2.0.0 to 2.1.0
dependabot[bot] Sep 25, 2023
6d5b15d
Set required secrets as workflow parameters
ddabble Sep 25, 2023
5635adc
Merge pull request #234 from hackerspace-ntnu/dependabot/github_actio…
ddabble Sep 25, 2023
83e7e0c
initial structure of grandcanyon constructed
Sep 28, 2023
5465f14
Merge branch 'dev' of https://github.com/hackerspace-ntnu/Prosjekt-Sp…
karofmah Sep 28, 2023
63b6b1d
new iteration of grand canyon map constructed
Oct 1, 2023
2540c38
Made GiantFan and controller, made SuperFan - using GiantFanController
Oct 1, 2023
6a7fa66
added pillars, and a couple more housing
Oct 2, 2023
cde366f
Added a platform and a bridge
karofmah Oct 4, 2023
c37a787
Created deathbox prefab, some issues related to deathtext
Oct 5, 2023
c0c1782
Added bridges and platforms
karofmah Oct 5, 2023
10adf0b
created unity terrain, made all layers into meshes in blender
Oct 9, 2023
d708691
created unity terrain, turned the layers into meshes in blender
Oct 9, 2023
5b838d5
terrain created in unity, and layers set properly
Oct 9, 2023
cb53a84
small changes, forgot 1 part of layer2
Oct 9, 2023
3cef4f8
Added platform
karofmah Oct 10, 2023
1ce2301
Created and added script to platform for vertical movement
karofmah Oct 10, 2023
5f05cf0
Player may now travel vertically and horizontally with platforms
karofmah Oct 11, 2023
dc90779
Improved box collider size of platforms
karofmah Oct 12, 2023
bef82cc
Implemented variation of platform speed
karofmah Oct 12, 2023
c956e42
Platform movement is reversed upon player collision below
karofmah Oct 15, 2023
b21682d
Code clean up
karofmah Oct 15, 2023
f080c78
Improved code based on feedback
karofmah Oct 15, 2023
eb05139
UV-mapped the layers of the map, fixed so MenuController chooses rand…
Oct 15, 2023
737ae99
Renamed gate material
Oct 15, 2023
72d9397
Fixed indent in PlatformMovement.cs
karofmah Oct 15, 2023
6b460e4
Improved file and gameobject name
karofmah Oct 15, 2023
ad8455a
fixed some checkstyle in MainMatchController, DeathTriggerScript, Gia…
Oct 15, 2023
753567c
Merge pull request #243 from hackerspace-ntnu/feature/platform-movement
karofmah Oct 15, 2023
61d68c4
renamed new Material to Gate Background, debugging mode back to 5 sec…
Oct 16, 2023
f030281
Merge pull request #245 from hackerspace-ntnu/226-new-arena-grand-cre…
CraZyB1336 Oct 16, 2023
d4d6eec
Add fix for #228
Fueredoriku Oct 16, 2023
01a2329
Fix ddr not displaying screen with no lighting
Fueredoriku Oct 16, 2023
f70ab42
Merge pull request #247 from hackerspace-ntnu/fix/ddr-arrow
Fueredoriku Oct 17, 2023
cd24bfa
Feature/bidding improvements (#232)
Fueredoriku Oct 17, 2023
d1c37fc
Fix music fade, Fix volume levels, Add extra auctioneer talking
Fueredoriku Oct 18, 2023
8d5c1e6
Merge pull request #250 from hackerspace-ntnu/fix/audio
Fueredoriku Oct 19, 2023
6a5f64a
Merge branch 'main' of https://github.com/hackerspace-ntnu/Prosjekt-S…
karofmah Oct 19, 2023
37eff03
Merge branch 'dev' of https://github.com/hackerspace-ntnu/Prosjekt-Sp…
karofmah Oct 19, 2023
a118450
Changed map on ground level and added barrels on buildings
karofmah Oct 19, 2023
77ae575
Merge pull request #252 from hackerspace-ntnu/map-design
karofmah Oct 19, 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
9 changes: 8 additions & 1 deletion .github/workflows/_reusable_add-content-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ on:
description: "The name of one of the values of the project's (single select) 'Status' field, to set for the added project item"
required: true
type: string
secrets:
HACKERSPACE_BOT_APP_ID:
description: "The App ID of a GitHub organization app with read and write access to repository contents, issues and pull requests, and organization projects"
required: true
HACKERSPACE_BOT_APP_PEM:
description: "A private key for the app with ID HACKERSPACE_BOT_APP_ID"
required: true

jobs:
add_content:
Expand All @@ -41,7 +48,7 @@ jobs:
steps:
- name: Generate token
id: generate_token
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # v1.8.0
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
with:
app_id: ${{ secrets.HACKERSPACE_BOT_APP_ID }}
private_key: ${{ secrets.HACKERSPACE_BOT_APP_PEM }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label-release-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
- name: Generate token
id: generate_token
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # v1.8.0
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
with:
app_id: ${{ secrets.HACKERSPACE_BOT_APP_ID }}
private_key: ${{ secrets.HACKERSPACE_BOT_APP_PEM }}
Expand Down
8 changes: 8 additions & 0 deletions Assets/Animation/Auctioneer.meta

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

8 changes: 8 additions & 0 deletions Assets/Animation/Auctioneer/ArmHammer.meta

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

Loading