Final merge (!5) · Merge requests · Viktor Palmason / Double Trouble · GitLab

Dec 18, 2020
- Finally merged different branches manualy into one · 9f29f22d
  Stian Sørslett authored Dec 18, 2020
  
  9f29f22d
- Gave enemies more health and I increased the score to win the game · 6000cfc9
  Viktor Palmason authored Dec 18, 2020
  
  6000cfc9
- I implemented two end condition to the single player and made a GameOver UI #16 #20 · db1074ed
  Viktor Palmason authored Dec 18, 2020
  
  db1074ed
- reimported everything because the project had error, and i fixed a bug in the player movement · 5a308851
  Viktor Palmason authored Dec 18, 2020
  
  5a308851
- Fixed a flaw in the input and animation management, and gave the tiles and... · 02bd352d
  Viktor Palmason authored Dec 18, 2020
  
  Fixed a flaw in the input and animation management, and gave the tiles and ground a box collider to tell the player when it collides with it that it is grounded #16 #19
  02bd352d
- I tested the game after merging with viktor-test, and unity did some background changes due to that · 8d209ea5
  Viktor Palmason authored Dec 18, 2020
  
  8d209ea5
- Merge branch 'viktor-test' into viktor-develop · b407d4ff
  Viktor Palmason authored Dec 18, 2020
  
  b407d4ff
- The project has some errors and i had to reimport everything · 81302758
  Viktor Palmason authored Dec 18, 2020
  
  81302758
Dec 17, 2020
- I played the game and unity editor did some background changes · e4c9f471
  Viktor Palmason authored Dec 17, 2020
  
  e4c9f471
- Merge branch 'merging-branch' into viktor-test · b36af558
  Viktor Palmason authored Dec 17, 2020
  
  b36af558
- Unity editor did some background changes · 8426118e
  Viktor Palmason authored Dec 17, 2020
  
  8426118e
- The editor had some errors so I reimported everything and got it working again · 96c2763b
  Viktor Palmason authored Dec 17, 2020
  
  96c2763b
- Merge branch 'viktor-test' into viktor-develop · e6aa08ff
  Viktor Palmason authored Dec 17, 2020
  
  e6aa08ff
- The editor had some errors so I reimported everything and got it working again · bf5861a9
  Viktor Palmason authored Dec 17, 2020
  
  bf5861a9
- The editor had some errors so I reimported everything and got it working again · 8b3ea381
  Viktor Palmason authored Dec 17, 2020
  
  8b3ea381
- The editor had some errors so I reimported everything and got it working again · ab57b48c
  Viktor Palmason authored Dec 17, 2020
  
  ab57b48c
Dec 16, 2020
- Merge branch 'viktor-test' into viktor-develop · 697ab4ee
  Viktor Palmason authored Dec 16, 2020
  
  697ab4ee
- I improved the movement and jumping of the player and removed the Rigidbody on... · 974253fd
  Viktor Palmason authored Dec 16, 2020
  
  I improved the movement and jumping of the player and removed the Rigidbody on the player object. I refactored the PlayerControler script, and added audio when then enemy arms hit the player #16 #19
  974253fd
- Main menu scene · e997e1dc
  Stian Sørslett authored Dec 16, 2020
  
  e997e1dc
Dec 15, 2020
- Merge branch 'viktor-test' into viktor-develop · c6eb5b86
  Viktor Palmason authored Dec 15, 2020
  
  c6eb5b86
- Unity editor did some background changes · c44aa0ff
  Viktor Palmason authored Dec 15, 2020
  
  c44aa0ff
- The enemy now falls when it dies and that acts as his death animation and the... · 8fb8e10d
  Viktor Palmason authored Dec 15, 2020
  
  The enemy now falls when it dies and that acts as his death animation and the enemy has a new grunt audio that plays when it dies #16 #18
  8fb8e10d
Dec 14, 2020
- Unity editor did some background changes · c3e9f4c7
  Viktor Palmason authored Dec 14, 2020
  
  c3e9f4c7