Commits · cb01ebebed0352d131eccbba6adfbad6c967a9ea · STJr / SRB2 · GitLab

Snippets Groups Projects

Dec 23, 2018
- Merge remote-tracking branch 'public-gl/2122-version' into 2122-version · cb01ebeb
  Marco Z authored 6 years ago
  
  cb01ebeb
- 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-patch-dta-update' into '2122-version' · d72e3fe7
  mazmazz authored 6 years ago
  
  Changes related to 2.1.22 patch.dta update See merge request STJr/SRB2!417
  d72e3fe7
- Merge branch 'addons-backport' into '2122-version' · 8d56c2f4
  mazmazz authored 6 years ago
  
  Addons Menu backport to vanilla See merge request STJr/SRB2!384
  8d56c2f4
- Merge branch 'menu-mpjoy-fix' into '2122-version' · fa36b8f5
  mazmazz authored 6 years ago
  
  Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version] See merge request !420
  fa36b8f5
- Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'"" · 2b8cdc03
  Marco Z authored 6 years ago
  
  This reverts commit c0c05043.
  2b8cdc03
- Merge branch '2122-next' into 'next' · 140152c2
  mazmazz authored 6 years ago
  
  Revert "Merge branch 'menu-mpjoy-fix' into 'next'" See merge request STJr/SRB2!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 STJr/SRB2!414
  b5d4bb35
- Merge branch 'SRB2-CHAT' into '2122-version' · 7a64e3d1
  mazmazz authored 6 years ago
  
  Chat and other multiplayer quality of life improvements. See merge request !398
  7a64e3d1
- Merge branch 'execversion-filtercontrols' into '2122-version' · e23e0c9e
  mazmazz authored 6 years ago
  
  Add SETCONTROL handling to config updater See merge request !410
  e23e0c9e
- Merge branch 'loadconfig-defaultcontrols' into 'master' · 402860dc
  mazmazz authored 6 years ago
  
  Reset default controls for LOADCONFIG command See merge request !403
  402860dc
- Merge branch 'next' into SRB2-CHAT · b7d7472a
  Latapostrophe authored 6 years ago
  
  b7d7472a
- 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
- Credits update · f600c5fe
  Marco Z authored 6 years ago
  
  f600c5fe
- Merge branch '2122-version' into execversion-filtercontrols · 8f596376
  Marco Z authored 6 years ago
  
  8f596376
- Add JOY10 default to gc_centerview · 3277cf69
  Marco Z authored 6 years ago
  
  3277cf69
- Fix joy button default override when filling keynum2 with default · dd4c7b53
  Marco Z authored 6 years ago
  
  dd4c7b53
- Fix the chat being displayed in singleplayer if there are stillmessages · db8e1c03
  Latapostrophe authored 6 years ago
  
  db8e1c03
- Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT · 11f44f7c
  Latapostrophe authored 6 years ago
  
  11f44f7c
- Merge branch 'SRB2-CHAT' into 'SRB2-CHAT' · 809bb8a9
  Latapostrophe authored 6 years ago
  
  Final code fixes and minor cleanup See merge request SinnamonLat/SRB2!5
  809bb8a9
- Merge branch 'master' into SRB2-CHAT · 1b61e15b
  Latapostrophe authored 6 years ago
  
  1b61e15b
- Buildbot fixes · 3703a032
  Marco Z authored 6 years ago
  
  3703a032
- New patch.dta hash for 2.1.22 · 7fb73cf2
  Marco Z authored 6 years ago
  
  7fb73cf2
- Add chat_on to non-key move event checks · aa77038d
  Marco Z authored 6 years ago
  
  aa77038d
- Check target < MAXPLAYERS before PM · 6ebc41a5
  Marco Z authored 6 years ago
  
  6ebc41a5
- Fix mainwads check in d_main · ec530323
  Marco Z authored 6 years ago
  
  ec530323
- Merge branch '2122-version' into 2122-patch-dta-update · 31cfa255
  Marco Z authored 6 years ago
  
  31cfa255
- 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
- Add SRB2 Community Contributors to Special Thanks · 33434395
  Marco Z authored 6 years ago
  
  33434395
- Merge remote-tracking branch 'public-gl/next' into 2122-patch-dta-update · 8723eb9a
  Marco Z authored 6 years ago
  
  8723eb9a
- Extend HU_FONTSTART to STCFN022 (from 2.2) · 94858aed
  Marco Z authored 6 years ago
  
  94858aed
- Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)" · a9fb17da
  Marco Z authored 6 years ago
  
  This reverts commit 64007290.
  a9fb17da
- Use TinyFont for chat arrows · 56320a35
  Marco Z authored 6 years ago
  
  56320a35
- Extend HU_FONTSTART to STCFN022 (from 2.2) · 64007290
  Marco Z authored 6 years ago
  
  64007290
- Correct splitscreen check in OLDCHAT · e0176670
  Marco Z authored 6 years ago
  
  e0176670
- Minor code cleanup, CHAT · 7e9411f3
  Marco Z authored 6 years ago
  
  7e9411f3