Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
Double Trouble
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Viktor Palmason
Double Trouble
Repository graph
Repository graph
You can move around the graph by using the arrow keys.
dcea49a519747fd6ef1e9cbd03f55dcacf84c5e4
Select Git revision
Branches
8
New-Main
protected
Stian-Working
final-merge
master
default
protected
merging-branch
multiplayer
viktor-develop
viktor-test
8 results
Begin with the selected commit
Created with Raphaël 2.2.0
19
Dec
18
17
16
15
14
12
10
9
8
3
2
19
Nov
18
16
13
12
10
7
5
30
Oct
24
23
10
29
Sep
24
Replace Viktor-Individual.pdf
master
master
Replace Viktor-Individual.pdf
Replace Viktor-Individual.pdf
Upload New File
Upload New File
Upload the Gameplay video
Upload the Video showing our code that is tightly integrated with the game engine
Added a new directory for storing the Gameplay video and the Editor video
Stians Individual Discussion
I had to reimport everything becuase their were some errors with the editor, and then i play tested the game
Tested the game
viktor-develop
viktor-develop
added audiosource to main menu[C
Merge branch 'final-merge' into 'master'
Finally merged different branches manualy into one
final-merge
final-merge
Gave enemies more health and I increased the score to win the game
I implemented two end condition to the single player and made a GameOver UI #16 #20
reimported everything because the project had error, and i fixed a bug in the player movement
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
I tested the game after merging with viktor-test, and unity did some background changes due to that
Merge branch 'viktor-test' into viktor-develop
The project has some errors and i had to reimport everything
I tested the game and the editor did some background changes
merging-branch
merging-branch
I played the game and unity editor did some background changes
viktor-test
viktor-test
Merge branch 'merging-branch' into viktor-test
Unity editor did some background changes
The editor had some errors so I reimported everything and got it working again
Merge branch 'viktor-test' into viktor-develop
The editor had some errors so I reimported everything and got it working again
The editor had some errors so I reimported everything and got it working again
The editor had some errors so I reimported everything and got it working again
Merge branch 'viktor-test' into viktor-develop
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
Main menu scene
Merge branch 'viktor-test' into viktor-develop
Unity editor did some background changes
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
Unity editor did some background changes
Delete Game_Design_Document.md
New-Main
New-Main
Uploaded the Game Document
Added a new directory to store documents
Loading