Skip to content
Snippets Groups Projects

Repository graph

You can move around the graph by using the arrow keys.
Select Git revision
  • New-Main protected
  • Stian-Working
  • final-merge
  • master default protected
  • merging-branch
  • multiplayer
  • viktor-develop
  • viktor-test
8 results
Created with Raphaël 2.2.019Dec18171615141210983219Nov18161312107530Oct24231029Sep24Replace Viktor-Individual.pdfmastermasterReplace Viktor-Individual.pdfReplace Viktor-Individual.pdfUpload New FileUpload New FileUpload the Gameplay videoUpload the Video showing our code that is tightly integrated with the game engineAdded a new directory for storing the Gameplay video and the Editor videoStians Individual DiscussionI had to reimport everything becuase their were some errors with the editor, and then i play tested the gameTested the gameviktor-developviktor-developadded audiosource to main menu[CMerge branch 'final-merge' into 'master'Finally merged different branches manualy into onefinal-mergefinal-mergeGave enemies more health and I increased the score to win the gameI implemented two end condition to the single player and made a GameOver UI #16 #20reimported everything because the project had error, and i fixed a bug in the player movementFixed 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 #19I tested the game after merging with viktor-test, and unity did some background changes due to thatMerge branch 'viktor-test' into viktor-developThe project has some errors and i had to reimport everythingI tested the game and the editor did some background changesmerging-branchmerging-branchI played the game and unity editor did some background changesviktor-testviktor-testMerge branch 'merging-branch' into viktor-testUnity editor did some background changesThe editor had some errors so I reimported everything and got it working againMerge branch 'viktor-test' into viktor-developThe editor had some errors so I reimported everything and got it working againThe editor had some errors so I reimported everything and got it working againThe editor had some errors so I reimported everything and got it working againMerge branch 'viktor-test' into viktor-developI 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 #19Main menu sceneMerge branch 'viktor-test' into viktor-developUnity editor did some background changesThe 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 #18Unity editor did some background changesDelete Game_Design_Document.mdNew-MainNew-MainUploaded the Game DocumentAdded a new directory to store documents