Commit graph

11289 commits

Author SHA1 Message Date
Louis-Antoine
b44ea720d0 Fix typo 2020-11-15 00:53:46 +01:00
Louis-Antoine
a78097060f Delete outdated comment 2020-11-15 00:52:51 +01:00
Louis-Antoine
05ae84bd09 Fix Lua stacktrace not showing in various situations 2020-11-13 19:12:25 +01:00
Louis-Antoine
2ebbbecf94 Add missing lua_pop call 2020-11-13 18:19:13 +01:00
Louis-Antoine
4938015253 Replace lua_pop(-1) with lua_settop(0) 2020-11-13 15:31:11 +01:00
James R
6d665a856d Merge branch 'step-up-goofs-2' into 'next'
Fix disabling step up/down not working

See merge request STJr/SRB2!1219
2020-11-09 17:52:41 -05:00
James R
b27b4a2759 Merge branch 'fix-leave-div-by-0' into 'next'
Fix stupid divide-by-zero error when leaving servers

See merge request STJr/SRB2!1240
2020-11-09 17:52:19 -05:00
GoldenTails
686d4ec516 Fix stupid divide-by-zero error 2020-11-08 23:28:20 -06:00
James R
e0a799c1ed Merge branch 'allowshaders' into 'next'
Let the server or an admin toggle clients' custom shaders

See merge request STJr/SRB2!1181
2020-11-08 21:09:56 -05:00
Jaime Passos
72e338a164 rename 2020-11-08 23:02:05 -03:00
James R
d28687f7f9 Merge branch 'hyperwalls-fix' into 'next'
Fix hyperwalls

See merge request STJr/SRB2!1232
2020-11-08 20:59:28 -05:00
James R
2edf884fbf Merge branch 'x' into 'next'
Whitelist missing graphics

See merge request STJr/SRB2!1189
2020-11-08 20:48:25 -05:00
James R
5443c13ce3 Merge branch 'pngpal-compare' into 'next'
Compare PNG palettes with the game's palette, instead of assuming they are the same

See merge request STJr/SRB2!1185
2020-11-08 20:46:07 -05:00
James R
4f5d6f6197 Merge branch 'write-thingies' into 'next'
The lump is not needed for P_WriteThings

See merge request STJr/SRB2!1231
2020-11-08 20:35:51 -05:00
James R
6fc461ca53 Merge branch 'gif-dynamic-delay-v2' into 'next'
EMERGENCY: By default use the old gif_dynamicdelay v1 behavior, but keep v2 as an option.

See merge request STJr/SRB2!1236
2020-11-08 19:33:03 -05:00
James R
a247719adf Merge branch 'register-metatables' into 'next'
Improve support for metatables in netgames

See merge request STJr/SRB2!1224
2020-11-08 19:30:51 -05:00
Louis-Antoine
69781faa42 Return explicitly when failing to register a metatable 2020-11-09 00:16:40 +01:00
Louis-Antoine
88408619aa Show a console error if the gamestate contains too many tables 2020-11-08 17:33:49 +01:00
Louis-Antoine
449799bd5a Throw an error if too many metatables are registered 2020-11-08 17:20:25 +01:00
LJ Sonic
ebfa4aafbc Merge branch 'resend-gamestate' into 'next'
Resend gamestate when resynching

See merge request STJr/SRB2!829
2020-11-07 13:14:32 -05:00
GoldenTails
efa5b5d4ba Remove 3 wasteful bytes of guaranteed blank memory from some place where it's not gonna matter that much 2020-11-07 03:49:21 -06:00
GoldenTails
f8c2209f62 fix dumb memcpy 2020-11-07 03:43:55 -06:00
GoldenTails
fb74fd8841 By default use the old gif_dynamicdelay v1 behavior, but keep v2 as an option. 2020-11-07 03:02:21 -06:00
James R
e87c3bd69e 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
GoldenTails
3af2031eae Fix hyperwalls 2020-11-03 20:11:39 -06:00
James R
99a0a9a9eb Merge remote-tracking branch 'origin/master' into next 2020-11-01 20:01:22 -08:00
James R
cbafb906db 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
079ed81c89 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
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
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
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
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