Commit Graph

11249 Commits

Author SHA1 Message Date
LJ Sonic 9b151ca45c Merge branch 'resend-gamestate' into 'next'
Resend gamestate when resynching

See merge request STJr/SRB2!829
2020-11-07 13:14:32 -05:00
James R 4ca994a05b Merge branch 'gif-dynamic-delay-v2' into 'next'
Give the GIF recorder some memory so frame delays are a little more accurate

See merge request STJr/SRB2!1198
2020-11-06 17:10:45 -05:00
James R 998a10e8ad Merge remote-tracking branch 'origin/master' into next 2020-11-01 20:01:22 -08:00
James R a653406e7a Merge branch 'lua_expose-gamestate' into 'next'
Expose gamestate to Lua

See merge request STJr/SRB2!1229
2020-11-01 22:57:52 -05:00
James R 56d2290778 Merge branch 'cmake-fullscreen-fix' into 'master'
Cmake: fullscreen fix

See merge request STJr/SRB2!1226
2020-11-01 22:57:27 -05:00
James R f2e15fc4f1 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 4fc0e44c23 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 18365f3820 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 f4b82f27db 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 33cfd2c72a 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 fdbeafca42 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 d7335469eb 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 0bbdde2fb2 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 41d8210fd5 Expose gamestate to Lua 2020-10-31 16:36:15 -04:00
Hannu Hanhi 54cc9db7a5 Fix CMake SSE3 flag 2020-10-31 18:04:44 +02:00
lachwright bfbcc69108 Draw save files from outwards in 2020-10-31 18:21:14 +11:00
Steel Titanium 62b5b86ed4 CMake: Fix fullscreen toggle not working
All because of a typo
2020-10-31 00:59:51 -04:00
Steel Titanium d406340b5d Fix compiling using cmake if internal libs is used 2020-10-30 23:37:34 -04:00
Hannu Hanhi c44120eb87 Fix some copyright statements in new files 2020-10-29 16:04:25 +02:00
Monster Iestyn 5241b83f97 Fix seg->length and flength not being set at all for UDMF maps 2020-10-28 19:36:03 +00:00
Louis-Antoine e178966367 Remove useless condition 2020-10-27 20:28:54 +01:00
Louis-Antoine 395d1f1b8f Do not pause the client while redownloading the gamestate 2020-10-27 20:23:32 +01:00
Louis-Antoine 804ad44e89 Fix music resetting after reloading the gamestate 2020-10-27 20:22:15 +01:00
Louis-Antoine 5c48b92b2c Fix camera going wild after reloading the gamestate 2020-10-27 20:21:56 +01:00
Louis-Antoine 499bb56436 Only resend the gamestate to one client at a time 2020-10-27 01:22:31 +01:00
Louis-Antoine 7ae53364f2 Add a 15 seconds cooldown between successive gamestate resends 2020-10-27 01:20:05 +01:00
Louis-Antoine 9f5686ef48 Fix underflow in consistancy checking code 2020-10-26 23:15:22 +01:00
James R afb8e6e181 Whoops 2020-10-24 20:44:42 -07:00
James R 713b965a85 Merge branch 'playah' into 'next'
Credits Changes

See merge request STJr/SRB2!1200
2020-10-24 21:54:40 -04:00
Zolton Auburn 9a0d65a0f1 Update f_finale.c 2020-10-24 20:17:20 -04:00
Zolton Auburn 24596bd8d5 Update f_finale.c 2020-10-24 20:16:21 -04:00
James R 305f58077d Fix objectplace -silent 2020-10-24 15:29:31 -07:00
Hannu Hanhi 244c76250f Use SSE3 in 32-bit x86 binaries 2020-10-25 00:08:24 +03:00
Zippy_Zolton 5d4032fd00 Ghost mobj matches rollangle 2020-10-24 12:38:30 -05:00
Louis-Antoine 50d2c95470 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 e9fce20071 Merge remote-tracking branch 'origin/master' into next 2020-10-23 14:57:13 -07:00
James R 86c38e6d9a 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 687e2d89cc 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 333d3a2576 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 503e83653e 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 fd63b50f44 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 5f772c1850 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 135d0f91b0 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 787ec250b3 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
Zolton Auburn 85692ac409 Update info.c 2020-10-23 14:04:02 -04:00
Zippy_Zolton c0571b5fbf g 2020-10-23 01:09:12 -05:00
Zippy_Zolton a4459b6693 Dash state for Tails overlay 2020-10-23 00:47:47 -05:00
Louis-Antoine 37c11e0f2e Fix unfortunate typos 2020-10-22 00:08:06 +02:00
Louis-Antoine d349e9bf83 Only invoke the Lua API for mobj hooks that need it 2020-10-21 22:48:00 +02:00
James R ba4b6ec400 Reset wait period for COM_BufInsertText 2020-10-21 12:34:26 -07:00