Commits · e23e0c9ea41f8c50d2626f71f35c317790256f29 · STJr / SRB2 · GitLab

Snippets Groups Projects

Dec 23, 2018
- 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 '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
- 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
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
- Skip setting control if keynum is -1 (for KEY_PAUSE) handling · e20c70d5
  Marco Z authored 6 years ago
  
  e20c70d5
- 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 '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 'cmake-dllpath-fix' into 'master' · f405f1ae
  mazmazz authored 6 years ago
  
  Update CMake paths for Windows DLLs See merge request !406
  f405f1ae
- 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
- Fix 2p control menu graying out · b57204fc
  Marco Z authored 6 years ago
  
  b57204fc
- Add G_FilterKeyByVersion() to setcontrol · 6f8b1265
  Marco Z authored 6 years ago
  
  6f8b1265
- Merge branch 'lua-fof-flat-names-fix' into 'next' · c9a73034
  Monster Iestyn authored 6 years ago
  
  Lua FOF flat names fix See merge request !405
  c9a73034
- fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic · 76fe7857
  Monster Iestyn authored 6 years ago
  
  76fe7857
- Merge branch 'master' into next · dfbbab35
  Monster Iestyn authored 6 years ago
  
  dfbbab35
- Merge branch 'exitvars-fix' into 'next' · 1e15f236
  mazmazz authored 6 years ago
  
  Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua See merge request !404
  1e15f236
- Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua · e2b8ff26
  Marco Z authored 6 years ago
  
  e2b8ff26
- Merge branch 'lua-nextmapoverride' into 'next' · dd107724
  mazmazz authored 6 years ago
  
  Lua: nextmapoverride & skipstats changing outside of G_ExitLevel See merge request !396
  dd107724
- Update EXECVERSION to MODVERSION 27 · 04916edc
  Marco Z authored 6 years ago
  
  04916edc
- Update code versions to 2.1.22 · 9d212b34
  Marco Z authored 6 years ago
  
  9d212b34
- Merge branch 'version-string-develop' into 'master' · 25f0dc7e
  mazmazz authored 6 years ago
  
  Add DEVELOP build flag to version string See merge request !401
  25f0dc7e
- Add DEVELOP build flag to version string · 7f8d16d3
  Marco Z authored 6 years ago
  
  7f8d16d3
- Adjust execversion retrieval in CV_FilterVarByVersion · 60bcf925
  Marco Z authored 6 years ago
  
  60bcf925
- Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION*... · 969960a1
  Marco Z authored 6 years ago
  
  Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
  969960a1
- Assign joy button defaults for 1 and 2 player · ed7178bc
  Marco Z authored 6 years ago
  
  ed7178bc
- Merge branch 'pk3-stray-blockmap-msg' into 'master' · 722ceb52
  mazmazz authored 6 years ago
  
  Comment out stray PK3 blockmap message See merge request !399
  722ceb52