Commit graph

16762 commits

Author SHA1 Message Date
James R
139253a8c2 Offset slope anchors from regular slopes 2020-10-16 16:40:57 -07:00
James R
c19d511ee4 Use FIELDFROM in lua polyobject code 2020-10-15 16:17:51 -07:00
James R
8e3ea37b21 Merge remote-tracking branch 'origin/next' into reverse-offsetof-macro 2020-10-15 16:15:20 -07:00
James R
07db322914 Merge branch 'step-down-ceiling' into 'next'
Apply step up/down to opposite plane too

See merge request STJr/SRB2!1192
2020-10-15 19:11:13 -04:00
James R
66a6374dbe Merge branch 'lua-polyobjects' into 'next'
Lua polyobjects

Closes #19

See merge request STJr/SRB2!1140
2020-10-15 19:08:54 -04:00
James R
01d940963f Merge branch 'raretry-fix' into 'next'
Make record attack's quick retry more consistent.

Closes #80

See merge request STJr/SRB2!1193
2020-10-15 19:02:34 -04:00
James R
7b48272ca7 Merge branch 'gif-colorlutfix' into 'next'
Fix OpenGL GIF recording crashing with gif_localcolortable disabled

See merge request STJr/SRB2!1196
2020-10-15 19:00:47 -04:00
James R
99c1f8dba5 Move higher 2020-10-15 15:53:44 -07:00
James R
4569d9650a Move drop reset in air to P_CheckPosition
Fixes respawning over slopes after crossing a drop.
2020-10-15 15:51:31 -07:00
James R
9fb7ba77e4 Midtexture step up/down 2020-10-15 14:47:10 -07:00
James R
0bf00aad35 Condense variables, rename 'diff' to 'step' 2020-10-15 14:23:02 -07:00
James R
1db22403bb Guard with mobj?? 2020-10-15 04:30:48 -07:00
James R
75b3fffc04 AAAAAAAAAAA 2020-10-15 04:23:28 -07:00
James R
9723283055 FOF step down 2020-10-15 03:33:37 -07:00
James R
894860b9bc Step up fake floors 2020-10-15 02:58:29 -07:00
Jaime Passos
073b9b8d12 Fix OpenGL GIF recording crashing with gif_localcolortable disabled 2020-10-15 01:14:16 -03:00
James R
3a4a687da0 Use height difference between front and backside of line when stepping down
This should fix the janky falling off steep slopes and let you cling to them.
Because when falling off a sector the edge of the player must not intersect
the edge of the higher sector, it is trickier than step up. The height
difference at the line must be stored to be useful.
2020-10-14 21:10:02 -07:00
Steel Titanium
9888555431 Merge branch 'master' into next 2020-10-14 14:58:07 -04:00
sphere
ab9c85f76a Make record attack's quick retry more consistent. 2020-10-14 17:39:23 +02:00
James R
1363291a78 brug 2020-10-14 01:19:43 -07:00
James R
1347157e21 Merge branch 'fix-gzip-makefile-failure' into 'master'
Fix gzip failing to compress SRB2's objdump on non-Windows.

See merge request STJr/SRB2!1191
2020-10-14 03:11:26 -04:00
James R
9348dcbf98 Merge branch 'ffloorclip-2' into 'next'
Software 3D floor rendering optimization (second attempt)

See merge request STJr/SRB2!1184
2020-10-14 03:10:44 -04:00
James R
1f7f88cd1f Merge branch 'i-pity-you' into 'next'
Allow JumpSpin abilities to be used with non-ability shields

Closes #277

See merge request STJr/SRB2!1146
2020-10-14 03:08:20 -04:00
James R
dab116a0bd CODE 2020-10-13 21:44:48 -07:00
James R
0d116b39c5 Compare height for step up on edge of sector
This is for slopes. When moving across a slope the height changes. Therefore
compare the height at the edge where slopes meet so only a wall will block the
player, and not a very steep slope.
2020-10-13 20:27:36 -07:00
James R
36d0e58fc4 Don't need to set this actually 2020-10-13 19:11:18 -07:00
James R
e82ee6078d Apply step up/down to opposite plane too 2020-10-13 19:04:52 -07:00
James R
4c7400b27e Merge branch 'save-netvars' into 'next'
Save netvars

