stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 18:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
14186 commits 172 branches 41 tags 281 MiB
Commit graph

14186 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
MascaraSnake
59c6d59c00 Adapt NiGHTS things to UDMF 2021-12-19 21:30:49 +01:00
MascaraSnake
482c24a1fb Adapt NiGHTS track items to UDMF 2021-12-18 10:45:50 +01:00
MascaraSnake
1a1e5faf08 Adapt fan particle generator to UDMF 2021-12-18 10:31:42 +01:00
MascaraSnake
ebf692f143 Adapt push/pull point to UDMF 2021-12-16 07:00:30 +01:00
MascaraSnake
2a2d70e7cf Refactor some onconveyor stuff 2021-12-14 20:29:14 +01:00
MascaraSnake
add371a1ce Add UDMF thing types to UDB config 2021-12-14 19:48:05 +01:00
MascaraSnake
fa92ed2a8b Add a wrapper function for writing a constant into a string arg 2021-12-14 19:08:59 +01:00
MascaraSnake
ed9a562ec4 Adapt maces to UDMF 2021-12-14 18:50:47 +01:00
MascaraSnake
c1e22c4bb6 Add two more linedef/thing args because the maces need them 2021-12-14 06:43:06 +01:00
spherallic
e7a7a3b213 Prevent Pyrefly fire from warping up nearby ledges. 2021-12-13 15:20:43 +01:00
MascaraSnake
1b023732d0 Adapt rock spawner to UDMF 2021-12-13 08:24:52 +01:00
lachablock
7ed8178372 Oops typo 2021-12-12 19:18:13 +11:00
lachablock
2794727201 Improve bot handling: 
- bot ticcmds are generated and sent by the server only
- fix issue where server would not send all ticcmds to clients if bots were in the game
- fix bots still responding to P1's inputs while P1's controls are locked
- fix bot player's directional controls being rotated when controlled by P2
 2021-12-12 18:52:27 +11:00
MascaraSnake
f714966c83 Remove outdated linedef type check in HWR_ProcessSeg 2021-12-12 08:27:27 +01:00
MascaraSnake
ac3dd146c7 Expose blendmodes to UDMF 2021-12-12 07:02:17 +01:00
MascaraSnake
f431b20911 Add new blendmode linedef types to config 2021-12-12 06:54:48 +01:00
GoldenTails
9282a18d82 oops forgot to remove the old hardcoded defines 2021-12-11 20:11:46 -06:00
GoldenTails
20987eba92 Use lookup tables, macros, and for loops to shorten up the wad search code. 
The old inline mess needed to go badly.
 2021-12-11 20:00:00 -06:00
MascaraSnake
2c0fb5e80f Delete accidentally added .orig file 2021-12-09 22:12:48 +01:00
MascaraSnake
21f8baea4a Make trigger conditions for "all players" triggers consistent 2021-12-09 21:36:46 +01:00
MascaraSnake
a35a3b3edc Sector specials: Give up on trying to find polyobjects in touched sectors 2021-12-09 21:32:34 +01:00
MascaraSnake
cc38cd0071 Remove outdated console warning that never happens anyway 2021-12-09 21:00:22 +01:00
MascaraSnake
dc4dd75810 Add NiGHTS mare trigger linedef type and deprecate the NiGHTS mare sector type 2021-12-09 20:57:44 +01:00
MascaraSnake
18e8ebf394 Add emerald check trigger linedef types and deprecate the emerald check sector type 2021-12-09 20:37:39 +01:00
MascaraSnake
22420f92d2 Some trigger lineder cleanup 2021-12-09 20:02:03 +01:00
MascaraSnake
c43d5c7183 Adapt linedef types 334-336 to UDMF 2021-12-09 19:53:14 +01:00
MascaraSnake
adaf599e87 Adapt linedef types 331-333 to UDMF 2021-12-09 19:33:02 +01:00
MascaraSnake
a7f5bcfea7 Adapt linedef type 305-307 to UDMF 2021-12-09 19:17:16 +01:00
MascaraSnake
670e32908e Adapt linedef type 308 to UDMF 2021-12-09 18:56:50 +01:00
MascaraSnake
126cbdd189 Adapt linedef types 321-322 to UDMF 2021-12-09 18:15:27 +01:00
MascaraSnake
2638e1212c Fix a typo 2021-12-09 16:10:39 +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
MascaraSnake
875ba7915c Adapt linedef types 309-312 to UDMF 2021-12-09 08:49:50 +01:00
MascaraSnake
9d87e97275 Adapt linedef types 317-320 to UDMF 2021-12-09 08:08:04 +01:00
MascaraSnake
f86dff8cf2 Adapt linedef types 314-315 to UDMF 2021-12-09 07:56:15 +01:00
MascaraSnake
92e724faca Adapt linedef types 303-304 to UDMF 2021-12-09 07:47:01 +01:00
MascaraSnake
f60873c19b Adapt linedef types 300-302 to UDMF 2021-12-09 07:30:55 +01:00
MascaraSnake
44434a64d1 Refactor P_RunTriggerLinedef 2021-12-09 07:10:16 +01:00
MascaraSnake
060bc5fde0 Replace P_ThingOnSpecial3DFloor with the more versatile P_MobjTouchingSectorSpecial 2021-12-08 21:07:26 +01:00
MascaraSnake
1a2b0d24ab Make all players triggers work if players are in different sectors with the same tag 2021-12-08 20:29:10 +01:00
katsy
895c3bf19b fix spike ring catapult 2021-12-07 17:10:38 -06:00
MascaraSnake
c8cb096647 "Floor touch" sector specials are no longer contaminated by "anywhere in sector" specials 2021-12-07 21:39:45 +01:00
Hannu Hanhi
f3c5addab7 Improve OpenGL GDI Generic error message 2021-12-07 22:35:04 +02:00