Commits · 83a6f5d6aeb6d64b28d8205cf7a1da6dbb83edad · STJr / SRB2 · GitLab

Snippets Groups Projects

Dec 23, 2018
- Merge remote-tracking branch 'public-gl/master' into 2122-version · 83a6f5d6
  Marco Z authored 6 years ago
  
  83a6f5d6
- Merge remote-tracking branch 'public-gl/next' into 2122-version · c0a0c5ac
  Marco Z authored 6 years ago
  
  c0a0c5ac
- Merge branch '2122-next' into 'next' · 140152c2
  mazmazz authored 6 years ago
  
  Revert "Merge branch 'menu-mpjoy-fix' into 'next'" See merge request !419
  140152c2
- Revert "Merge branch 'menu-mpjoy-fix' into 'next'" · c0c05043
  Marco Z authored 6 years ago
  
  This reverts commit b5d4bb35, reversing changes made to 2d675750.
  c0c05043
- Merge branch 'menu-mpjoy-fix' into 'next' · b5d4bb35
  mazmazz authored 6 years ago
  
  Menu: Fix joystick events causing the player to move during multiplayer system menu See merge request !414
  b5d4bb35
- Merge branch 'loadconfig-defaultcontrols' into 'master' · 402860dc
  mazmazz authored 6 years ago
  
  Reset default controls for LOADCONFIG command See merge request !403
  402860dc
- fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c · 2d675750
  Monster Iestyn authored 6 years ago
  
  2d675750
- Clear all control keys before loading defaults in LoadConfig · f55623ef
  Marco Z authored 6 years ago
  
  f55623ef
- Add chat_on to non-key move event checks · aa77038d
  Marco Z authored 6 years ago
  
  aa77038d
- Merge remote-tracking branch 'public-gl/2122-version' into 2122-version · e3d106d5
  Marco Z authored 6 years ago
  
  e3d106d5
- Merge remote-tracking branch 'public-gl/next' into 2122-version · b49cf11f
  Marco Z authored 6 years ago
  
  b49cf11f
- Merge pull request #391 from monster-psychic-cat/sw_largeroomfix · c5ec1e30
  Alam Arias authored 6 years ago
  
  Large room fix
  Unverified
  
  c5ec1e30
- Merge branch 'master' into next · 4265be77
  Alam Ed Arias authored 6 years ago
  
  4265be77
- Merge branch 'next' into sw_largeroomfix · 194f9ea8
  Alam Arias authored 6 years ago
  
  Unverified
  
  194f9ea8
Dec 22, 2018
- Merge branch 'sdl-vidmode-display-fix' into 'master' · 974a8e3e
  mazmazz authored 6 years ago
  
  SDL: Center window on current monitor during vidmode change Closes #47 See merge request !415
  974a8e3e
- Center window on current monitor during vidmode change · 8707b2f4
  Marco Z authored 6 years ago
  
  8707b2f4
- Don't create movement events from joy or mouse when menu is active · cb619e03
  Marco Z authored 6 years ago
  
  cb619e03
- Merge branch 'menu-screenshot-fix' into 'master' · 66dc5a87
  mazmazz authored 6 years ago
  
  Menu screenshot fix Closes #45 See merge request !413
  66dc5a87
- Don't allow non-keyboard keys to screenshot/gif in menus · 1291d35e
  Sal authored 6 years ago and Marco Z committed 6 years ago
  
  1291d35e
Dec 21, 2018
- Merge branch 'master' into next · a72d79da
  Monster Iestyn authored 6 years ago
  
  a72d79da
- Merge branch '2122-credits-update-2' into 'next' · cd8a147c
  mazmazz authored 6 years ago
  
  Re-order Special Thanks -- groups first, then names in ABC order See merge request !411
  cd8a147c
- Re-order Special Thanks -- groups first, then names in ABC order · 90832938
  Marco Z authored 6 years ago
  
  90832938
Dec 20, 2018
- Merge branch '2122-credits-update' into 'next' · 41a25a68
  mazmazz authored 6 years ago
  
  Add sirjuddington and CodeImp to Special Thanks credits See merge request !409
  41a25a68
- Merge branch '2122-execversion' into '2122-version' · edbf9073
  mazmazz authored 6 years ago
  
  EXECVERSION adjustments (config updater) See merge request !408
  edbf9073
- Properly restrict EXECVERSION from cvar updates · f1fea300
  Marco Z authored 6 years ago
  
  f1fea300
- Add sirjuddington and CodeImp to Special Thanks credits · f66ee8c4
  Marco Z authored 6 years ago
  
  f66ee8c4
- Hardcode define MAJOREXECVERSION to MODVERSION · 9be1ee4a
  Marco Z authored 6 years ago
  
  9be1ee4a
- Merge branch '2122-version' into 2122-execversion · 6affe807
  Marco Z authored 6 years ago
  
  6affe807
- Merge branch 'float_equal' into 'master' · 58a2cec7
  mazmazz authored 6 years ago
  
  Clear Float equal warnings See merge request STJr/SRB2!383
  58a2cec7
- Merge branch 'next' into sw_largeroomfix · 2b59cfa6
  Jimita authored 6 years ago
  
  Unverified
  
  2b59cfa6
- Merge branch 'next' into sw_largeroomfix · b68e01cb
  Jimita authored 6 years ago
  
  Unverified
  
  b68e01cb
- Merge branch 'camera-backport' into 'next' · 9525de2d
  mazmazz authored 6 years ago
  
  Suggestion: 2.2 camera changes backport See merge request !393
  9525de2d
- Merge branch 'jump-spin-axes' into 'next' · 28c8ad3d
  mazmazz authored 6 years ago
  
  Feature: Jump/Spin axes See merge request !389
  28c8ad3d
- Merge branch 'joy-jump-defaults' into 'next' · 75e570f2
  mazmazz authored 6 years ago
  
  Assign joy button defaults for 1 and 2 player See merge request !400
  75e570f2
- Merge branch 'menu-2pcontrols-fix' into 'master' · 50221c47
  mazmazz authored 6 years ago
  
  Fix 2p control menu graying out See merge request !407
  50221c47
- Merge branch 'next' into sw_largeroomfix · 2bdf5680
  Jimita authored 6 years ago
  
  Unverified
  
  2bdf5680
- Merge branch 'cmake-dllpath-fix' into 'master' · f405f1ae
  mazmazz authored 6 years ago
  
  Update CMake paths for Windows DLLs See merge request !406
  f405f1ae
- bland · 9d93f54b
  Lactozilla authored 6 years ago
  
  9d93f54b
- Update CMake paths for Windows DLLs · 0519d8c5
  Marco Z authored 6 years ago
  
  0519d8c5
- Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu · fe5001a3
  Marco Z authored 6 years ago
  
  fe5001a3