See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
James R
975e042d66 Merge branch 'addfile-vararg' into 'next'
Give the addfile command variable argument support.

See merge request STJr/SRB2!1176
2020-10-12 18:32:20 -04:00
lachwright
72a7bb90c7 Merge remote-tracking branch 'origin/next' into i-pity-you 2020-10-13 09:24:09 +11:00
James R
c04d08460a Merge branch 'slight-shader-cleanup' into 'next'
Shader code cleanup

See merge request STJr/SRB2!1103
2020-10-12 18:22:08 -04:00
GoldenTails
33d026ed5a Futureproof against strict buildbots. 2020-10-12 17:14:32 -05:00
James R
06fc1c5e30 Merge branch 'penalty-of-death' into 'next'
I am going to die :D (closes #337)

Closes #337

See merge request STJr/SRB2!1183
2020-10-12 18:11:09 -04:00
James R
da41c5b79d Merge branch 'skip-credits-gone-wrong' into 'next'
Fix clients being able to skip credits AGAIN (closes #339)

Closes #339

See merge request STJr/SRB2!1182
2020-10-12 18:09:48 -04:00
James R
c9532c32e2 Merge branch 'specialstagecheck' into 'next'
A special stage is a special stage, even outside of coop.

Closes #211

See merge request STJr/SRB2!1180
2020-10-12 18:08:02 -04:00
James R
b566bb8ae3 Merge branch 'no-demo-visit' into 'next'
Don't count demo playback as visiting a level.

Closes #327 and #340

See merge request STJr/SRB2!1177
2020-10-12 18:05:43 -04:00
GoldenTails
e97a5d6087 Fix gzip failing to compress SRB2's objdump on non-Windows. 2020-10-12 16:59:47 -05:00
James R
dd0321142f Merge branch 'splitscreen-parameter' into 'next'
Add `-splitscreen` commandline parameter

See merge request STJr/SRB2!1175
2020-10-12 17:46:55 -04:00
James R
619484259f Merge branch 'ceilingz' into 'next'
Add P_CeilingzAtPos function

See merge request STJr/SRB2!1164
2020-10-12 17:44:51 -04:00
James R
45f9df2951 Use the macro in sectorlines_num too 2020-10-10 17:40:01 -07:00
James R
bbb82166d3 Turn the lua sector lines hack into a macro 2020-10-10 16:43:09 -07:00
Hannu Hanhi
a5dde40252 Put newline to end of m_perfstats.h 2020-10-10 22:23:33 +03:00
Hannu Hanhi
24ff748c58 Performance stats 2020-10-10 22:12:34 +03:00
Jaime Passos
3623d715b8 Fix bug 2020-10-10 13:37:23 -03:00
Jaime Passos
b7d1c0b1e4 Make 3D floors cull areas below or above them to reduce overdraw (2) 2020-10-10 01:00:39 -03:00
James R
bc637afd09 Show revert value of cvar with help command 2020-10-09 16:28:03 -07:00
James R
c920e688c0 When save/loading config use revert value for netvars if you are not the server 2020-10-09 16:22:17 -07:00
James R
b088aad169 Add CV_NETVAR to server affecting cvars
showjoinaddress
maxplayers
joindelay
rejointimeout
resynchattempts
blamecfail
maxsend
noticedownload
downloadspeed
jointimeout
maxping
pingtimeout
servername
2020-10-09 15:23:16 -07:00
James R
e9d8166e3b Add CV_SAVE to netvars
dumpconsistency
allowjoin
joinnextround
restrictskinchange
allowteamchange
startinglives
respawndelay
competitionboxes
allowseenames
matchboxes
specialrings
powerstones
countdowntime
touchtag
hidetime
autobalance
teamscramble
scrambleonchange
friendlyfire
overtime
pointlimit
timelimit
basenumlaps
allowexitlevel
inttime
coopstarposts
cooplives
advancemap
playersforexit
exitmove
pausepermission
respawnitemtime
respawnitem
flagtime

tv_recycler
tv_teleporter
tv_superring
tv_supersneaker
tv_invincibility
tv_jumpshield
tv_watershield
tv_ringshield
tv_forceshield
tv_bombshield
tv_1up
tv_eggmanbox
2020-10-09 15:06:09 -07:00
Zippy_Zolton
25b0290e2e I am going to die :D 2020-10-09 15:42:55 -05:00