Commits · c931b4fa67bcf01f4619559ea2c6163fed80e6c4 · STJr / SRB2 · GitLab

Snippets Groups Projects

Mar 22, 2020
- Merge branch 'next' into udmf-next · c931b4fa
  MascaraSnake authored 5 years ago
  
  c931b4fa
- Merge branch 'master' into next · 58647883
  MascaraSnake authored 5 years ago
  
  58647883
- Add arrow to wall spike in ZB config · 48e8c905
  MascaraSnake authored 5 years ago
  
  48e8c905
- Move UDB configs into a subfolder · 79bfe146
  MascaraSnake authored 5 years ago
  
  79bfe146
- Add UDB config · c4b5c20d
  MascaraSnake authored 5 years ago
  
  c4b5c20d
- Merge branch 'next' into udmf-next · 2c8daabb
  MascaraSnake authored 5 years ago
  
  2c8daabb
- Merge branch 'master' into next · bc1e42d2
  MascaraSnake authored 5 years ago
  
  bc1e42d2
- Minor ZB config fix · 6911097b
  MascaraSnake authored 5 years ago
  
  6911097b
Mar 21, 2020
- Merge branch 'next' into udmf-next · faac3c70
  MascaraSnake authored 5 years ago
  
  faac3c70
- Merge branch 'master' into next · c5b4d4bd
  MascaraSnake authored 5 years ago
  
  c5b4d4bd
- Another ZB config fix · c806d8a5
  MascaraSnake authored 5 years ago
  
  c806d8a5
- Merge branch 'next' into udmf-next · 1580e14c
  MascaraSnake authored 5 years ago
  
  # Conflicts: # extras/conf/Includes/SRB222_linedefs.cfg # extras/conf/Includes/SRB222_misc.cfg # src/p_spec.c
  1580e14c
- Merge branch 'master' into next · 42445b39
  MascaraSnake authored 5 years ago
  
  42445b39
- Merge branch 'config-fixes' into 'master' · a2729dde
  MascaraSnake authored 5 years ago
  
  Updates and fixes for the ZB config See merge request !859
  a2729dde
- Add Object Special text for Star Post · d2c83e1c
  MascaraSnake authored 5 years ago
  
  d2c83e1c
- Merge branch 'delete-slopes' into 'next' · 006b1e8c
  LJ Sonic authored 5 years ago
  
  Delete slopes See merge request !857
  006b1e8c
- Merge branch 'skip-empty-gametypes' into 'master' · fa9c2f43
  LJ Sonic authored 5 years ago
  
  Skip empty gametypes in level select menu See merge request !819
  fa9c2f43
- Updates and fixes for the ZB config · 06f9246f
  MascaraSnake authored 5 years ago
  
  06f9246f
- Merge branch 'master' into next · e2c98156
  MascaraSnake authored 5 years ago
  
  e2c98156
- Remove the multi-file ZB configs. We're stick with the single-file config for... · 2107b895
  MascaraSnake authored 5 years ago
  
  Remove the multi-file ZB configs. We're stick with the single-file config for ZB and doing all the UDMF stuff in UDB
  2107b895
Mar 20, 2020
- Make SRB2 flat like Earth · 892a8dd6
  LJ Sonic authored 5 years ago
  
  892a8dd6
- Merge branch 'delete-lua' into 'next' · 37b70fe8
  LJ Sonic authored 5 years ago
  
  Delete Lua See merge request !852
  37b70fe8
Mar 19, 2020
- hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh · 78ec2108
  fickleheart authored 5 years ago
  
  78ec2108
- Update CircleCI config · a436ece9
  LJ Sonic authored 5 years ago
  
  a436ece9
- Use HAVE_BLUA as fuel for my fireplace · e3cbdf8f
  LJ Sonic authored 5 years ago
  
  e3cbdf8f
- Merge branch 'lua-music' into 'next' · 92016a74
  LJ Sonic authored 5 years ago
  
  Expose more music-related functions to Lua See merge request !817
  92016a74
- Avoid infinite loops if no maps are selectable (y tho) · 725826a6
  fickleheart authored 5 years ago
  
  725826a6
- Merge remote-tracking branch 'upstream/next' into lua-music · 05b2570a
  fickleheart authored 5 years ago
  
  05b2570a
- More union types for the union type god · 9c86cd0b
  fickleheart authored 5 years ago
  
  9c86cd0b
- Are these casts unnecessary...?? · 520e3c5d
  fickleheart authored 5 years ago
  
  520e3c5d
- Clean up after myself · 647f73c8
  fickleheart authored 5 years ago
  
  647f73c8
- > building SRB2 without Lua in 2020 · dd0d8612
  fickleheart authored 5 years ago
  
  dd0d8612
- Rename hook to ShouldJingleContinue · e0badd1e
  fickleheart authored 5 years ago
  
  e0badd1e
Mar 18, 2020
- Merge branch 'master' into next · 5dac9c68
  SteelT authored 5 years ago
  
  5dac9c68
- Merge branch 'fix-nights-mode-menu-wrong-return' into 'master' · 04131d32
  SteelT authored 5 years ago
  
  NiGHTS Mode menu fixes See merge request STJr/SRB2!841
  04131d32
- Merge branch 'deadzone-sigfpe-fix' into 'master' · e3a5164d
  SteelT authored 5 years ago
  
  Fix division-by-0 crash from 100% gamepad deadzones, and lack of input from 0% deadzones See merge request !838
  e3a5164d
- Merge branch 'viewpointswitch-fix' into 'next' · bd058ecc
  SteelT authored 5 years ago
  
  Fix incorrect newdisplayplayer in forced ViewpointSwitch See merge request !814
  bd058ecc
- Merge branch 'screenshot-menu-header' into 'master' · 38bcfe49
  LJ Sonic authored 5 years ago
  
  Actually use the "SCREENSHOT OPTIONS" header for its menu. See merge request !832
  38bcfe49
- Merge branch 'udmf-formatcheck' into 'udmf-next' · a8f53b31
  MascaraSnake authored 5 years ago
  
  Add boolean variable that indicates if current map is in UDMF format See merge request !849
  a8f53b31
- Merge branch 'increase-input-buffer' into 'next' · c43ca31d
  LJ Sonic authored 5 years ago
  
  Increase the length of the player input buffer See merge request !835
  c43ca31d