search

PlaceholderGames / 2022-yr1-team-strayplay

Second CS1S464 Game
0 stars 0 forks source link

Merge #34

Closed KyleChaplin closed 2 years ago

KyleChaplin commented 2 years ago

I've merged "player", "levelObjects", "ui" and "levelDesign". I have also removed the VR plugin from the project so we shouldn't 🤞 get the steam VR popup anymore.

The merger will be uploaded to a branch before we merge it with main because we don't want main to have anything broken on it.

There are a few issues.

  1. The slime's bounce after landing does not work
  2. The player branch included different movements for both slime and rock - the movement changes are not applied when going into any of the 'zones' from the levelObjects branch.
  3. Fans shoot the player far too high into the air (fine-tuning).
  4. When switching the user has to press "F" twice before it actually switches.
  5. Destructible objects have an unknown error (Yogi has an idea already on how to fix this)

The UI needs more on it and I will continue to do this under the "ui" branch.

josh-hole commented 2 years ago

what branch did you merge it to?

KyleChaplin commented 2 years ago

@30028170 @josh-hole Could you just make a note here of what has been fixed so far when you have a chance, please? :)

josh-hole commented 2 years ago

Currently I have fixed the cooldown being broken, and the zones not updating your movement speed

These are all currently in my level objects branch, since I had a bit of an issue merging recentBuild with other branches

KyleChaplin commented 2 years ago

That's great! As long as we ensure we have something to show by Monday. It'd be great to have the starter level working with the new movement if that's possible. I'll @ Marco in discord now just to ask.

KyleChaplin commented 2 years ago

All issues stated above have been fixed.