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

Spillexpo Release #325

Merged
merged 125 commits into from
Nov 27, 2023
Merged

Spillexpo Release #325

merged 125 commits into from
Nov 27, 2023

Conversation

Fueredoriku
Copy link
Contributor

@Fueredoriku Fueredoriku commented Nov 26, 2023

Needs #347 before merge

Known issues:

  • Player input changing after weapon select screen bug

ThomasJGabrielsen and others added 30 commits April 29, 2023 13:45
WantedPoster.cs now sets text instead of using SetActive, thus text no longer moves around when new elements appear.
…ring

# Conflicts:
#	Assets/Scenes/CraterTown.unity
Issues with assigning delegates in matchController before onRoundStart triggers is the reason for the new ienumerate
Adjusted Scoreboard
-Scene added behind main menu
-Camera moves when options button is clicked
-Camera Moves back to original view when back button is clicked
This makes his magnificent voice audible.
Replace First with FirstOrDefault to avoid exception when there's no one else alive.
- Add invisible plane colliders as boundaries
- Fix some props that intersect with buildings
* Added individual planes as a model layer, it has no other purpose than looks. Also made grand canyon static except for the giant fan children

* added giant fan model with animation

* layer remodeled, improved

* modeled layer 2 and layer 3

* modeled metal pillar and added particles to fans

---------

Co-authored-by: Christopher Braathen <chrbraa@stud.ntnu.no>
…r-voicelines

Normalize auctioneer voicelines
…lanet-rampage

Add new battle theme: Red Planet Rampage
The popup images now reside in the popup prefab, which means much less
effort is required to add more images.
toberge and others added 18 commits November 15, 2023 21:31
- Missing from item
- Insane firerate
- Not added to staticinfo
* Add audio to chips + auctioneer sale, make colonel less likely

* Add curly curtains to bidding scene

---------

Co-authored-by: Tore Bergebakken <tore.bergebakken@gmail.com>
…ring

# Conflicts:
#	Assets/Prefabs/Gamestate/MatchManager.prefab
Changed reference to deprecated class
* added building models to crater town scene
---------

Co-authored-by: Christopher Braathen <chrbraa@stud.ntnu.no>
Co-authored-by: Fredrik Lillemoen Eiding <fueredoriku@gmail.com>
* Add seeker model.

- Tweaked some stats
- Cleaned up some UI elements
- Provide direction of shot in damage info
- Use this to knock the players' torso back (more complex behaviour
  could be added later, but this works well enough)
- Determine knockback force based on damage (this works well for
  explosions too)
- Shotgun projectile count
- Projectile speed for all barrels, particularily the cannon which has
  reduced speed (dunno what to do with the hitscan barrels here)
100 units is just enough to hit things on the other side of both maps, as long as they aren't mere dots in the distance. Should be sufficient.

- Refactored collision sample calculation to let us specify samples per unit distance instead of total sample amount, so that one only needs to increase the max distance in order to actually increase the range.
- Increased the ranges of all hitscan weapons, including the shotgun.
@ghost ghost added the new release Pull requests from another branch (usually `dev`) into the `main` branch label Nov 26, 2023
@Fueredoriku Fueredoriku linked an issue Nov 27, 2023 that may be closed by this pull request
@Fueredoriku Fueredoriku self-assigned this Nov 27, 2023
toberge and others added 2 commits November 27, 2023 14:13
@Fueredoriku Fueredoriku marked this pull request as ready for review November 27, 2023 15:34
…tats

Make displayed stats match actual stats and adjust ranges
Copy link
Contributor

@toberge toberge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's-a-go! :shipit:

@Fueredoriku Fueredoriku merged commit 7df03b3 into main Nov 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new release Pull requests from another branch (usually `dev`) into the `main` branch
Projects
Status: Done 🎉
Development

Successfully merging this pull request may close these issues.

Fix README + release
7 participants