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

Develop to Main #48

Merged
merged 316 commits into from
Oct 10, 2021
Merged

Develop to Main #48

merged 316 commits into from
Oct 10, 2021

Conversation

Fueredoriku
Copy link
Collaborator

The moment we've all been waiting for, a complete first release!

This is a stable version on which all further development will be based on.

joachmak and others added 30 commits October 27, 2020 18:37
…the edge of the terrain, scales with terrain size
…panded detection radius for control over tower rotation.
…ll chain through every gameobject using healthscript within radius of eachother. Also fixed animation and model for the lightningtower.
Added HexGrid.GetEdgeCells which returns an array of HexCell's along …
ddabble and others added 27 commits October 4, 2021 11:03
The event subscription in `MenuInputController` is now done properly, using method references instead of anonymous delegates.

Also added some missing event unsubscriptions in `Enemy` and `BaseController`,
and removed the subscription to `HealthLogic.onDeath` in `PlaceholderEnemy`, as it's already being done in `Enemy.Awake()`.
…y by moving base related objects to same folder.
Merging in a placeholder animation for the lighningturret in addition to some clean up of directories and code.
Added grafic raycaster components to the UI menus
…me changes were neccesary to playerStateController in order to separate lifting in animations from lifting as a state-change. Also made some modificationsto turret-ui in to fix camera stutter and to work with the modified player-state. TLDR changed loads of stuff but the player model is implemented
Updated readme with article link
@SondreHus
Copy link
Collaborator

Looks fine to me™

Copy link
Collaborator

@ThomasJGabrielsen ThomasJGabrielsen left a comment

Choose a reason for hiding this comment

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

Minor changes only i see...

@Fueredoriku Fueredoriku merged commit 0669da7 into main Oct 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants