Commit graph

10250 commits

Author SHA1 Message Date
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
James R
c2e242d27c Fix floating point math 2020-11-07 13:48:37 -08: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
James R
91a89d5d5e Let's try an experiment: move the epoch forward as I_GetTime is called
This will make it even longer until time wraps around. Have you ever run a
srb2 server for 4 years straight?
2020-11-07 01:57:09 -08: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
James R
27fbf77922 Huge perfstats refactor
I needed to update it to make it functional with the precise timer. But I also
got sick of looking at the mess of sprintf followed by draw call.
2020-11-07 01:32:59 -08:00
James R
636307e9de Use precise time for gif timing 2020-11-07 01:32:25 -08:00
James R
f07c6067e4 Use high precision timer, replace I_GetTimeMicros with I_GetPreciseTime and I_PreciseToMicros 2020-11-07 01:31:24 -08: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
15b2d52c69 Remove win32 specific timer 2020-11-06 14:14:12 -08: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
James R
cb7b7763cd Do not factor height into sprite thickseg sorting 2020-11-05 18:45:52 -08:00
James R
fb181a5b38 Remove unused stuff 2020-11-05 18:45:51 -08:00
James R
9bb22d5fce 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
6126e8badf Make mapmusflags and mapmusname writable. 2020-11-05 18:12:35 -06:00
GoldenTails
fbd20c9591 Make skincolor_* CTF color variables writable. 2020-11-05 17:38:32 -06:00
GoldenTails
cf3d6eb0af Make stoppedclock writable. 2020-11-05 15:22:45 -06:00
GoldenTails
3125128be7 Make displayplayer writable. 2020-11-05 13:43:33 -06:00
GoldenTails
4a0fd2309e Make gravity writable. 2020-11-05 12:39:03 -06:00
GoldenTails
69f24e34ad Make token writable. 2020-11-05 12:38:47 -06:00
GoldenTails
7bf8a4d056 Make emeralds writable. 2020-11-05 12:37:49 -06:00
Jaime Passos
8599447c70 Remove RF_VOXELSPRITE 2020-11-05 00:44:10 -03:00
Jaime Passos
da0f2286e3 P_DeleteFloorSpriteSlope -> P_RemoveFloorSpriteSlope 2020-11-05 00:42:14 -03:00
Jaime Passos
cac8e06e7d Remove NOWATER define 2020-11-05 00:00:08 -03:00
Jaime Passos
917f8bbb66 Plane optimization and cleanup 2020-11-04 23:46:34 -03:00
Jaime Passos
928ea1abc9 R_DrawSplatSprite -> R_DrawFloorSprite 2020-11-04 21:43:16 -03:00
GoldenTails
3af2031eae Fix hyperwalls 2020-11-03 20:11:39 -06:00
Steel Titanium
115b509348 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
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
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
Steel Titanium
00f9e777af Expose gamestate to Lua 2020-10-31 16:36:15 -04:00