stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 20:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
12522 commits 171 branches 41 tags 312 MiB
Commit graph

12522 commits

This branch
This branch
All branches
Author SHA1 Message Date
katsy
2e4c5d1446 alternate fix to #555 which doesn't crash the game 2022-01-10 19:32:21 -06:00
sphere
e8c83f48be Merge branch 'fix-binary-mtag' into 'next' 
Make linedef 96 apply to tags from 97-99, but not to itself

See merge request STJr/SRB2!1633
 2021-12-29 10:07:35 +00:00
sphere
4e972f7d24 Merge branch 'deathpit_explosions' into 'next' 
Fix enemy/boss/minecart explosions in death pits (Closes #67)

Closes #67

See merge request STJr/SRB2!1688
 2021-12-29 10:00:25 +00:00
sphere
2e8b7688e8 Merge branch 'resolve-329' into 'next' 
Allow changing the master server address while hosting a netgame

Closes #329

See merge request STJr/SRB2!1687
 2021-12-29 10:00:08 +00:00
sphere
c12ad1d63c Merge branch 'invert' into 'next' 
Give the inverted flashpal a constant

See merge request STJr/SRB2!1685
 2021-12-29 10:00:04 +00:00
sphere
68547a503b Merge branch 'botsforexit' into 'next' 
Don't count bots in playersforexit

See merge request STJr/SRB2!1684
 2021-12-29 09:59:54 +00:00
katsy
effcb948ad Don't count bots in playersforexit 2021-12-29 09:59:54 +00:00
sphere
e152a32c10 Merge branch 'HUD_fixes' into 'next' 
Some hud fixes (by Confusion)

See merge request STJr/SRB2!1670
 2021-12-29 09:59:40 +00:00
sphere
31eb2a7e77 Merge branch 'nobotbonus' into 'next' 
Don't award end-of-level bonuses to Tailsbot

See merge request STJr/SRB2!1676
 2021-12-27 11:49:13 +00:00
spherallic
1040141560 Fix enemy/boss/minecart explosions in death pits 2021-12-27 12:41:04 +01:00
spherallic
b830fee2e3 Allow changing the master server address while hosting a netgame. 2021-12-26 21:30:36 +01:00
spherallic
bb514d227c Don't count music.dta as a main wad when using listwad 2021-12-26 21:12:39 +01:00
sphere
6cb6cc5afb Merge branch 'fixlazytails' into 'next' 
Set a default botleader if we don't have one (resolves #717)

Closes #717

See merge request STJr/SRB2!1683
 2021-12-26 12:41:49 +00:00
katsy
243a797efe Set a default botleader if we don't have one (resolves #717) 2021-12-26 12:41:49 +00:00
katsy
9b10473e0d add invert flashpal constant 2021-12-24 19:36:26 -06:00
sphere
2615528f45 Merge branch 'pterabyte-mash' into 'next' 
CR_PTERABYTE tweaks (Closes #304)

Closes #304

See merge request STJr/SRB2!1380
 2021-12-24 13:29:13 +00:00
sphere
4b9d40b911 Merge branch 'we-do-a-little-trolling' into 'next' 
Take ramp sectors into account for pushables (closes #595)

Closes #595

See merge request STJr/SRB2!1540
 2021-12-20 12:34:26 +00:00
sphere
646844bfdc Merge branch 'fix-drowning-vanishing' into 'next' 
Fix player disappearing when drowning in painstate (resolves #597)

Closes #597

See merge request STJr/SRB2!1667
 2021-12-20 12:33:20 +00:00
sphere
b092374e1a Merge branch 'lagspikes' into 'next' 
Minor spike optimisations

See merge request STJr/SRB2!1669
 2021-12-20 12:33:13 +00:00
sphere
1abe3374ef Merge branch 'sandwich' into 'next' 
Fix spike sandwich teleportation issue (resolves #693)

Closes #693

See merge request STJr/SRB2!1672
 2021-12-20 12:33:00 +00:00
sphere
3e8e6bcbb8 Merge branch 'netsave-pmomz-fix' into 'next' 
Include pmomz for mobjs in net savestates and load if it exists (Resolves #713)

Closes #713

See merge request STJr/SRB2!1675
 2021-12-20 12:32:55 +00:00
sphere
fb5eed9d10 Merge branch 'pyreflyfire' into 'next' 
Prevent Pyre Fly fire from warping up nearby ledges

See merge request STJr/SRB2!1681
 2021-12-20 12:32:47 +00:00
spherallic
e7a7a3b213 Prevent Pyrefly fire from warping up nearby ledges. 2021-12-13 15:20:43 +01:00
spherallic
6f5b34f7c1 Don't award end-of-level bonuses to bots. 2021-12-09 12:45:18 +01:00
John FrostFox
c420de6f11 Include pmomz for mobjs in net savestates and load if it exists 2021-12-09 11:42:06 +03:00
katsy
97e2fe18c6 fix spike sandwich teleportation issue 2021-12-06 18:00:30 -06:00
LJ Sonic
6504557393 Merge branch 'asin' into 'next' 
arcsine Lua wrapper

See merge request STJr/SRB2!1554
 2021-12-06 00:01:45 +00:00
LJ Sonic
066a9d1534 Merge branch 'fix-musicchange-hook' into 'next' 
Fix MusicChange hook crashing when called

See merge request STJr/SRB2!1671
 2021-12-05 17:02:20 +00:00
LJ Sonic
f271f88c7f Fix MusicChange hook crashing when called 
BRUH MOMENT BRUH MOMENT
PREPARE THE HALL OF SHAME
 2021-12-05 17:59:33 +01:00
sphere
76bbef29a9 Merge branch 'trigger-bruh' into 'next' 
Fix "all players" check in T_EachTimeThinker

See merge request STJr/SRB2!1668
 2021-12-05 14:45:01 +00:00
spherallic
fdc825721f some hud fixes, by Confusion 2021-12-05 12:47:20 +01:00
katsy
b2d693a547 minor spike optimisations 2021-12-05 02:13:09 -06:00
MascaraSnake
55fc7cbd67 Fix "all players" check in T_EachTimeThinker 2021-12-05 07:20:55 +01:00
Radicalicious
86edb1e4ca Fix player disappearing when drowning in painstate 2021-12-03 23:20:07 -06:00
Radicalicious
d791fc2dc8 Merge remote-tracking branch 'stjr/next' into we-do-a-little-trolling 2021-12-03 21:53:32 -06:00
LJ Sonic
1acd0f6bac Merge branch 'starstruck' into 'next' 
Null gamestate before map transition to prevent unwanted interactions with the map (resolves #601)

Closes #601

See merge request STJr/SRB2!1624
 2021-12-03 18:02:06 +00:00
Lach
ac2e8119db Merge branch 'supersuck' into 'next' 
Add MFE_FORCESUPER, MFE_FORCENOSUPER, and MFE_REVERSESUPER extra flags (Solves #520)

See merge request STJr/SRB2!1452
 2021-12-03 12:18:39 +00:00
SteelT
bb514a0627 Merge branch 'metal-recording-srb2home' into 'next' 
Fix metal recordings not being saved in srb2home

See merge request STJr/SRB2!1601
 2021-12-03 00:32:06 +00:00
LJ Sonic
d77b427329 Merge branch 'adjust-max-downloadspeed' into 'next' 
Raise the maximum value of file upload speed drastically

See merge request STJr/SRB2!1665
 2021-12-02 23:57:42 +00:00
LJ Sonic
b959d0f4ab Merge branch 'fix-console-keyup' into 'next' 
Fix `KeyUp` hook being called when the console is open

See merge request STJr/SRB2!1664
 2021-12-02 23:57:38 +00:00
LJ Sonic
be87a84a01 Merge branch 'perfstats-averaging-rebased' into 'next' 
Perfstats averaging and refactor

See merge request STJr/SRB2!1643
 2021-12-02 23:57:26 +00:00
LJ Sonic
95c61e0fab Merge branch 'ksf-wadfiles' into 'next' 
Raise addon limit

See merge request STJr/SRB2!1465
 2021-12-02 22:50:46 +00:00
LZA
a3353be0dc Raise addon limit 2021-12-02 22:50:44 +00:00
LJ Sonic
599abc2a78 Merge branch 'lua-timestamp' into 'next' 
Timestamp function for Lua

See merge request STJr/SRB2!1647
 2021-12-02 22:41:08 +00:00
LJ Sonic
ff037a8160 Remove downloadspeed cruft 2021-12-02 23:34:28 +01:00
LJ Sonic
14403737ef Raise the file upload speed drastically 2021-12-02 23:15:55 +01:00
LJ Sonic
425d1f1b53 Make all key identifiers lowercase 2021-12-02 21:03:16 +01:00
LJ Sonic
443c51714a Fix KeyUp hook being called when the console is open 2021-12-02 21:02:54 +01:00
sphere
33c43744b4 Merge branch 'what' into 'next' 
Clean up bouncy fof code + fix bugs (closes #291)

Closes #291

See merge request STJr/SRB2!1461
 2021-12-02 17:29:43 +00:00
sphere
dad13f2dde Merge branch 'myfixes' into 'next' 
Fix visplanes getting allocated twice (backport from srb2kart)

See merge request STJr/SRB2!1636
 2021-12-02 11:25:18 +00:00