Skip to content

Final Build - #102

Merged
AudunBeck merged 108 commits into
masterfrom
AudunCleanUp
May 21, 2019
Merged

Final Build#102
AudunBeck merged 108 commits into
masterfrom
AudunCleanUp

Conversation

@AudunBeck

@AudunBeck AudunBeck commented May 21, 2019

Copy link
Copy Markdown
Owner

No description provided.

Beck and others added 30 commits May 3, 2019 10:39
Beck
Small changes, trying to add knockback to fire.
fc4bb18
@Crossea
Reworked Fire2 + spawne VFX
6a4506d 
FireAbility2 is reworked to contain only self-produced assets.
VFX for spawning has been made.
Beck
Wind can now fire downards, to implement animations.
2c2aa98
Beck
Added wind down animations
1b6d4d2 
Potential bug in UE4? the last section of the montage is registred as NONE even tho it is registred as PowerD
Beck
New dash and fixed up redirections
d3819ad
Beck
Added hit animation, but has to be balanced
8e5c9e0
@Crossea
Particle spawn-indicators and particle buttonHover
c5010e8
Beck
New water run animation
c61f770 
Fixed the forced T-posing.
Beck
Added new water counter animation and fixed for timing.
cddfa04
Beck
Added new rock wall animation and fixed timing.
e81b568
Beck
Added knockback to rock element ability1
555f192 
Also tweaked numbers of fire's knockbacks.
Beck
Merge branch 'AudunBugSmashing' into oliver_level_assets_001
37e24de
Audun Beck
Merge pull request #87 from AudunBeck/oliver_level_assets_001
5759ff2 
Oliver level assets 001
Beck
Added delay on spawner
05c80a8
Beck
Small tweaks to spawnimpact
2d1df94
Beck
Rock can now instantly interupt its charge animation during loop, and…
07b4c1e 
… can walk while charging
Beck
New rock punch part animation
54fe915
Beck
New fire anims
3e21f44
Beck
Small tori tweak
0bb4912
Beck
Turned knockback of wind 2
fb68e18
Beck
Ready for new tables
ff044a2
Beck
Set up for datatables
929e180
Beck
Set up new datatables, missing wind fully.
13990bb
Beck
New fire kick animation, also opens up for another kick.
ffcf1de
Beck
New shoulder charge for rock 1
4d0fba0
@MorganHagg
Cleaned up some windelement names
8f876a3 
Changed names of Wind elements variable names to be in line with our conventions
@MorganHagg
refactoring v1
87298cb
@MorganHagg
Refactoring V2
16bf48a
@MorganHagg
Refactoring V3
d9c51ed
@MorganHagg
Refactor V4
9a36daa
Audun Beck and others added 28 commits May 18, 2019 16:09
Audun Beck
Merge pull request #97 from AudunBeck/MorganMenuFix2
9666970 
Fixed lastFocusedButton
Beck
Fixed small things
70e0580
Beck
Fixed focus
c6dfab5
Beck
Merge branch 'AudunBugSmashing' into oliver_level_assets_001
9b6f79c
Audun Beck
Merge pull request #99 from AudunBeck/oliver_level_assets_001
7aa2a12 
Oliver level assets 001
Beck
Fixed wind particle direction
756290d
Beck
Fixed particles for fire 2
1ad638f
Beck
Fixed wind element datatable and hit particle direction
cfd312d
Beck
Player spawn particles
2131fe9
Beck
Added new particle to water counter attack
ff6fc46
Beck
Small fixes, made pixelated postprocessing material.
bfb8edc
Beck
Started setting up 3d UI for health and points
69a753c
Beck
Fully set up ui
8a7b062
Beck
Fix bug, i think
e3340cf 
Didnt do anything but it worked.
@MorganHagg
Added some comments
76887eb
Beck
Set up UI for different amounts
6faec46
Audun Beck
Merge pull request #100 from AudunBeck/MorganCommentCPP
d6dad86 
Added some comments
Beck
Removed unused and moved files.
a8152ae
Beck
Removed outline, changed color of startmenu to white
dfaf6fd
Beck
Removed files not in used, and moved files around for cleaning.
61cdf57
Beck
Cleaned up more in files.
e53d0a6
@Crossea
Clean-up
d45b350
Beck
Small cleanup
996d462
@Crossea
CleanUp
0f180be 
Names changed
Quite a few files moved to correct folders
A couple of unused files deleted
Beck
Merge branch 'AudunCleanUp' into oliverCleanUp
ac59789
Beck
Small test
5148843
Audun Beck
Merge pull request #101 from AudunBeck/oliverCleanUp
612a60c 
Oliver clean up
Beck
Removed old print
4ab8399
@AudunBeck
AudunBeck merged commit f0153c3 into master May 21, 2019
@AudunBeck
AudunBeck deleted the AudunCleanUp branch May 21, 2019 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@AudunBeck @Crossea @MorganHagg