stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 21:31:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
3796 commits 60 branches 11 tags 94 MiB
Commit graph

3796 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
8370064706 Merge branch 'wolfs_hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
 2018-10-31 15:19:39 +00:00
wolfy852
932f1f929a SOC_CHAO hardcode 
TODO: fix comment alignment
 2018-10-30 20:35:33 -05:00
toaster
98f9d73ca8 No fucking wonder these weren't showing up, I set their duration to 1 tic instead of -1 tic 
(The Volcanic Valley issue is because the most recent Volcanic Valley update in maps.kart lost all the Objectspecial flags from mapthing 2018)
 2018-10-30 11:08:53 +00:00
toaster
7f24836d00 Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:47:34 +00:00
TehRealSalt
08144b96f1 Fix SMK RR thwomps casuing bounce-up 2018-10-29 17:45:59 -04:00
toaster
52523fc4b4 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:37:06 +00:00
toaster
f1a6e1e6cd Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 
# Conflicts:
#	src/info.c
#	src/info.h
#	src/p_mobj.c
 2018-10-29 21:36:39 +00:00
Sal
07a31c20d6 Merge branch 'grow-shrink-fixes' into 'master' 
Invincibility item & Shrink fixes

See merge request KartKrew/Kart!68
 2018-10-29 05:32:20 -04:00
Sal
292a18804a Merge branch 'splitscreen-tuneup' into 'master' 
Splitscreen tuneup

See merge request KartKrew/Kart!67
 2018-10-29 05:30:49 -04:00
Sal
8dbb636b2f Merge branch 'div-sounds' into 'master' 
Divide sound with number of local players

See merge request KartKrew/Kart!66
 2018-10-29 05:26:51 -04:00
TehRealSalt
f8d87c8f08 Preface with splitscreen checks 2018-10-29 05:26:17 -04:00
Sal
666f57d11b Merge branch 'spinout-speedup' into 'master' 
Spinout speedup

See merge request KartKrew/Kart!63
 2018-10-29 05:24:50 -04:00
TehRealSalt
14fcda0eca Make shadows more consistent on slopes for non-players 2018-10-29 05:21:47 -04:00
TehRealSalt
9f18164ad4 The motherload: all of my Lua is hardcoded 
This took like 6 straight hours of work, never ask me for anything ever again
 2018-10-29 05:00:08 -04:00
