toaster
64827348c7
HUD stuff.
...
* Re-fix chat HUD position, and make it not move in match (which it needed to do in 2.1).
* Fix HU_drawPing for the new palette.
* Change the condition for greying out players, since the current one was buggy.
* Allow for tokens on the coop MP HUD, and use the small emeralds so there's space for them.
* Fix the mapping between skincolours and name colours in new chat, specifically to take into account every possible text colour (as opposed to the port previously done, which only used the 2.1 text colours and looked like ass as a result).
2019-06-22 16:54:05 +01:00
toaster
e6ce55f7b5
Do some minor HUD fixes.
...
* Move HUD text's anchoring to underneath STR instead of above Lives.
* Adjust chat position slightly, to take advantage of SRB2's HUD layout having less content towards the bottom (unlike Kart, where it has roughly equal).
* Fix Match emeralds not displaying while in tab rankings with all-seven invuln/shoes bonus active.
2019-06-22 16:53:38 +01:00
MascaraSnake
e20949ef77
Merge branch 'new-acz-minecarts' into 'master'
...
ACZ hardcoding (including minecarts)
See merge request STJr/SRB2Internal!231
2019-06-21 17:45:03 -04:00
MascaraSnake
287c25b8f9
Forgot to copy something over from the CR_ROPEHANG case
2019-06-21 23:42:48 +02:00
MascaraSnake
4385e07c0b
Always use the white sidemark sprite, since track switching is no longer "activated"
2019-06-21 23:40:28 +02:00
MascaraSnake
ed7a109ce9
Also back by popular demand: Restricting the camera angle during a minecart ride
2019-06-21 23:34:49 +02:00
Monster Iestyn
149a8bb760
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
Monster Iestyn
f84c898040
Merge branch 'master' into next
2019-06-21 22:10:32 +01:00
Monster Iestyn
fb182369f6
Merge branch 'stand(alone)-lump-comedy' into 'master'
...
Stand(alone) lump comedy
See merge request STJr/SRB2!499
2019-06-21 17:06:23 -04:00
Monster Iestyn
04215b732e
Merge branch 'fof-slopes-level-load-fix' into 'next'
...
FOF slopes level load fix
See merge request STJr/SRB2!498
2019-06-21 17:05:54 -04:00
Steel Titanium
fe7b041346
Merge branch 'public-notpublic-libopenmpt' into 'master'
...
libopenmpt support
See merge request STJr/SRB2Internal!229
2019-06-21 17:03:53 -04:00
MascaraSnake
28abc883be
By popular demand: Track switching only requires strafe instead of jump+strafe
2019-06-21 20:13:30 +02:00
Monster Iestyn
f7a32835d5
Fix warnings/errors found during compiling, mostly of the mixed-declaration-and-code or shadowed variables variety
2019-06-20 20:05:07 +01:00
Monster Iestyn
bc2804d383
Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone
2019-06-20 13:24:54 +01:00
MascaraSnake
d388547021
Some more minecart fixes
2019-06-19 00:10:28 +02:00
MascaraSnake
c11a3010d9
Fixed the Canarivore gas slowdown being much too weak
2019-06-18 19:29:53 +02:00
MascaraSnake
3634321f43
...
2019-06-18 19:06:05 +02:00
Monster Iestyn
62ed90b252
fix type mismatch by typecasting
2019-06-17 20:54:06 +01:00
MascaraSnake
95a0b3fc86
Merge branch 'master' into new-acz-minecarts
2019-06-17 20:43:21 +02:00
Monster Iestyn
1638fad75e
Part 2 of fix, make sure copied slopes also pass on hasslope status to attached target sectors for FOFs
...
Also fix whitespace to use tab-style spaces instead of regular spaces, ew
2019-06-17 19:00:04 +01:00
Monster Iestyn
50e8f13c03
Fix FOF slopes briefly glitching on level load in software mode, by ensuring the FOFs' target sectors have hasslope set on creation
2019-06-17 18:46:51 +01:00
MascaraSnake
647520e067
Adjusted the height difference for track switching
2019-06-17 08:41:51 +02:00
MascaraSnake
096bad14fb
Minecart stopper itself also needs MF_NOCLIPHEIGHT and MF_NOGRAVITY
2019-06-16 22:26:52 +02:00
MascaraSnake
e23ef050d5
Repaired the height difference check during track switching
2019-06-16 22:00:50 +02:00
MascaraSnake
cf7e618b2f
Fixed a bug with the Canarivore gas
2019-06-16 21:36:22 +02:00
MascaraSnake
68060b731f
Fixed a sound bug
2019-06-16 19:08:20 +02:00
MascaraSnake
db7bd4d35a
Fixed the cacti heights
2019-06-16 18:14:15 +02:00
MascaraSnake
fbd7a5ae59
Finetuned the saloon door swinging
2019-06-16 17:57:03 +02:00
MascaraSnake
7e0c9d9398
(Hopefully) fixed the player sometimes landing on the solid part of the minecart stopper after being launched out of the minecart
2019-06-16 17:07:13 +02:00
MascaraSnake
c5a2d33d4e
Added minecart support to A_MixUp
2019-06-16 16:49:18 +02:00
MascaraSnake
622a44f551
Fixed a bug involving players being thrown out of minecarts
2019-06-16 16:39:06 +02:00
MascaraSnake
b6790c7f35
Snapper head/legs and minecart segments flash when they're destroyed
2019-06-16 15:35:32 +02:00
Nev3r
740c561b0e
Merge branch 'portals2' into 'master'
...
Portal-based skybox rendering replacement for the software renderer
See merge request STJr/SRB2Internal!226
2019-06-16 04:08:00 -04:00
MascaraSnake
774ccad401
Do death animation even when MF2_DONTDRAW is set
2019-06-15 22:29:30 +02:00
MascaraSnake
71a25eef92
Don't jump repeatedly when holding jump
2019-06-15 21:58:58 +02:00
MascaraSnake
39deb64e4f
Streamlined the minecart death handling
2019-06-15 21:43:36 +02:00
MascaraSnake
8e61cc6d13
Kill minecarts that fall into death pits
2019-06-15 20:59:56 +02:00
MascaraSnake
24c6dd1a68
Many more bugfixes
2019-06-15 20:21:18 +02:00
MascaraSnake
91c1e13273
Simplified the setup for the Snapper/minecart death animations
2019-06-15 17:33:07 +02:00
MascaraSnake
33ed2924e9
Fixed minecart not exploding on death
2019-06-15 14:21:27 +02:00
MascaraSnake
a3784850b7
Removed an unnecessary tracer check
2019-06-15 13:52:27 +02:00
MascaraSnake
943ddeeabf
You can now jump onto tracks that are running antiparallel to yours
2019-06-15 13:49:30 +02:00
MascaraSnake
cede95fc21
Some more bugfixes
2019-06-15 00:59:13 +02:00
MascaraSnake
981443c826
Another bugfix
2019-06-15 00:12:58 +02:00
MascaraSnake
cc9d7bee80
A bunch of bugfixes
2019-06-15 00:04:50 +02:00
MascaraSnake
018fb9b461
"Finished" minecart hardcoding (still untested and buggy)
2019-06-14 21:19:52 +02:00
Monster Iestyn
96b12f098b
Merge branch 'apng-opengl' into 'master'
...
opengl apng fix
See merge request STJr/SRB2!497
2019-06-14 13:29:13 -04:00
Jaime Passos
c591633733
Update m_misc.c
2019-06-14 14:13:41 -03:00
MascaraSnake
db66f58f2b
Merge branch 'acz-hardcode' into new-acz-minecarts
2019-06-13 21:52:08 +02:00
MascaraSnake
43f28b8f56
Set tracers via P_SetTarget and not directly
2019-06-13 21:51:31 +02:00
