thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-28 00:11:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6106 commits 2 branches 14 tags 206 MiB
Commit graph

6106 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
b2488f11b7 Remove some more 2.1-related ringslinger offsets to the chat. 2019-06-22 20:17:09 +01:00
toaster
892240bb77 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
982d97a267 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
5a0a971084 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
1076b59bd1 Forgot to copy something over from the CR_ROPEHANG case 2019-06-21 23:42:48 +02:00
MascaraSnake
68a065ca9e Always use the white sidemark sprite, since track switching is no longer "activated" 2019-06-21 23:40:28 +02:00
MascaraSnake
e0aff341e4 Also back by popular demand: Restricting the camera angle during a minecart ride 2019-06-21 23:34:49 +02:00
Monster Iestyn
e95696c94b Merge branch 'public_next' 2019-06-21 22:13:39 +01:00
Monster Iestyn
cfa13f3fe4 Merge branch 'master' into next 2019-06-21 22:10:32 +01:00
Monster Iestyn
f079942290 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
c5a993b9b5 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
8839b4ce8c Merge branch 'public-notpublic-libopenmpt' into 'master' 
libopenmpt support

See merge request STJr/SRB2Internal!229
 2019-06-21 17:03:53 -04:00
MascaraSnake
3827a69415 By popular demand: Track switching only requires strafe instead of jump+strafe 2019-06-21 20:13:30 +02:00
Monster Iestyn
d955cea37d 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
f31db6f0d4 Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone 2019-06-20 13:24:54 +01:00
MascaraSnake
3fcf2a19d2 Some more minecart fixes 2019-06-19 00:10:28 +02:00
MascaraSnake
0329b57e43 Fixed the Canarivore gas slowdown being much too weak 2019-06-18 19:29:53 +02:00
MascaraSnake
456efdfa38 ... 2019-06-18 19:06:05 +02:00
Monster Iestyn
d1901a2030 fix type mismatch by typecasting 2019-06-17 20:54:06 +01:00
MascaraSnake
faa43ea92d Merge branch 'master' into new-acz-minecarts 2019-06-17 20:43:21 +02:00
Monster Iestyn
4b5457ea74 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
6dd39fa83b 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
6faaa1559d Adjusted the height difference for track switching 2019-06-17 08:41:51 +02:00
MascaraSnake
265350d527 Minecart stopper itself also needs MF_NOCLIPHEIGHT and MF_NOGRAVITY 2019-06-16 22:26:52 +02:00
MascaraSnake
4c3228ebeb Repaired the height difference check during track switching 2019-06-16 22:00:50 +02:00
MascaraSnake
c9a8505abc Fixed a bug with the Canarivore gas 2019-06-16 21:36:22 +02:00
MascaraSnake
85e7f4b2af Fixed a sound bug 2019-06-16 19:08:20 +02:00
MascaraSnake
50cade33ab Fixed the cacti heights 2019-06-16 18:14:15 +02:00
MascaraSnake
457f1df181 Finetuned the saloon door swinging 2019-06-16 17:57:03 +02:00
MascaraSnake
bdccfb9c35 (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
64b63edfdd Added minecart support to A_MixUp 2019-06-16 16:49:18 +02:00
MascaraSnake
f272a29a8d Fixed a bug involving players being thrown out of minecarts 2019-06-16 16:39:06 +02:00
MascaraSnake
3dc4e1d950 Snapper head/legs and minecart segments flash when they're destroyed 2019-06-16 15:35:32 +02:00
Nev3r
fce498418c 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
f1eebf270d Do death animation even when MF2_DONTDRAW is set 2019-06-15 22:29:30 +02:00
MascaraSnake
70882dc9d8 Don't jump repeatedly when holding jump 2019-06-15 21:58:58 +02:00
MascaraSnake
bfe3deb5d6 Streamlined the minecart death handling 2019-06-15 21:43:36 +02:00
MascaraSnake
efc1b7ef2b Kill minecarts that fall into death pits 2019-06-15 20:59:56 +02:00
MascaraSnake
852ae2d07b Many more bugfixes 2019-06-15 20:21:18 +02:00
MascaraSnake
4d27dac35a Simplified the setup for the Snapper/minecart death animations 2019-06-15 17:33:07 +02:00
MascaraSnake
ac692e2cdd Fixed minecart not exploding on death 2019-06-15 14:21:27 +02:00
MascaraSnake
18c0d32320 Removed an unnecessary tracer check 2019-06-15 13:52:27 +02:00
MascaraSnake
75afe898f3 You can now jump onto tracks that are running antiparallel to yours 2019-06-15 13:49:30 +02:00
MascaraSnake
e74447b0d3 Some more bugfixes 2019-06-15 00:59:13 +02:00
MascaraSnake
73554c09dd Another bugfix 2019-06-15 00:12:58 +02:00
MascaraSnake
e0dea69237 A bunch of bugfixes 2019-06-15 00:04:50 +02:00
MascaraSnake
18bd29c904 "Finished" minecart hardcoding (still untested and buggy) 2019-06-14 21:19:52 +02:00
Monster Iestyn
6bc4d5a086 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
cf7b9ccff4 Update m_misc.c 2019-06-14 14:13:41 -03:00
MascaraSnake
fd39f4ce1e Merge branch 'acz-hardcode' into new-acz-minecarts 2019-06-13 21:52:08 +02:00