Development to testing (!46) · Merge requests · WIMMA Lab 2019 / Overflow / ehasa-frontend

Merged Ghost User requested to merge development into testing 5 years ago

Jul 19, 2019
- Merge branch 'mapdrawing-replay' into 'development' · 2a00068f
  M3034 authored 5 years ago
  
  Mapdrawing replay See merge request !45
  2a00068f
- Merge branch 'map-position-on-load' into 'development' · 42a939f8
  M3034 authored 5 years ago
  
  Map centers to game's center on load See merge request !44
  42a939f8
- barely working drawing replay · 1cc8f098
  L4168 authored 5 years ago
  
  1cc8f098
- Map centers to game's center on load · 13388abd
  Joni Laukka authored 5 years ago
  
  13388abd
- mapdrawing replay wip · 25279041
  L4168 authored 5 years ago
  
  25279041
- Merged task-edit-to-set-winner to development · 849bdd8c
  Taneli Riihimäki authored 5 years ago
  
  849bdd8c
- Merge branch 'edit-game-form-objective-point-fix' into 'development' · ca1ec1da
  M3034 authored 5 years ago
  
  Node settings changed to ints from strings See merge request !42
  ca1ec1da
- Merge branch 'notification-view' into 'development' · 1fdca6ff
  M3034 authored 5 years ago
  
  Notifications + small updates See merge request !41
  1fdca6ff
- Task edit is now set winner · 2e1ea3ed
  Joni Laukka authored 5 years ago
  
  2e1ea3ed
- Node settings changed to ints from strings · f656b024
  Joni Laukka authored 5 years ago
  
  f656b024
- Merged branch 'development' into 'notification-view' · dc0cbeed
  Joni Laukka authored 5 years ago
  
  dc0cbeed
- cleaning up code · a0e0dfc2
  L4168 authored 5 years ago
  
  a0e0dfc2
- add config file for replaysettings · f2b0ce38
  L4168 authored 5 years ago
  
  f2b0ce38
- Socket now sends data instead of type · d978ec7b
  Joni Laukka authored 5 years ago
  
  d978ec7b
- Map drawings fixed so it works with roles · 9ad5424a
  Joni Laukka authored 5 years ago
  
  9ad5424a
- Refactored a loop to be a bit simpler · a3f038ca
  Taneli Riihimäki authored 5 years ago
  
  a3f038ca
- Merge branch 'score-replay' into 'development' · 3c7a6002
  M3034 authored 5 years ago
  
  Score replay See merge request !40
  3c7a6002
Jul 18, 2019
- updated score logic · 7df7bce8
  Ronnie Friman authored 5 years ago
  
  7df7bce8
- add scores on tick · b0f4003e
  Ronnie Friman authored 5 years ago
  
  b0f4003e
- score replay wip · 7bdda8bb
  L4168 authored 5 years ago
  
  7bdda8bb
- Merged branch development into notification-view · 96853dfd
  Joni Laukka authored 5 years ago
  
  96853dfd
- Merged join game update fix · d58dd0b9
  Taneli Riihimäki authored 5 years ago
  
  d58dd0b9
- Merge branch 'task-char-limits' into 'development' · 46736d13
  M3034 authored 5 years ago
  
  task char limits See merge request !37
  46736d13
- Merge branch 'hide-drawtools' into 'development' · 9758ec85
  M3034 authored 5 years ago
  
  Hide drawing tools See merge request !36
  9758ec85
- Merge branch 'password-fix' into 'development' · 0ddf4d5e
  M3034 authored 5 years ago
  
  Password fix See merge request !35
  0ddf4d5e
- Leaving faction now updates player role state · 1304a31e
  Joni Laukka authored 5 years ago
  
  1304a31e
- Joining updates role state · e7499898
  Joni Laukka authored 5 years ago
  
  e7499898
- task char limits · 9f766b72
  Joni Laukka authored 5 years ago
  
  9f766b72
- Only admin and factionleader can now see map drawing tools · 4747ef74
  Joni Laukka authored 5 years ago
  
  4747ef74
- Changed two fetches into one fetch · 8a1a4dab
  Joni Laukka authored 5 years ago
  
  8a1a4dab
