stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-27 05:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
13548 commits 173 branches 41 tags 305 MiB
Commit graph

13548 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lachlan Wright
e03700fc2a 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
fc1bc94d9a 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
d59de95262 Merge branch 'master' into next 2021-03-01 16:55:48 -05:00
Lachlan Wright
49c68d279d 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
b8873e8182 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
588a40453b 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
94c7124904 Merge branch 'revert-9649a9fb' 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
5f4e21ed3a 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
James R
6d539626c4 I forgot to add the dep directory 2021-02-28 16:14:54 -08:00
Jaime Ita Passos
94fe7a3d8c Change I_Error message 2021-02-28 17:47:12 -03:00
Jaime Ita Passos
401271feb7 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
07ffe2599c Fix thing scale mismatch in R_DrawVisSprite 2021-02-28 16:23:40 -03:00
sphere
af79d45e66 Merge branch 'fix-implicit-tablecheck' into 'next' 
Fix "implicit declaration of function 'DEH_TableCheck'" warning

See merge request STJr/SRB2!1419
 2021-02-28 12:14:28 -05:00
sphere
a679212c5e Merge branch 'udb-config-bruh' into 'master' 
Nice UDB config there, SRB2.

See merge request STJr/SRB2!1354
 2021-02-28 11:57:30 -05:00
GoldenTails
a0396d5e43 Make it more async-signal-safe 2021-02-27 18:07:47 -06:00
GoldenTails
bdb28a06f4 Print the backtrace before showing the signal handler popup. 2021-02-27 18:07:47 -06:00
GoldenTails
5108f1f57b Use file descriptors and ditch file streams, for now. 2021-02-27 18:07:47 -06:00
GoldenTails
4016a2e062 Crash backtrace logging for NEWSIGNALHANDLER. 2021-02-27 18:07:47 -06:00
Jaime Ita Passos
a1e0aa1812 Fix "implicit declaration of function 'DEH_TableCheck'" warning 2021-02-27 12:04:48 -03:00
James R
89e411c6ae Merge branch 'dependency-files' into 'master' 
Dependency files

See merge request STJr/SRB2!1407
 2021-02-27 05:38:13 -05:00
Lachlan Wright
77feee73c3 Revert "Merge branch 'player-speed' into 'next'" 
This reverts merge request !1309
 2021-02-27 03:38:13 +00:00
LJ Sonic
be496e1bc1 Merge branch 'debugmode-reborn' into 'next' 
Make DEBUGMODE=1 builds (finally) compile, run and work in netgames

See merge request STJr/SRB2!1405
 2021-02-26 17:43:45 -05:00
Riku Salminen
8bcc71c629 Disable pausing during score screens in marathon mode 2021-02-26 15:43:53 +02:00
Jaime Ita Passos
2ca8efd7ee Revert accidental push 2021-02-25 20:17:27 -03:00
Jaime Ita Passos
70ebca2bf6 Update README 2021-02-25 19:49:37 -03:00
Jaime Ita Passos
5b1dc6ba33 [Meta] Change branding 2021-02-25 19:49:34 -03:00
LJ Sonic
75d0e70236 Fix sector tags being signed in Lua 2021-02-25 23:41:43 +01:00
sphere
d305952119 Update ZB config: at this rate, ZB will update before this gets merged. 2021-02-24 10:30:48 +01:00
GoldenTails
12205314bc Check against null tmpusher source before attempting to push a thing. 2021-02-21 19:32:00 -06:00
Zwip-Zwap Zapony
308ab0e079 Fix OpenGL V_DrawCroppedPatch 2021-02-21 22:16:38 +01:00
toaster
73758f50ff Fix dropshadows of papersprites drifting depending on angle relative to camera. Discovered in Kart internal for the paper item drops and ported back, hence the branch name. 2021-02-19 06:45:28 -05:00
James R
747c278bc2 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
3d32f3145c 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
3003c252d1 Makfile: don't print some messages twice 2021-02-18 06:23:12 -08:00
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