Commits · 77-static-loading-screen · Tobias Ingebrigt Ørstad / Progark gruppe 3

Apr 07, 2020
- Almost completes issue #73 · 9da73392
  Tor Martin Frøberg Wang authored 5 years ago
  
  9da73392
Apr 04, 2020
- Merge branch '60-fix-bubble-game' into 'dev' · 382cc8e7
  Turid Cecilie Dahl authored 5 years ago
  
  Resolve "Fix bubble game" Closes #60 See merge request !57
  382cc8e7
- Fixed bug where setButtonBlack set button white · a3f82647
  Tor Martin Frøberg Wang authored 5 years ago
  
  a3f82647
Apr 03, 2020
- Resolved a small error where the non-disposable background in bubble wrap was tried disposed · 159cfb63
  Tor Martin Frøberg Wang authored 5 years ago
  
  159cfb63
- Merge branch 'dev' into '60-fix-bubble-game' · 6d45aec9
  Tor Martin Frøberg Wang authored 5 years ago
  
  # Conflicts: # frontend/core/src/com/gameware/game/states/BubbleWrapState.java # frontend/core/src/com/gameware/game/states/ColorRushState.java # frontend/core/src/com/gameware/game/states/PlayStateTemplate.java
  6d45aec9
- Fixed some issues · 96b5a66a
  Tor Martin Frøberg Wang authored 5 years ago
  
  96b5a66a
- Merge branch '60-fix-bubble-game' of... · b1ba64e1
  Tor Martin Frøberg Wang authored 5 years ago
  
  Merge branch '60-fix-bubble-game' of https://gitlab.stud.idi.ntnu.no/tobiasio/progark-gruppe-3 into 60-fix-bubble-game
  b1ba64e1
- Fixed some issues: removed unused peek method from gameware, removed boolean... · 262f4e48
  Tor Martin Frøberg Wang authored 5 years ago
  
  Fixed some issues: removed unused peek method from gameware, removed boolean parameter from the playstatetemplate constructor, and changed the initial starting state to loginstate
  262f4e48
- Merge branch '50-make-it-look-pretty' into 'dev' · 268f66a4
  Turid Cecilie Dahl authored 5 years ago
  
  Resolve "Make it look pretty" Closes #50 See merge request !66
  268f66a4
- MR fixes · 0bb26b9d
  Turid Cecilie Dahl authored 5 years ago
  
  0bb26b9d
- PST gets correct round when not finished and TP != 0 · 669f2ef4
  Turid Cecilie Dahl authored 5 years ago
  
  669f2ef4
- #67 Adds roundCheck to get new round or go to finishedTS after game done · 04ddc279
  Turid Cecilie Dahl authored 5 years ago
  
  04ddc279
- Merge remote-tracking branch 'origin/dev' into 50-make-it-look-pretty · 47ab97ee
  Turid Cecilie Dahl authored 5 years ago
  
  47ab97ee
- Merge branch 'dev' into '60-fix-bubble-game' · 0326ac32
  Tor Martin Frøberg Wang authored 5 years ago
  
  # Conflicts: # frontend/core/src/com/gameware/game/states/BubbleWrapState.java
  0326ac32
- Completes issue #60 and #73 · 21a7d23a
  Tor Martin Frøberg Wang authored 5 years ago
  
  21a7d23a
- Merges with dev · ea83b57f
  Turid Cecilie Dahl authored 5 years ago
  
  ea83b57f
- Merge branch '69-add-round-check-method-in-qi' into 'dev' · e028ed95
  Ivar Nordvik Myrstad authored 5 years ago
  
  Resolve "Add round check method in QI" Closes #69 See merge request !64
  e028ed95
- #69 Add doRoundCheck · c95b25f2
  ivarnm authored 5 years ago
  
  c95b25f2
- #50 makes ViewHighScoreForGameState prettier · 6f2c5a6c
  Turid Cecilie Dahl authored 5 years ago
  
  6f2c5a6c
- #69 Option to send put request without body · 1257efc9
  ivarnm authored 5 years ago
  
  1257efc9
- Merge branch 'dev' into 69-add-round-check-method-in-qi · b14b0631
  ivarnm authored 5 years ago
  
  b14b0631
- #50 makes ViewHighScoreState prettier · d4faee67
  Turid Cecilie Dahl authored 5 years ago
  
  d4faee67
- #50 makes playBtn in VTS disabled istead of gone · 20271da3
  Turid Cecilie Dahl authored 5 years ago
  
  20271da3
- fix conflict · 1ca2f4ae
  Tobias Ørstad authored 5 years ago
  
  1ca2f4ae
- Update putRoundScore to check for timeout · f8c92921
  Tobias Ørstad authored 5 years ago
  
  f8c92921
Apr 02, 2020
- Added documentation · 40826904
  Tobias Ørstad authored 5 years ago
  
  40826904
- Completed roundcheck method · 0334ffd4
  Tobias Ørstad authored 5 years ago
  
  0334ffd4
- Merge branch 'dev' of https://gitlab.stud.idi.ntnu.no/tobiasio/progark-gruppe-3 into dev · 110a230d
  Tobias Ørstad authored 5 years ago
  
  110a230d
- Fixed completed tournaments not having active: false · 206b743e
  Tobias Ørstad authored 5 years ago
  
  206b743e
- Merge branch '67-tournamentfinishedstate' into 'dev' · 5fc2e01f
  Turid Cecilie Dahl authored 5 years ago
  
  Resolve "TournamentFinishedState" Closes #67 See merge request !69
  5fc2e01f
- #67 Improves constructor of CreateJoinTournamentState, with consequences.... · 48d77164
  Haakon Gunleiksrud authored 5 years ago
  
  #67 Improves constructor of CreateJoinTournamentState, with consequences. Removes an unnecessary comment. Fixes checing of finished tournament.
  48d77164
- further progress · 6c0efda7
  Tobias Ørstad authored 5 years ago
  
  6c0efda7
- #67 Removes unnecessary code. · 3d671e62
  Haakon Gunleiksrud authored 5 years ago
  
  3d671e62
- #67 Adds better naming for inner tables in stage in FinishedTournamentState. · fb1bd367
  Haakon Gunleiksrud authored 5 years ago
  
  fb1bd367
- #67 Adds functionality for remembering wether to include finished tournaments or not. · 4af327f1
  Haakon Gunleiksrud authored 5 years ago
  
  4af327f1
- #67 Adds new FinishedTournamentState with functionality and new background. · 21ad3832
  Haakon Gunleiksrud authored 5 years ago
  
  21ad3832
- Merge branch '65-reset-methods-functionality' into 'dev' · 8ff94cd3
  Turid Cecilie Dahl authored 5 years ago
  
  Resolve "Reset methods functionality" Closes #65 See merge request !62
  8ff94cd3
- #65 Adds another reset field to BubbleWrapState. · e195c774
  Haakon Gunleiksrud authored 5 years ago
  
  e195c774
- #65 Removes an unused Label. · 70ea3223
  Haakon Gunleiksrud authored 5 years ago
  
  70ea3223
- #65 Merge with origin/dev. · 9b93de83
  Haakon Gunleiksrud authored 5 years ago
  
  9b93de83