- Password fields now hides the input text · 17a4241d
  Joni Laukka authored 5 years ago
  
  17a4241d
- Merged branch development into notification-view · 0285a031
  Joni Laukka authored 5 years ago
  
  0285a031
- Confirmation added to faction leaving · 48a9c883
  Joni Laukka authored 5 years ago
  
  48a9c883
- Message for admin that notifications can only be sent if game is ongoing · b7554c0f
  Joni Laukka authored 5 years ago
  
  b7554c0f
- removed unused prop call · 366f1b35
  Joni Laukka authored 5 years ago
  
  366f1b35
- Notification form is not visible if game state is "ENDED" or "CREATED" · 133daa50
  Joni Laukka authored 5 years ago
  
  133daa50
- id's added to buttons and inputs · a5aa14d1
  Joni Laukka authored 5 years ago
  
  a5aa14d1
- Merge branch 'filter-player-replay' into 'development' · 8e12ebd6
  M3034 authored 5 years ago
  
  Filter player replay See merge request !34
  8e12ebd6
- can filter players based on their faction · e29c702a
  L4168 authored 5 years ago
  
  e29c702a
- Merged branch development into notification-view · 10db618c
  Joni Laukka authored 5 years ago
  
  10db618c
Jul 17, 2019
- game info view added. game edit button now needs game state 'CREATED' · b2dc9886
  Joni Laukka authored 5 years ago
  
  b2dc9886
- Factions are now props in tasklist · 35eb3767
  Joni Laukka authored 5 years ago
  
  35eb3767
- Added confirmation to edit form X button, if changes has been made to inputs · e1fa53aa
  Joni Laukka authored 5 years ago
  
  e1fa53aa
- can filter players based on class · 6617dc3f
  Ronnie Friman authored 5 years ago
  
  6617dc3f
- cursor pointer on checkbox hover · df1a6dbd
  Ronnie Friman authored 5 years ago
  
  df1a6dbd
- reworked fetch functions · 7a7c5e27
  Ronnie Friman authored 5 years ago
  
  7a7c5e27
- get gameId from url · 2a0e7689
  Ronnie Friman authored 5 years ago
  
  2a0e7689
- add buttons to access replay · 7caaa498
  Ronnie Friman authored 5 years ago
  
  7caaa498
- Merged replay functionalities · 059713da
  Taneli Riihimäki authored 5 years ago
  
  059713da
- Merge branch 'gamelist-scroll' into 'development' · c4c6ebc5
  M3034 authored 5 years ago
  
  gamelist scroll See merge request !30
  c4c6ebc5
- Confirmations to notification form, game state buttons and edit game leaving · 79114c98
  Joni Laukka authored 5 years ago
  
  79114c98
- some comments · 9c93f1eb
  L4168 authored 5 years ago
  
  9c93f1eb
- replay routed · ead9bc61
  L4168 authored 5 years ago
  
  ead9bc61
- add nginx config for react-router · 752c1a1b
  L4168 authored 5 years ago
  
  752c1a1b
- Notifications and notification popup · faaef841
  Joni Laukka authored 5 years ago
  
  faaef841
- show player information on hover · 85460601
  L4168 authored 5 years ago
  
  85460601
- replay shows faction colours · 0b28283d
  L4168 authored 5 years ago
  
  0b28283d
Jul 16, 2019
- shows icons based on group class · 54c86593
  Ronnie Friman authored 5 years ago
  
  54c86593
- added new icons for replay · f044b110
  Ronnie Friman authored 5 years ago
  
  f044b110
- different images for players · 7447809c
  L4168 authored 5 years ago
  
  7447809c
- socket notification wip · 47aeec0e
  Joni Laukka authored 5 years ago
  
  47aeec0e
- player replay wip · 7b4d4915
  L4168 authored 5 years ago
  
  7b4d4915
- gamelist scroll · 0083383e
  Joni Laukka authored 5 years ago
  
  0083383e
- initial replay for players · 4be94ee0
  L4168 authored 5 years ago
  
  4be94ee0

Development to testing

Merge request reports

Activity