Commits · 194f9ea8c061cefe35b7a77a294f0aa534c5ef2d · SteelT / SRB2

Dec 23, 2018
- Merge branch 'next' into sw_largeroomfix · 194f9ea8
  Alam Arias authored 6 years ago
  
  Unverified
  
  194f9ea8
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 STJr/SRB2!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 STJr/SRB2!409
  41a25a68
- Add sirjuddington and CodeImp to Special Thanks credits · f66ee8c4
  Marco Z authored 6 years ago
  
  f66ee8c4
- 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 STJr/SRB2!393
  9525de2d
- Merge branch 'jump-spin-axes' into 'next' · 28c8ad3d
  mazmazz authored 6 years ago
  
  Feature: Jump/Spin axes See merge request STJr/SRB2!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 STJr/SRB2!400
  75e570f2
- Merge branch 'menu-2pcontrols-fix' into 'master' · 50221c47
  mazmazz authored 6 years ago
  
  Fix 2p control menu graying out See merge request STJr/SRB2!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 STJr/SRB2!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
- Fix 2p control menu graying out · b57204fc
  Marco Z authored 6 years ago
  
  b57204fc
- Merge branch 'lua-fof-flat-names-fix' into 'next' · c9a73034
  Monster Iestyn authored 6 years ago
  
  Lua FOF flat names fix See merge request STJr/SRB2!405
  c9a73034
- change implementation of square root · fcb65951
  Lactozilla authored 6 years ago
  
  fcb65951
- Update r_segs.c · 5b285a60
  Jimita authored 6 years ago
  
  Unverified
  
  5b285a60
- Merge branch 'next' into sw_largeroomfix · ffd50615
  Jimita authored 6 years ago
  
  Unverified
  
  ffd50615
- 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 STJr/SRB2!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 STJr/SRB2!396
  dd107724
- Merge branch 'version-string-develop' into 'master' · 25f0dc7e
  mazmazz authored 6 years ago
  
  Add DEVELOP build flag to version string See merge request STJr/SRB2!401
  25f0dc7e
- Add DEVELOP build flag to version string · 7f8d16d3
  Marco Z authored 6 years ago
  
  7f8d16d3
- 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 STJr/SRB2!399
  722ceb52
- Comment out stray PK3 blockmap message · 78501dcd
  Marco Z authored 6 years ago
  
  78501dcd
- Merge branch 'using-offsetof' into 'next' · 223257e2
  mazmazz authored 6 years ago
  
  Use the `offsetof` function See merge request STJr/SRB2!394
  223257e2
Dec 19, 2018
- Merge branch 'master' into next · e5e978f8
  Alam Ed Arias authored 6 years ago
  
  e5e978f8
- Merge branch 'ogl-zfighting-fix' into 'master' · 7982b169
  mazmazz authored 6 years ago
  
  OpenGL z-fighting fix [by Azeonus] Closes #43 See merge request STJr/SRB2!395
  7982b169
- Merge branch 'save-override' into 'next' · bea76aa4
  mazmazz authored 6 years ago
  
  Feature: Save override for level header See merge request STJr/SRB2!392
  bea76aa4
- Merge branch 'kart-luatextures-backport' into 'next' · 4c69fe23
  mazmazz authored 6 years ago
  
  Lua: Kart textures backport (non-foolish vers) See merge request STJr/SRB2!391
  4c69fe23
Dec 18, 2018
- Change 0.05 to 0.05f · 96cad09d
  Marco Z authored 6 years ago
  
  96cad09d
- dispoffset OGL fix [by Azeonus] · 67cd6dcd
  James Hale authored 6 years ago and Marco Z committed 6 years ago
  
  67cd6dcd