Commit graph

11174 commits

Author SHA1 Message Date
James R
7f65023891 Merge branch 'bustflags' into 'next'
Bustable Wall and Floor flags.

See merge request STJr/SRB2!1163
2020-10-18 16:42:15 -04:00
James R
d279489753 Merge branch 'perfstats' into 'next'
Performance stats

See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
James R
0583eca009 Merge branch 'sw-findplane-opt' into 'next'
R_FindPlane optimization

See merge request STJr/SRB2!1199
2020-10-18 15:16:51 -04:00
Hannu Hanhi
7941a5fb63 R_FindPlane optimization 2020-10-18 01:27:01 +03:00
James R
d6b314951e 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
bd9fda8ceb 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
31977878e1 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
e453a38442 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
Jaime Passos
4c59f8c615 Fix OpenGL GIF recording crashing with gif_localcolortable disabled 2020-10-15 01:14:16 -03:00
Steel Titanium
b19764dc8e Merge branch 'master' into next 2020-10-14 14:58:07 -04:00
sphere
a2ff89f007 Make record attack's quick retry more consistent. 2020-10-14 17:39:23 +02:00
James R
b35633bb61 brug 2020-10-14 01:19:43 -07:00
James R
7952408c8e 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
cce55ccf90 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
f7e9772e10 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
bc23f582fe Don't need to set this actually 2020-10-13 19:11:18 -07:00
James R
5fca04c3dd Apply step up/down to opposite plane too 2020-10-13 19:04:52 -07:00
James R
cb8f6097cf Merge branch 'save-netvars' into 'next'
Save netvars

See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
James R
58464771a8 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
6a73e81227 Merge remote-tracking branch 'origin/next' into i-pity-you 2020-10-13 09:24:09 +11:00
James R
d73fbd8616 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
87a5e1d30c Futureproof against strict buildbots. 2020-10-12 17:14:32 -05:00
James R
d7b8d5d0f3 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
5a5024faf4 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
d4bef36c19 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
d1c8d41f94 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
94f6d0b002 Fix gzip failing to compress SRB2's objdump on non-Windows. 2020-10-12 16:59:47 -05:00
James R
35c666514b 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
9538ca696a Merge branch 'ceilingz' into 'next'
Add P_CeilingzAtPos function

See merge request STJr/SRB2!1164
2020-10-12 17:44:51 -04:00
Hannu Hanhi
465693b242 Put newline to end of m_perfstats.h 2020-10-10 22:23:33 +03:00
Hannu Hanhi
4f20a20165 Performance stats 2020-10-10 22:12:34 +03:00
Jaime Passos
0021a9aeaf Fix bug 2020-10-10 13:37:23 -03:00
Jaime Passos
c5a3a61b28 Make 3D floors cull areas below or above them to reduce overdraw (2) 2020-10-10 01:00:39 -03:00
James R
4b5cb8025b Show revert value of cvar with help command 2020-10-09 16:28:03 -07:00
James R
b67807dd04 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
f5e4d076b9 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
aa102dcea0 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
1c751fdf0f I am going to die :D 2020-10-09 15:42:55 -05:00
James R
a17446f905 Oops, go straight to evaluation if not in a netgame
serverrunning means that you are actually the server.
2020-10-09 13:16:56 -07:00
sphere
76d16473b9 how did this even happen 2020-10-09 05:55:10 -04:00
James R
15008f31a7 Merge branch 'sanity-meter-empty' into 'next'
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
7c72eab58b Merge branch 'manifest-stuff' into 'next'
Provide a default exe manifest

See merge request STJr/SRB2!1174
2020-10-08 22:01:17 -04:00
James R
ddb6823fe5 Merge branch 'fix-theoretical-lua-exposure-crashes' into 'next'
Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions in Lua.

See merge request STJr/SRB2!1173
2020-10-08 22:01:02 -04:00
James R
45b9e23895 Merge branch 'ogl-driver-error' into 'next'
Add error message when the GDI Generic OpenGL renderer is encountered in Windows

See merge request STJr/SRB2!1172
2020-10-08 22:00:43 -04:00
James R
933381fb8f Merge branch 'expose-modversion-to-lua' into 'next'
Expose MODVERSION to Lua (because for some reason it wasn't).

See merge request STJr/SRB2!1158
2020-10-08 21:57:38 -04:00
James R
d83a112fc5 Merge branch 'next' into 'next'
Updated 16 bit momentum values to 32 bit in demos, changed demo version

See merge request STJr/SRB2!1157
2020-10-08 21:56:30 -04:00
Jaime Passos
63d4c1dffc Merge remote-tracking branch 'origin' into slight-shader-cleanup 2020-10-08 22:45:39 -03:00
James R
c3c34c489b Merge branch 'lua-sectorsounds' into 'next'
Support sectors as sound origins in Lua

See merge request STJr/SRB2!1144
2020-10-08 21:05:01 -04:00
James R
355cc1a697 Merge branch 'autocomplete-aliases' into 'next'
Autocomplete aliases in console

See merge request STJr/SRB2!1113
2020-10-08 20:30:07 -04:00
James R
88b3a3cd2e Merge branch 'v-string-colormap-lua-exposure' into 'next'
Expose V_GetStringColormap to Lua via v.getStringColormap().

See merge request STJr/SRB2!1111
2020-10-08 20:28:25 -04:00