Upstream merge (!118) · Merge requests · Kart Krew / Kart-Public · GitLab

Snippets Groups Projects

Merged Alam Ed Arias requested to merge upstream-merge into master 6 years ago

Mar 27, 2019
- TravisCI: remove xcode7.3 on DPL mac build · 7ad1b3ac
  Alam Arias authored 6 years ago
  
  7ad1b3ac
Mar 26, 2019
- mistype in merge of TavisCI config · 14cd6c1b
  Alam Arias authored 6 years ago
  
  14cd6c1b
- Merge commit 'upstream/master~0' · 68ee8737
  Alam Arias authored 6 years ago
  
  68ee8737
- Merge commit 'upstream/master~1' · 7d98adf6
  Alam Arias authored 6 years ago
  
  7d98adf6
- Merge branch 'buildbot' into 'master' · 9ef98471
  Monster Iestyn authored 6 years ago
  
  Buildbot changes See merge request STJr/SRB2!477
  9ef98471
- Merge branch 'dedicated-server-credits-fix' into 'master' · 8e78369f
  Monster Iestyn authored 6 years ago
  
  Dedicated server credits fix See merge request STJr/SRB2!476
  8e78369f
- Merge branch 'mi-side-discolor-fix' into 'master' · 7758b281
  Monster Iestyn authored 6 years ago
  
  MI's side discolor fix See merge request STJr/SRB2!475
  7758b281
Mar 25, 2019
- Fix credits gamestate in dedicated mode, by properly separating the timer... · 8c1c0875
  Monster Iestyn authored 6 years ago
  
  Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
  8c1c0875
- TravisCI: use stock sdl2_mixer for prebuild bottle · 73fa35ba
  Alam Ed Arias authored 6 years ago
  
  73fa35ba
- travisCI: add sdl2_mixer from mazmazz's srb2 tap · fd284f23
  Alam Ed Arias authored 6 years ago
  
  fd284f23
- TravisCI: install deps on sdl2_mixer · 9de5055d
  Alam Ed Arias authored 6 years ago
  
  9de5055d
- TravisCI: try updating homebew · ec0afaf6
  Alam Ed Arias authored 6 years ago
  
  ec0afaf6
- TravisCI: build custom sdl2_mixer build · 3472bf85
  Alam Ed Arias authored 6 years ago
  
  3472bf85
- use default osx image · 594c9063
  Alam Ed Arias authored 6 years ago
  
  594c9063
- TravisCI: move homebrew packages for all mac builds · 3ab0f675
  Alam Ed Arias authored 6 years ago
  
  3ab0f675
- CircleCI: rebuild depend file with BLUA · a8681a5b
  Alam Ed Arias authored 6 years ago
  
  a8681a5b
- P_SuperDamage() is too big for inlining · fe22fdc5
  Alam Ed Arias authored 6 years ago
  
  fe22fdc5
- CircleCI: also test compiling without BLUA support · c4e8a601
  Alam Ed Arias authored 6 years ago
  
  c4e8a601
- Travis-CI: use a new version of xcode and use homebrew add-on to install packages · 9a8d36b8
  Alam Ed Arias authored 6 years ago
  
  9a8d36b8
- R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them. · 147221cf
  Monster Iestyn authored 6 years ago
  
  147221cf