Commits · 8a2a7a3b463d290d6cc7f893951d54a412853d82 · STJr / SRB2 · GitLab

Snippets Groups Projects

May 09, 2020
- 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
- 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
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
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
- Merge branch 'next' into egg-capsule · f7bcc759
  MascaraSnake authored 4 years ago
  
  # Conflicts: # extras/conf/SRB2-22.cfg
  f7bcc759
- Add object dye linedef executors to ZB config · 1b66d1f9
  MascaraSnake authored 4 years ago
  
  1b66d1f9
- Merge branch 'next' into egg-capsule · a9bd307d
  MascaraSnake authored 4 years ago
  
  # Conflicts: # src/p_spec.c
  a9bd307d
- Add "trigger egg capsule" linedef executor · dd50990e
  MascaraSnake authored 4 years ago
  
  dd50990e
May 02, 2020
- Remove inline keyword from P_DoTwinSpin function · 887c25e0
  SteelT authored 4 years ago
  
  The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error
  887c25e0
- Fix drop shadow and rotsprite code to use SHORT() · 1528f2ae
  Monster Iestyn authored 4 years ago
  
  1528f2ae
- Merge branch 'amyswings' into 'next' · d9ed914e
  MascaraSnake authored 4 years ago
  
  Restore jump-related pflags properly during twinspin See merge request !908
  d9ed914e
- Merge branch 'remove-polyobjects' into 'next' · b8a9686a
  MascaraSnake authored 4 years ago
  
  Delete polyobjects See merge request !911
  b8a9686a
- Remove POLYOBJECTS and POLYOBJECTS_PLANES defines · 485a4e50
  MascaraSnake authored 4 years ago
  
  485a4e50
May 01, 2020
- Merge branch 'find-sector-from-tag' into 'next' · 2449c66b
  MascaraSnake authored 4 years ago
  
  Remove P_FindSectorFromLineTag and P_FindLineFromLineTag See merge request STJr/SRB2!901
  2449c66b
- Merge branch 'more-thinker-refactor' into 'next' · 79223061
  MascaraSnake authored 4 years ago
  
  More thinker refactoring See merge request !900
  79223061
- Merge branch 'elevator-cleanup' into 'next' · 90294223
  MascaraSnake authored 4 years ago
  
  elevator_t cleanup See merge request !896
  90294223
- Merge branch 'next' into elevator-cleanup · 790affd1
  MascaraSnake authored 4 years ago
  
  # Conflicts: # src/p_saveg.c
  790affd1