Code

Milestone 6#249

Code

Merged

Fueredoriku merged 48 commits intomainhackerspace-ntnu/Red-Planet-Rampage:mainfrom devhackerspace-ntnu/Red-Planet-Rampage:devCopy head branch name to clipboardOct 19, 2023

+68,439-7,722

Commits

Commits on Aug 30, 2023

• Add animated chip for future level design

  Fueredoriku

  committed
  07c0efb

Commits on Aug 31, 2023

• Merge pull request #223 from hackerspace-ntnu/feature/addtional-interactables

  Show description for 1ece21d
  Fueredoriku

  authored
  1ece21d

Commits on Sep 4, 2023

• 👷(deps): Bump tibdex/github-app-token from 1.8.0 to 1.8.2

  Show description for c705f5a
  dependabot[bot]

  authored
  c705f5a

Commits on Sep 6, 2023

• Merge pull request #224 from hackerspace-ntnu/dependabot/github_actions/dev/tibdex/github-app-token-1.8.2

  Show description for 80c87f4
  Fueredoriku

  authored
  80c87f4

Commits on Sep 11, 2023

• 👷(deps): Bump tibdex/github-app-token from 1.8.2 to 2.0.0

  Show description for 9b014da
  dependabot[bot]

  authored
  9b014da

• Merge pull request #225 from hackerspace-ntnu/dependabot/github_actions/dev/tibdex/github-app-token-2.0.0

  Show description for 39e1d2a
  Fueredoriku

  authored
  39e1d2a

Commits on Sep 21, 2023

• Created some platforms

  karofmah

  committed
  31ee6e6

Commits on Sep 25, 2023

• 👷(deps): Bump tibdex/github-app-token from 2.0.0 to 2.1.0

  Show description for ef4050b
  dependabot[bot]

  authored
  ef4050b

• Set required secrets as workflow parameters

  Show description for 6d5b15d
  ddabble

  committed
  6d5b15d

• Merge pull request #234 from hackerspace-ntnu/dependabot/github_actions/dev/tibdex/github-app-token-2.1.0

  Show description for 5635adc
  ddabble

  authored
  5635adc

Commits on Sep 28, 2023

• initial structure of grandcanyon constructed

  

  Christopher Braathen

  committed
  83e7e0c

• Merge branch 'dev' of https://github.com/hackerspace-ntnu/Prosjekt-Spill-H22 into feature/crater-town-level-design

  karofmah

  committed
  5465f14

Commits on Oct 1, 2023

• new iteration of grand canyon map constructed

  

  Christopher Braathen

  committed
  63b6b1d

• Made GiantFan and controller, made SuperFan - using GiantFanController

  

  Christopher Braathen

  committed
  2540c38

Commits on Oct 2, 2023

• added pillars, and a couple more housing

  

  chrbraa

  committed
  6a7fa66

Commits on Oct 4, 2023

• Added a platform and a bridge

  karofmah

  committed
  cde366f

Commits on Oct 5, 2023

• Created deathbox prefab, some issues related to deathtext

  

  Christopher Braathen

  committed
  c37a787

• Added bridges and platforms

  karofmah

  committed
  c0c1782

Commits on Oct 9, 2023

• created unity terrain, made all layers into meshes in blender

  

  chrbraa

  committed
  10adf0b

• created unity terrain, turned the layers into meshes in blender

  

  chrbraa

  committed
  d708691

• terrain created in unity, and layers set properly

  

  chrbraa

  committed
  5b838d5

• small changes, forgot 1 part of layer2

  

  chrbraa

  committed
  cb53a84

Commits on Oct 10, 2023

• Added platform

  karofmah

  committed
  3cef4f8

• Created and added script to platform for vertical movement

  karofmah

  committed
  1ce2301

Commits on Oct 11, 2023

• Player may now travel vertically and horizontally with platforms

  karofmah

  committed
  5f05cf0

Commits on Oct 12, 2023

• Improved box collider size of platforms

  karofmah

  committed
  dc90779

• Implemented variation of platform speed

  karofmah

  committed
  bef82cc

Commits on Oct 15, 2023

• Platform movement is reversed upon player collision below

  karofmah

  committed
  c956e42

• Code clean up

  karofmah

  committed
  b21682d

• Improved code based on feedback

  karofmah

  committed
  f080c78

• UV-mapped the layers of the map, fixed so MenuController chooses random maps, Co-Authored by Fredrik

  

  Christopher Braathen

  committed
  eb05139

• Renamed gate material

  

  Christopher Braathen

  committed
  737ae99

• Fixed indent in PlatformMovement.cs

  karofmah

  committed
  72d9397

• Improved file and gameobject name

  karofmah

  committed
  6b460e4

• fixed some checkstyle in MainMatchController, DeathTriggerScript, GiantFanController, Added texture to terrain, added additional directional light inside the map gameobject

  

  Christopher Braathen

  committed
  ad8455a

• Merge pull request #243 from hackerspace-ntnu/feature/platform-movement

  Show description for 753567c
  karofmah

  authored
  753567c

Commits on Oct 16, 2023

• renamed new Material to Gate Background, debugging mode back to 5 seconds. Cleaned up the GrandCanyon scene

  

  Christopher Braathen

  committed
  61d68c4

• Merge pull request #245 from hackerspace-ntnu/226-new-arena-grand-crevice

  Show description for f030281
  CraZyB1336

  authored
  f030281

• Add fix for #228

  Fueredoriku

  committed
  d4d6eec

• Fix ddr not displaying screen with no lighting

  Fueredoriku

  committed
  01a2329

Commits on Oct 17, 2023

• Merge pull request #247 from hackerspace-ntnu/fix/ddr-arrow

  Show description for f70ab42
  Fueredoriku

  authored
  f70ab42

• Feature/bidding improvements (#232)

  Show description for cd24bfa
  Fueredoriku

  authored
  cd24bfa

Commits on Oct 18, 2023

• Fix music fade, Fix volume levels, Add extra auctioneer talking

  Show description for d1c37fc
  Fueredoriku

  committed
  d1c37fc

Commits on Oct 19, 2023

• Merge pull request #250 from hackerspace-ntnu/fix/audio

  Show description for 8d5c1e6
  Fueredoriku

  authored
  8d5c1e6

• Merge branch 'main' of https://github.com/hackerspace-ntnu/Prosjekt-Spill-H22 into local-dev

  karofmah

  committed
  6a5f64a

• Merge branch 'dev' of https://github.com/hackerspace-ntnu/Prosjekt-Spill-H22 into local-dev

  karofmah

  committed
  37eff03

• Changed map on ground level and added barrels on buildings

  karofmah

  committed
  a118450

• Merge pull request #252 from hackerspace-ntnu/map-design

  Show description for 77ae575
  karofmah

  authored
  77ae575