Commit graph

11516 commits

Author SHA1 Message Date
Jaime Passos
b8f668b2e0 rename 2020-11-08 23:02:05 -03:00
James R
16f08d28e2 Merge branch 'hyperwalls-fix' into 'next'
Fix hyperwalls

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

See merge request STJr/SRB2!1189
2020-11-08 20:48:25 -05:00
James R
b2dc35864e 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
bbd003976b 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
049237e50f 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
097f204ceb 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
9f851dc285 Return explicitly when failing to register a metatable 2020-11-09 00:16:40 +01:00
Louis-Antoine
87206a8c21 Show a console error if the gamestate contains too many tables 2020-11-08 17:33:49 +01:00
Louis-Antoine
e52cb7f6fa Throw an error if too many metatables are registered 2020-11-08 17:20:25 +01:00
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
GoldenTails
9d11d8eec9 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
d031bb5357 fix dumb memcpy 2020-11-07 03:43:55 -06:00
GoldenTails
e473bfd4cd 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
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
0d97903573 Do not factor height into sprite thickseg sorting 2020-11-05 18:45:52 -08:00
James R
8d63a994f0 Remove unused stuff 2020-11-05 18:45:51 -08:00
James R
81cbf35560 Check that top of sprite is above plane or bottom is below
This fixes slightly raised fofs drawing on top of sprites that should be in
front of them. Previously would check that the bottom of the object was above
the plane. Now also uses sprite offsets like the fof seg sorting does.
2020-11-05 18:45:43 -08:00
GoldenTails
c70d5a9773 Make mapmusflags and mapmusname writable. 2020-11-05 18:12:35 -06:00
GoldenTails
365e02bb32 Make skincolor_* CTF color variables writable. 2020-11-05 17:38:32 -06:00
GoldenTails
2b39a971ac Make stoppedclock writable. 2020-11-05 15:22:45 -06:00
GoldenTails
f42dee1871 Make displayplayer writable. 2020-11-05 13:43:33 -06:00
GoldenTails
8a0f55e4ad Make gravity writable. 2020-11-05 12:39:03 -06:00
GoldenTails
113e6b6585 Make token writable. 2020-11-05 12:38:47 -06:00
GoldenTails
a502b09929 Make emeralds writable. 2020-11-05 12:37:49 -06:00
Jaime Passos
a655257f4b Remove RF_VOXELSPRITE 2020-11-05 00:44:10 -03:00
Jaime Passos
36550725f3 P_DeleteFloorSpriteSlope -> P_RemoveFloorSpriteSlope 2020-11-05 00:42:14 -03:00
Jaime Passos
8f65b98c24 Remove NOWATER define 2020-11-05 00:00:08 -03:00
Jaime Passos
c07c80fd9e Plane optimization and cleanup 2020-11-04 23:46:34 -03:00
Jaime Passos
805818d48e R_DrawSplatSprite -> R_DrawFloorSprite 2020-11-04 21:43:16 -03:00
GoldenTails
1f7df8a790 Fix hyperwalls 2020-11-03 20:11:39 -06:00
Steel Titanium
d9bc621d17 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-musicfuncs
# Conflicts:
#	src/dehacked.c
2020-11-01 23:22:03 -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
37931fc253 The lump is not needed for P_WriteThings 2020-11-01 19:31:10 -08:00
Steel Titanium
ac7781a3b3 Expose more music functions to Lua 2020-10-31 21:15:41 -04: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