Lachlan Wright
e24ed9bd75
Merge branch 'nogmever' into 'next'
...
Check if GME_VERSION is defined.
See merge request STJr/SRB2!1372
2021-03-01 17:50:48 -05:00
Lachlan Wright
5ede909a1f
Merge branch 'fix-flipped-bounce' into 'next'
...
Fix CA_BOUNCE height when flipped (Fixes #428 )
Closes #428
See merge request STJr/SRB2!1373
2021-03-01 17:49:54 -05:00
Steel Titanium
85bd18eeec
Merge branch 'master' into next
2021-03-01 16:55:48 -05:00
Lachlan Wright
8ea7e3498d
Merge branch 'marathon-pause-fix' into 'next'
...
Disable pausing during score screens in marathon mode
See merge request STJr/SRB2!1416
2021-03-01 16:51:28 -05:00
Lachlan Wright
4c4b4b1f68
Merge branch 'skincolor-modif-fix' into 'next'
...
Fix translation colormap cache rebuilding using the old translation enumerations (fixes #443 , #449 , #459 )
Closes #443 , #449 , and #459
See merge request STJr/SRB2!1421
2021-03-01 16:49:20 -05:00
Lachlan Wright
b71a9478da
Merge branch 'linkdraw-scale-fix' into 'next'
...
Fix thing scale mismatch in R_DrawVisSprite. (Fixes #458 )
Closes #458
See merge request STJr/SRB2!1420
2021-03-01 16:49:10 -05:00
Lachlan Wright
032c40863d
Merge branch 'revert-e305de03' into 'next'
...
Revert "Merge branch 'player-speed' into 'next'"
Closes #466 and #471
See merge request STJr/SRB2!1418
2021-03-01 16:49:00 -05:00
James R
0bd0b98909
Fix dependency file trying to be made for SRB2.res and not for interface/blua/hardware files
2021-02-28 17:02:08 -08:00
Jaime Ita Passos
049b50a791
Change I_Error message
2021-02-28 17:47:12 -03:00
Jaime Ita Passos
f71281b498
Fix translation colormap cache rebuilding using the old translation enumerations
...
This was causing a buffer underwrite too. Lovely.
2021-02-28 17:05:25 -03:00
Jaime Ita Passos
95c6139b32
Fix thing scale mismatch in R_DrawVisSprite
2021-02-28 16:23:40 -03:00
Jaime Ita Passos
a8909190ff
Fix "implicit declaration of function 'DEH_TableCheck'" warning
2021-02-27 12:04:48 -03:00
Lachlan Wright
67b06edf3e
Revert "Merge branch 'player-speed' into 'next'"
...
This reverts merge request !1309
2021-02-27 03:38:13 +00:00
Riku Salminen
1ecad1cf9c
Disable pausing during score screens in marathon mode
2021-02-26 15:43:53 +02:00
James R
db219a6ff3
Makefile: add a SILENT flag
...
This makes it print nothing to stdout.
Also fixed some irregularities.
2021-02-18 07:24:20 -08:00
James R
5df0a1c9e6
Generate individual dependency files
...
This removes Makefile.depends. Instead, '.d' files are included from the 'dep'
directory. This speeds up building because dependencies for every file don't
need to be regenerated if only one changes.
As a bonus, dependencies also won't be generated if only clean type targets
are going to be run. Also added a 'distclean' target, which cleans both
objects and dependency files.
2021-02-18 06:23:18 -08:00
James R
396a4ae635
Makfile: don't print some messages twice
2021-02-18 06:23:12 -08:00
X.organic
3fa1cc3185
Fix indentation in MOBJCONSISTANCY conditional
2021-02-16 23:27:44 +01:00
X.organic
5c9d9636b3
Fix MOBJCONSISTANCY and make it optional in DEBUGMODE
...
MOBJCONSISTANCY checks confined to gamestate GS_LEVEL. DEBUGMODE
no longer implicitly enables them, making it netgame-compatible.
2021-02-16 21:36:28 +01:00
X.organic
5e832ece89
Move Dehacked table sanity check to deh_tables.c
2021-02-16 19:46:31 +01:00
LJ Sonic
0117cedd70
Show an alternate ping icon when the player is disconnected
2021-02-15 22:19:48 +01:00
LJ Sonic
e9dc383e72
Enable rejointimeout by default
2021-02-15 16:24:30 +01:00
LJ Sonic
38c7c718ac
Add rejointimeout to the server options
2021-02-15 16:23:57 +01:00
LJ Sonic
9c9d7c07ab
Make the names of disconnected players flicker in tab HUD
2021-02-15 16:21:26 +01:00
LJ Sonic
03585d994c
Use standard Lua naming scheme for polyobject list
2021-02-15 13:37:25 +01:00
SMS Alfredo
67a13f5032
This might be dumb, but whatever
2021-02-14 20:49:03 -06:00
LJ Sonic
c6da63d5ad
Deprecate P_AproxDistance for Lua scripts
2021-02-13 18:04:27 +01:00
LJ Sonic
7e2c1284ab
Use R_PointToDist2 for the Lua versions of P_AproxDistance and FixedHypot
2021-02-13 18:04:12 +01:00
LJ Sonic
6d44e1b0dd
Revert "Use FixedHypot over P_AproxDistance"
...
This reverts commit 77f83de100 .
2021-02-13 17:46:29 +01:00
LJ Sonic
048bcb9600
Revert "Use R_PointToDist2 instead"
...
This reverts commit 2b7e465ed6 .
2021-02-13 17:45:54 +01:00
LJ Sonic
85cd429d1d
Revert "Replace all instances of P_AproxDistance with FixedHypot"
...
This reverts commit 498ff708bb .
2021-02-13 17:45:20 +01:00
LJ Sonic
70c0f8a644
Only call PlayerCmd hooks if added to game
2021-02-11 00:24:42 +01:00
LJ Sonic
c5f8454093
Fix consoleplayer returning the server player during joining phase
2021-02-11 00:10:15 +01:00
SteelT
262a5c9b3a
Merge branch 'gl-texture-management' into 'next'
...
Manage uploaded OpenGL textures with an internal list
Closes #411
See merge request STJr/SRB2!1391
2021-02-07 13:37:33 -05:00
James R
763e42625d
Merge branch 'fix-doublejump-divby0' into 'next'
...
Fix a divby0 when you have specific character stats.
See merge request STJr/SRB2!1374
2021-01-31 01:17:41 -05:00
Jaime Ita Passos
0d04b14bb3
Remove GLMipmap_t.nextmipmap
2021-01-27 21:23:20 -03:00
Jaime Ita Passos
7e28b7d3e9
OpenGL backend: Manage uploaded GPU textures with an internal list
...
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
2021-01-27 17:48:57 -03:00
James R
fa696de12d
Merge branch 'fix-mobj-slidemove' into 'next'
...
Make sliding against objects actually work (Fixes #400 )
Closes #400
See merge request STJr/SRB2!1348
2021-01-26 20:43:17 -05:00
LJ Sonic
f27881ac16
Merge branch 'fix-boss2pogotarget' into 'next'
...
Make several actions actually check for a player smh (Fixes #387 )
Closes #387
See merge request STJr/SRB2!1340
2021-01-25 18:11:38 -05:00
LJ Sonic
05a75758ab
Merge branch 'redundant-hypot' into 'next'
...
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's
See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
LJ Sonic
d61e5cc2df
Merge branch 'mode0-centering' into 'next'
...
Fix video mode 0 not getting centered
See merge request STJr/SRB2!1344
2021-01-25 17:59:26 -05:00
LJ Sonic
2fcebc5eba
Merge branch 'gl-levelflat-fix' into 'next'
...
Fix a misuse of levelflat_t.picture in OpenGL
See merge request STJr/SRB2!1327
2021-01-25 16:40:02 -05:00
LJ Sonic
9a2a1d25d6
Merge branch 'jimita-why-you-done-this!!!' into 'next'
...
Fix mobj unarchiving code
See merge request STJr/SRB2!1384
2021-01-22 18:26:26 -05:00
Lachlan Wright
a1adf3dd19
Merge branch 'flipped-waterrun' into 'next'
...
Allow water running in reverse gravity
See merge request STJr/SRB2!1369
2021-01-19 23:20:57 -05:00
Jaime Ita Passos
9fc1379668
Revert "Move a few mobj spawn defaults to its own function"
...
This reverts commit 3f36a51f5b .
# Conflicts:
# src/p_mobj.c
2021-01-17 23:17:46 +01:00
Tatsuru
8bc1904468
Put his name at the right order
2021-01-11 21:49:31 -03:00
Tatsuru
923cc0d8f2
Add Logan to the art credits
2021-01-10 23:17:40 -03:00
GoldenTails
f11850a0eb
Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT.
2021-01-10 10:01:31 -06:00
Zwip-Zwap Zapony
ff28a5365d
Fix CA_BOUNCE when flipped
...
Fix P_DoAbilityBounce() always using "max",
instead of "min" while upside-down and "max" while not
2021-01-08 16:25:10 +01:00
SteelT
76e4826626
Merge branch 'fix-lua-consvars-with-functions' into 'next'
...
Fix CV_RegisterVar returning LUA_GetErrorMessage to Lua when CV_CALL is involved. (Resolves #403 )
Closes #403
See merge request STJr/SRB2!1346
2021-01-07 16:33:39 -05:00