stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-29 23:52:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
12423 commits 173 branches 41 tags 186 MiB
Commit graph

12423 commits

This branch
This branch
All branches
Author SHA1 Message Date
sphere
998d065698 Add more actions for slope copying & update the ZB config. 2021-02-17 16:06:02 +01:00
X.organic
0cbf9a791b
Fix indentation in MOBJCONSISTANCY conditional 2021-02-16 23:27:44 +01:00
X.organic
90611ed547
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
205ccc2727
Move Dehacked table sanity check to deh_tables.c 2021-02-16 19:46:31 +01:00
LJ Sonic
d380405b2f Merge branch 'final-tweaks' into 'next' 
A few minor tweaks before 2.2.9

See merge request STJr/SRB2!1403
 2021-02-16 12:50:15 -05:00
LJ Sonic
7133c703b4 Show an alternate ping icon when the player is disconnected 2021-02-15 22:19:48 +01:00
LJ Sonic
97daba68d0 Enable rejointimeout by default 2021-02-15 16:24:30 +01:00
LJ Sonic
aa33d90215 Add rejointimeout to the server options 2021-02-15 16:23:57 +01:00
LJ Sonic
0b012d5db0 Make the names of disconnected players flicker in tab HUD 2021-02-15 16:21:26 +01:00
LJ Sonic
b369243beb Use standard Lua naming scheme for polyobject list 2021-02-15 13:37:25 +01:00
LJ Sonic
d26a6a33c5 Merge branch 'hippo' into 'next' 
Remove P_AproxDistance deprecation warning

See merge request STJr/SRB2!1402
 2021-02-15 06:00:24 -05:00
Nev3r
66d858fbcb Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into remove-iterdeclarations 
# Conflicts:
#	src/p_spec.c
 2021-02-15 09:20:40 +01:00
SMS Alfredo
4430835a71 This might be dumb, but whatever 2021-02-14 20:49:03 -06:00
lachwright
cf389179e8 Rollout rock improvements: 
- No longer struggles to start to accelerating at certain angles
- Carrying a player onto a rollout rock no longer leaves them in their ride state
- Changed dispoffset might alleviate some sorting issues
- Changes the player's camera angle when sprung horizontally
- Works better in reverse gravity
 2021-02-15 01:11:03 +11:00
LJ Sonic
41fe113af4 Merge branch 'revert-redundant-hypot' into 'next' 
Revert redundant hypot

Closes #450 and #451

See merge request STJr/SRB2!1400
 2021-02-13 12:08:39 -05:00
LJ Sonic
70850b0836 Deprecate P_AproxDistance for Lua scripts 2021-02-13 18:04:27 +01:00
LJ Sonic
758de501da Use R_PointToDist2 for the Lua versions of P_AproxDistance and FixedHypot 2021-02-13 18:04:12 +01:00
LJ Sonic
a58df577fe Revert "Use FixedHypot over P_AproxDistance" 
This reverts commit c5474436af.
 2021-02-13 17:46:29 +01:00
LJ Sonic
d2d1f83b62 Revert "Use R_PointToDist2 instead" 
This reverts commit e19196a86e.
 2021-02-13 17:45:54 +01:00
LJ Sonic
09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot" 
This reverts commit 75633bde50.
 2021-02-13 17:45:20 +01:00
LJ Sonic
481ddb6532 Merge branch 'fix-joiner-consoleplayer' into 'next' 
Fix consoleplayer returning the server player during joining phase

See merge request STJr/SRB2!1396
 2021-02-12 17:42:15 -05:00
Nev3r
a57c695f79 Update example comment. 2021-02-11 14:22:49 +01:00
Nev3r
fbe2a19c60 Fix __LINE__ macro expansion via recursive macro expansion; C macros sure are something sometimes... 2021-02-11 14:12:50 +01:00
Nev3r
eda6b0ad8e Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros. 
Declare the position counters inside the for loops instead; RIP C90.
 2021-02-11 13:24:20 +01:00
namishere
326be01276 Expose P_ButteredSlope to lua 2021-02-11 04:06:40 -08:00
LJ Sonic
dfc1767794 Only call PlayerCmd hooks if added to game 2021-02-11 00:24:42 +01:00
LJ Sonic
3dff1eb1b7 Fix consoleplayer returning the server player during joining phase 2021-02-11 00:10:15 +01:00
SteelT
6089550972 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
5b287f9cce 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
8318935811 Remove GLMipmap_t.nextmipmap 2021-01-27 21:23:20 -03:00
Jaime Ita Passos
4891611ab7 tRNS chunk fix 
Fixes a faulty check not properly detecting the presence of a tRNS chunk.
 2021-01-27 19:23:04 -03:00
Jaime Ita Passos
d4044a4f82 Add PF_ColorMapped 
Not all surfaces have tint and fade colors. Checking for a specific surface flag, that tells the backend those colors are present, avoids uninitialized reads.
 2021-01-27 18:54:33 -03:00
Jaime Ita Passos
5501d495c7 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
29b6bd5df9 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
36c193f317 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
83947d4428 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
2d3e302929 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
14ee92ef67 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
Shane Ellis
ca00e2d508 correction to nights bot clause 2021-01-24 12:46:03 -05:00
Shane Ellis
ea6879b5c2 missed a couple spots 2021-01-24 12:43:13 -05:00
CobaltBW
a2fce68f14 Specialized Lua function for bot removal 2021-01-23 17:01:48 -08:00
CobaltBW
93ec472c78 Expose BOT_ to lua 2021-01-23 14:49:20 -08:00
CobaltBW
0a60fe0b1d Almost forgot: player.blocked 2021-01-23 14:05:36 -08:00
CobaltBW
b112e12c93 Merge remote-tracking branch 'origin/next' into addplayer 2021-01-23 13:33:19 -08:00
Shane Ellis
135032c293 Correction to implicit declaration of B_UpdateBotleader() 2021-01-23 10:58:34 -05:00
Shane Ellis
1274b4651e Added botstuffs to savestate 2021-01-23 10:39:59 -05:00
Shane Ellis
25bf4b54e2 Restructured botticcmds into G_Ticker 2021-01-23 10:36:44 -05:00
Shane Ellis
4e47f240ad Add new botstuffs 2021-01-23 10:30:07 -05:00
Shane Ellis
b8fea55f67 Update b_bot.c 2021-01-23 10:25:35 -05:00
Shane Ellis
fd536e91a3 void B_UpdateBotleader(player_t *player); 2021-01-23 10:17:05 -05:00