TehRealSalt
a23c62e60e Move lap animation up slightly 
(I'm not gonna remember to do this later either)
 2018-10-28 13:52:25 -04:00
TehRealSalt
a885f340ae Use V_ORANGEMAP for blinking WANTED text in Battle splitscreen 2018-10-28 01:50:27 -04:00
TehRealSalt
84c9dbfcce Even better: base it off how much timer is left 
So instead of prioritizing a specific track, the person who activated their powerup the latest gets their music. That should be a nicer solution for when multiple players are activating their powerups at the same time.
 2018-10-28 01:38:01 -04:00
TehRealSalt
67a8ee178d More smoothly decide which invincibility music to use 
Less P_RestoreMusic conflicts in splitscreen, just see the Toxic Palace video for an example :V
 2018-10-28 01:22:26 -04:00
TehRealSalt
b6d8c3ea7d This didn't commit with for some reason... 2018-10-28 01:02:49 -04:00
TehRealSalt
93e989cf61 Fix invincibility item cap 
It was supposed to be capped at 2 invincibility items at a time, not 3. (may consider scaling with number of players, just not for R1)
 2018-10-28 01:02:30 -04:00
TehRealSalt
5a719afbc1 Fix up respawning so that it takes respawning with Shrink into account 2018-10-28 00:58:49 -04:00
TehRealSalt
8d78ee7458 No more rescaling gfx for countdown/finish 2018-10-27 23:14:11 -04:00
TehRealSalt
e9515294e8 Show LOSE/COOL in splitscreen again 
Looked goofy offline, with 1 WIN and 3 LOSEs, but now that there's COOL and online splitscreen I thought it should come back
 2018-10-27 22:43:57 -04:00
TehRealSalt
d0a50ae247 This bothers me, so I might as well do it while I'm in here. 2018-10-27 21:48:50 -04:00
TehRealSalt
dc5a738f7f "if !splitscreen" instances that SHOULD be "if netgame" 2018-10-27 21:45:04 -04:00
TehRealSalt
f1f8f91aea Higher default scale, WANTED indicator scales properly 2018-10-27 20:56:11 -04:00
TehRealSalt
339a857cba Reduce camspeed in splitscreen 2018-10-27 20:44:05 -04:00
toaster
e8410b2575 Fix and then subsequently disable the zoom tube angle setting stuff. 2018-10-27 22:05:15 +01:00
toaster
3d760271e3 Fix the issue with sliding I identified this morning. 
Also, apply it to being in a zoom tube, too! For extra forwards compatibility with all the terrible SRB2 Riders ports that are almost an inevitability.
 2018-10-27 21:41:45 +01:00
TehRealSalt
a8dfd45d9c Merge branch 'master' into div-sounds 2018-10-26 01:15:10 -04:00
TehRealSalt
8058b77743 Combine spinout & wipeout timers 
Turns out they were only 1 tic apart originally, sooo
 2018-10-26 01:07:54 -04:00
TehRealSalt
6dd7718d6e More consistent face-forward 
Needs it to still land in a close ballpark, so the timer changes are still needed, but  this makes it less prone to error
 2018-10-26 01:07:14 -04:00
TehRealSalt
240d7a44c1 CRITICAL BUGFIX 
Make sure flashing tics don't go down WHILE you're in a hit animation (wipeout, squished)
 2018-10-26 00:56:02 -04:00
TehRealSalt
27f118a06c Adjust spinout times to face your forward about 90% of the time 2018-10-26 00:55:20 -04:00
TehRealSalt
555fbbe2f5 Speed up spinout based on timer left 2018-10-26 00:51:58 -04:00
TehRealSalt
146c8b228b - Reduce volume reduction 
- Don't apply to sounds without an origin mobj
 2018-10-25 22:53:58 -04:00
toaster
4595328e6d Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 2018-10-25 19:09:22 +01:00
Sal
7f2090aeae Merge branch 'karma-touchups' into 'master' 
Karma touchups

See merge request KartKrew/Kart!59
 2018-10-25 14:06:22 -04:00
Sal
6997db11e1 Merge branch 'chat-changes' into 'master' 
New chat mode (Window Hidden) + Player join/leave/rename messages in chat + new console backcolours for console & chat

See merge request KartKrew/Kart!55
 2018-10-25 14:06:11 -04:00
Latapostrophe
b9c6210822 Reimplemented the splitscreen chat fix 2018-10-25 20:02:43 +02:00
Latapostrophe
20cfd80767 Fixed the menu highlight thing 2018-10-25 19:41:14 +02:00
Latapostrophe
e5d4020f3e Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill 2018-10-25 13:21:44 +02:00
toaster
19a6bd948c Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
#	src/p_enemy.c
#	src/p_mobj.c
 2018-10-25 10:46:18 +01:00
Latapostrophe
26093de2e9 Merge branch 'master' into chat-changes 2018-10-25 11:14:49 +02:00
TehRealSalt
aa00ca72e2 Fix merges 
(Don't bother me hastily to merge something in again, please)
 2018-10-24 21:51:43 -04:00
Sal
af4e4f3fe4 Merge branch 'fz-time-over' into 'master' 
F-Zero time over hardcode

See merge request KartKrew/Kart!62
 2018-10-24 21:40:07 -04:00
TehRealSalt
f2f03d03a7 Merge branch 'master' into fz-time-over 2018-10-24 21:39:02 -04:00
Sal
eef1ba3660 Merge branch 'lat-hardcode' into 'master' 
Midnight Channel + Mementos hardcode

See merge request KartKrew/Kart!61
 2018-10-24 21:26:02 -04:00
TehRealSalt
974f6d47e1 Fullbright explosion and fire 2018-10-24 21:25:22 -04:00
TehRealSalt
25414edb57 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00