Commit graph

11481 commits

Author SHA1 Message Date
James R
f7b907de14 Merge branch 'cmake-curl-internal-fix' into 'master'
Fix compiling using cmake if internal libs is used

See merge request STJr/SRB2!1225
2020-11-01 22:57:12 -05:00
James R
f0d9484dae Merge branch 'copyright-fixes' into 'next'
Fix some copyright statements in new files

See merge request STJr/SRB2!1223
2020-11-01 22:56:58 -05:00
James R
1ba019bdc2 Merge branch 'udmf-seg-length-crash-fix' into 'next'
UDMF Seg length crash fix

See merge request STJr/SRB2!1221
2020-11-01 22:55:13 -05:00
James R
0494ed8bfd Merge branch 'fix-objectplace-silent' into 'next'
Fix objectplace -silent

See merge request STJr/SRB2!1214
2020-11-01 22:52:46 -05:00
James R
a9a08046f0 Merge branch 'mobjghost-rollangle' into 'next'
Ghost mobj matches rollangle (Closes #362)

Closes #362

See merge request STJr/SRB2!1211
2020-11-01 22:49:50 -05:00
James R
b83311a654 Merge branch 'tailsoverlay-dash' into 'next'
Dash state for Tails overlay (Closes #325)

Closes #325

See merge request STJr/SRB2!1210
2020-11-01 22:49:12 -05:00
James R
f843bedfb1 Merge branch 'master-use-sse3' into 'master'
Use SSE3 in 32-bit x86 binaries

See merge request STJr/SRB2!1213
2020-11-01 22:47:36 -05:00
James R
972b0c084e The lump is not needed for P_WriteThings 2020-11-01 19:31:10 -08:00
Steel Titanium
ef1ca357de Expose more music functions to Lua 2020-10-31 21:15:41 -04:00
James R
63453fc5b3 Merge branch 'staggersaves' into 'next'
Draw save files from outwards in

See merge request STJr/SRB2!1228
2020-10-31 18:39:14 -04:00
Steel Titanium
00f9e777af Expose gamestate to Lua 2020-10-31 16:36:15 -04:00
Hannu Hanhi
b18fe88265 Fix CMake SSE3 flag 2020-10-31 18:04:44 +02:00
lachwright
7be608c6aa Draw save files from outwards in 2020-10-31 18:21:14 +11:00
Steel Titanium
f9b1f873a4 CMake: Fix fullscreen toggle not working
All because of a typo
2020-10-31 00:59:51 -04:00
Steel Titanium
3b7f0001cf Fix compiling using cmake if internal libs is used 2020-10-30 23:37:34 -04:00
Louis-Antoine
a8c44ebb6a Use the same names as userdataType() for userdataMetatable() 2020-10-30 15:00:13 +01:00
Louis-Antoine
bbd09eace1 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into register-metatables 2020-10-30 14:46:04 +01:00
Zippy_Zolton
16cc066e2e thunder shield :D 2020-10-29 12:32:42 -05:00
Hannu Hanhi
0516d21ff1 Fix some copyright statements in new files 2020-10-29 16:04:25 +02:00
Monster Iestyn
41d8bc8020 Fix seg->length and flength not being set at all for UDMF maps 2020-10-28 19:36:03 +00:00
Zippy_Zolton
39d003d6f7 Flame Shield Changes 2020-10-28 01:23:05 -05:00
Jaime Passos
d2c000b252 Implement an "ignore colormaps" sprite rendering flag 2020-10-27 19:54:50 -03:00
Jaime Passos
ab3f4960cb Bug fixes 2020-10-27 17:02:35 -03:00
Nev3r
df6a903592 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
# Conflicts:
#	src/lua_baselib.c
#	src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Louis-Antoine
bc86d89206 Remove useless condition 2020-10-27 20:28:54 +01:00
Louis-Antoine
f3bc526fc2 Do not pause the client while redownloading the gamestate 2020-10-27 20:23:32 +01:00
Louis-Antoine
fd3189a5f6 Fix music resetting after reloading the gamestate 2020-10-27 20:22:15 +01:00
Louis-Antoine
546a3ff015 Fix camera going wild after reloading the gamestate 2020-10-27 20:21:56 +01:00
Jaime Passos
cdc4a6d86e Implement blend modes 2020-10-27 00:03:41 -03:00
Louis-Antoine
1e287d38f1 Only resend the gamestate to one client at a time 2020-10-27 01:22:31 +01:00
Louis-Antoine
f6f6b4cf45 Add a 15 seconds cooldown between successive gamestate resends 2020-10-27 01:20:05 +01:00
Louis-Antoine
69c4a6ee4c Fix underflow in consistancy checking code 2020-10-26 23:15:22 +01:00
James R
df74b9265b Check maxstep is not disabled before stepping up
Fixes infinite step up when it should be no step up.
2020-10-26 14:00:54 -07:00
James R
b812c7a6d6 Whoops 2020-10-24 20:44:42 -07:00
James R
66094d30c9 Merge branch 'playah' into 'next'
Credits Changes

See merge request STJr/SRB2!1200
2020-10-24 21:54:40 -04:00
Zolton Auburn
dded1554fe Update f_finale.c 2020-10-24 20:17:20 -04:00
Zolton Auburn
b9806cba7e Update f_finale.c 2020-10-24 20:16:21 -04:00
James R
a0150e3ddf Fix objectplace -silent 2020-10-24 15:29:31 -07:00
Hannu Hanhi
e0a09ceeae Use SSE3 in 32-bit x86 binaries 2020-10-25 00:08:24 +03:00
Zippy_Zolton
e5b2a926f3 Ghost mobj matches rollangle 2020-10-24 12:38:30 -05:00
Louis-Antoine
ddec491b0b Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate 2020-10-24 16:21:44 +02:00
James R
f21b2c66b5 Merge remote-tracking branch 'origin/master' into next 2020-10-23 14:57:13 -07:00
James R
bfa32cf2fc Merge branch 'reverse-offsetof-macro' into 'next'
Turn the lua sector lines hack into a macro

See merge request STJr/SRB2!1187
2020-10-23 16:44:29 -04:00
James R
239beed0ed Merge branch 'set-cvars' into 'next'
Set cvars directly from Lua

See merge request STJr/SRB2!1205
2020-10-23 16:42:42 -04:00
James R
cded5a9416 Merge branch 'cmake-multithreading' into 'master'
Add multithreading option for CMake

See merge request STJr/SRB2!1204
2020-10-23 16:42:32 -04:00
James R
e764043a81 Merge branch 'skip-unused-mobj-hooks' into 'next'
Only invoke the Lua API for mobj hooks that need it

See merge request STJr/SRB2!1209
2020-10-23 16:40:07 -04:00
James R
cf65d5eb00 Merge branch 'insert-wait' into 'next'
Do not let previous wait commands affect COM_BufInsertText

See merge request STJr/SRB2!1207
2020-10-23 16:38:46 -04:00
James R
dc2ecc5013 Merge branch 'fix-ghost-netvar-crash' into 'next'
Fix G_GhostTicker crashing trying to read netvars as ghost data

See merge request STJr/SRB2!1203
2020-10-23 16:37:49 -04:00
James R
b3ac8e336a Merge branch 'sw-npo2-span-opt' into 'next'
NPO2 span function optimization

See merge request STJr/SRB2!1201
2020-10-23 16:36:18 -04:00
LJ Sonic
e8b6f9db5e Merge branch 'catchup-timeout' into 'next'
Kick clients that fail to catch up with server gamelogic

See merge request STJr/SRB2!1208
2020-10-23 16:19:10 -04:00