Commits · master · Erik.Ingebrigtsen / Proggy Gonzales

30 Apr, 2022 10 commits
- Update README.md · d2eb5490
  Erik.Harto authored Apr 30, 2022
  
  d2eb5490
- Merge branch 'lastTouch' into 'master' · 8ae829ca
  Erik.Harto authored Apr 30, 2022
```
finished game

See merge request !122
```
  8ae829ca
- finished game · 234d67b8
  Erik.Harto authored Apr 30, 2022
  
  234d67b8
- Merge branch 'bugfixes' into 'master' · 318b6bb3
  Erik.Harto authored Apr 30, 2022
```
Bugfixes

See merge request !121
```
  318b6bb3
- 4 · e28de670
  Erik.Harto authored Apr 30, 2022
  
  e28de670
- 3 · 3f0c3b22
  Erik.Harto authored Apr 30, 2022
  
  3f0c3b22
- 2 · 7e34d6e7
  Erik.Harto authored Apr 30, 2022
  
  7e34d6e7
- commiting before making final statements · 2d76ff52
  Erik.Harto authored Apr 30, 2022
  
  2d76ff52
- Merge branch 'fixingBugs' into 'master' · fbbf66c3
  Chantal.Bakar authored Apr 30, 2022
```
Fixing powerups/timer bug, changed some booleans writing way

See merge request !120
```
  fbbf66c3
- Fixing powerups/timer bug, changed some booleans writing way · b7f044cc
  chba authored Apr 30, 2022
  
  b7f044cc
29 Apr, 2022 30 commits
- Merge branch 'pomXmlFix' into 'master' · b1400da4
  Erik.Ingebrigtsen authored Apr 29, 2022
```
pom fix og trello

See merge request !119
```
  b1400da4
- pom fix og trello · e8a72dff
  Erik.Ingebrigtsen authored Apr 29, 2022
  
  e8a72dff
- Merge branch 'pomxmlFix' into 'master' · 9963e113
  Erik.Ingebrigtsen authored Apr 29, 2022
```
Update pom.xml

See merge request !118
```
  9963e113
- Update pom.xml · 5d062a93
  Erik.Ingebrigtsen authored Apr 29, 2022
  
  5d062a93
- Merge branch 'player' into 'master' · 22533ba6
  Hannah.Morken authored Apr 29, 2022
```
p2 funker

See merge request !117
```
  22533ba6
- p2 funker · a189fa6d
  Hannah.Morken authored Apr 29, 2022
  
  a189fa6d
- Merge branch 'updatedMaps' into 'master' · 25042a47
  Erik.Harto authored Apr 29, 2022
```
updated easy and medium map

See merge request !116
```
  25042a47
- updated easy and medium map · 998786b0
  Erik.Harto authored Apr 29, 2022
  
  998786b0
- Pause working · 95ac4ccc
  chba authored Apr 29, 2022
  
  95ac4ccc
- Merge branch 'updateinfo' into 'master' · 4149cfc7
  Erik.Harto authored Apr 29, 2022
```
updated infoscreen for VOI

See merge request !115
```
  4149cfc7
- Merge branch 'removeMaps' into 'master' · 05b7bf12
  Erik.Harto authored Apr 29, 2022
```
removed unused maps and classes

See merge request !114
```
  05b7bf12
- Merge branch 'orderedCode' into 'master' · 07f8d0dd
  Chantal.Bakar authored Apr 29, 2022
```
ordered code

See merge request !113
```
  07f8d0dd
- Update Oblig4.md · 3be65c5b
  Erik.Harto authored Apr 29, 2022
  
  3be65c5b
- ordered code · 4da434f4
  chba authored Apr 29, 2022
  
  4da434f4
- updated infoscreen for VOI · eaa24882
  Erik.Harto authored Apr 29, 2022
  
  eaa24882
- Update README.md · 52b10539
  Hannah.Morken authored Apr 29, 2022
  
  52b10539
- Merge branch 'test' into 'master' · 62b498df
  Hannah.Morken authored Apr 29, 2022
```
tester ferdig

See merge request !112
```
  62b498df
- tester ferdig · b963ac55
  Hannah.Morken authored Apr 29, 2022
  
  b963ac55
- Merge branch 'fixedwritings' into 'master' · a4b9d4a9
  Chantal.Bakar authored Apr 29, 2022
```
Fixed texts

See merge request !111
```
  a4b9d4a9
- .. · be54f396
  chba authored Apr 29, 2022
  
  be54f396
- very small change · d9e64357
  chba authored Apr 29, 2022
  
  d9e64357
- removed unused maps and classes · afb41bfb
  Erik.Harto authored Apr 29, 2022
  
  afb41bfb
- fixed texts in levels menu · 1b6c12af
  chba authored Apr 29, 2022
  
  1b6c12af
- Update README.md · 8de132ae
  Hannah.Morken authored Apr 29, 2022
  
  8de132ae
- fixed writings on screen · 1c6c307a
  chba authored Apr 29, 2022
  
  1c6c307a
- hard funker · 68e5ef1e
  Alexander Smith authored Apr 29, 2022
  
  68e5ef1e
- Merge branch 'master' of git.app.uib.no:Erik.Ingebrigtsen/inf112.proggy-gonzales into master · a490a4c3
  Alexander Smith authored Apr 29, 2022
  
  a490a4c3
- fjernet første unicef · 065d4635
  Alexander Smith authored Apr 29, 2022
  
  065d4635
- Merge branch 'ScoreUpdate' into 'master' · 5368abdc
  Erik.Harto authored Apr 29, 2022
```
updated seconds left on highscore winscreen2

See merge request !109
```
  5368abdc
- Merge branch 'newBackgroundmulti' into 'master' · 525c9046
  Chantal.Bakar authored Apr 29, 2022
```
added new switching background behind multiplayer menu

See merge request !108
```
  525c9046