Commits · 215ff828f8b6e3773f17fa3cdba004022265b08a · STJr / SRB2 · GitLab

Snippets Groups Projects

May 10, 2020
- Merge branch 'master' into next · 215ff828
  lachwright authored 4 years ago
  
  215ff828
- Merge branch '1upsound' into 'master' · 4437c27b
  Lach authored 4 years ago
  
  Play the 1-up sound when 1upsound is set to sound See merge request !926
  4437c27b
- Merge branch 'patch_music' into 'next' · 357ad685
  Lach authored 4 years ago
  
  patch_music.pk3 See merge request STJr/SRB2!812
  357ad685
May 09, 2020
- Merge branch 'gfz3laser-mkii' into 'next' · 28063301
  LJ Sonic authored 4 years ago
  
  New Greenflower Zone 3 laser See merge request !924
  28063301
- Merge branch 'optimise-archiving' into 'next' · 62d5d16f
  LJ Sonic authored 4 years ago
  
  Optimise net-archiving of Lua strings, numbers and booleans See merge request STJr/SRB2!904
  62d5d16f
- Merge branch 'showfps-tweaks' into 'next' · 8a2a7a3b
  LJ Sonic authored 4 years ago
  
  FPS counter tweaks See merge request !927
  8a2a7a3b
May 08, 2020
- Make showfps save to config, and add a compact option. · c55d6dbc
  sphere authored 4 years ago
  
  c55d6dbc
May 07, 2020
- Play the 1-up sound when 1upsound is set to sound · 426925c5
  Lachlan authored 4 years ago
  
  426925c5
- Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next · 60aa0f82
  MascaraSnake authored 4 years ago
  
  60aa0f82
- Fixed a typo · 650f4456
  MascaraSnake authored 4 years ago
  
  650f4456
- Prevent laser sprites clipping into walls/off ledges · 9d21d790
  lachwright authored 4 years ago
  
  9d21d790
- Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it · 36b40038
  lachwright authored 4 years ago
  
  36b40038
- Fix knockback scaling · 3a1988fc
  lachwright authored 4 years ago
  
  3a1988fc
- Merge remote-tracking branch 'origin/next' into gfz3laser-mkii · 51a5ece2
  lachwright authored 4 years ago
  
  51a5ece2
May 06, 2020
- Merge branch 'master' into next · 24df9f03
  Alam Ed Arias authored 4 years ago
  
  24df9f03
- fix build errors in public master · 38232ce0
  Alam Ed Arias authored 4 years ago
  
  38232ce0
- Merge branch 'master' into next · 30105621
  Monster Iestyn authored 4 years ago
  
  30105621
- Merge branch 'to-put-it-in-short' into 'master' · 9571c1e5
  Monster Iestyn authored 4 years ago
  
  To put it in SHORT() See merge request !913
  9571c1e5
- Merge branch 'next' into gfz3laser-mkii · 05ea95d0
  Lachlan authored 4 years ago
  
  05ea95d0
- Update new GFZ3 laser · 63cb58a1
  lachwright authored 4 years ago
  
  63cb58a1
- New GFZ3 laser · 92c900f2
  lachwright authored 4 years ago
  
  92c900f2
May 05, 2020
- Merge branch... · 20d207a7
  LJ Sonic authored 4 years ago
  
  Merge branch 'fix-fucking-warning-why-did-my-compiler-not-tell-me-when-i-was-testing-omfg' into 'next' fix warning and destroy universe See merge request !922
  20d207a7
- Fix compiler warning · 2d6c9a94
  LJ Sonic authored 4 years ago
  
  2d6c9a94
- Fix PolyObject flags not being applied when there is no parameter line · 5282f01a
  MascaraSnake authored 4 years ago
  
  5282f01a
May 04, 2020
- Merge branch 'polyobject-cleanup' into 'next' · 023c095d
  MascaraSnake authored 4 years ago
  
  PolyObject cleanup See merge request !919
  023c095d
- Add new PolyObject flag to ZB config · 41efc078
  MascaraSnake authored 4 years ago
  
  41efc078
- PolyObject: Allow translucency to be set via X offset · de100b07
  MascaraSnake authored 4 years ago
  
  de100b07
- Merge branch 'level-header-sector-typeskd' into 'next' · d03742b1
  MascaraSnake authored 4 years ago
  
  Allow some map-wide settings to be set via level header instead of sector types See merge request !917
  d03742b1
- Merge branch 'egg-capsule' into 'next' · f81b5a74
  MascaraSnake authored 4 years ago
  
  Add "trigger egg capsule" linedef executor See merge request !916
  f81b5a74
- Simplify set/fade polyobject translucency code · 248df41a
  MascaraSnake authored 4 years ago
  
  248df41a
- Make PolyObject special functions return boolean instead of INT32 · e3ddb413
  MascaraSnake authored 4 years ago
  
  e3ddb413
- Remove non-descriptive comments · 78a700f5
  MascaraSnake authored 4 years ago
  
  78a700f5
- Move parameter parsing for EV_DoPolyObjFlag into its own function · 2be775e7
  MascaraSnake authored 4 years ago
  
  2be775e7
- Pass parameters to EV_DoPolyObjFlag in a struct and not via the line · 482adc61
  MascaraSnake authored 4 years ago
  
  482adc61
May 03, 2020
- Refactor Polyobj_findSegs · 02c347ad
  MascaraSnake authored 4 years ago
  
  02c347ad
- Purge uninformative comments · 8ae635c7
  MascaraSnake authored 4 years ago
  
  8ae635c7
- Clean up Polyobj_GetInfo · b82c3c20
  MascaraSnake authored 4 years ago
  
  b82c3c20
- Remove "explicitly include line in polyobject" code which has never worked · 5de11441
  MascaraSnake authored 4 years ago
  
  5de11441
- Allow map-wide gravity to be set via level header · 700b3408
  MascaraSnake authored 4 years ago
  
  700b3408
- Add level header options for setting special stage time and spheres requirements · 4b87bee7
  MascaraSnake authored 4 years ago
  
  4b87bee7