Commit graph

3669 commits

Author SHA1 Message Date
Monster Iestyn
423403eab5 Merge branch 'sound-handle-fix' into 'master'
Handle fix for SDL Mixer

See merge request STJr/SRB2!301
2018-10-14 15:46:25 -04:00
Monster Iestyn
b720cb10dc Merge branch 'pris_accurate-gif-delay' into 'master'
More accurate GIF delay

See merge request STJr/SRB2!276
2018-10-14 15:44:33 -04:00
Monster Iestyn
b2f196d418 Merge branch 'no-doubling-texture-heights-plz-backport' into 'next'
No doubling texture heights plz

See merge request STJr/SRB2!296
2018-10-14 15:43:57 -04:00
Monster Iestyn
cc7d9509f2 Merge branch 'mi-a-bit-of-cleanup-backport' into 'master'
MI's unimportant code cleanup

See merge request STJr/SRB2!295
2018-10-14 15:43:32 -04:00
Sryder
3886888b30 Fix missing commas and missed interface 2018-10-14 10:14:07 +01:00
toaster
b01643e043 Fix to itembar visual length problem 2018-10-13 23:38:29 +01:00
Sryder
6184f91dd3 Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
TehRealSalt
001e2aa42c Hard Mode is an unlockable
Unlocks at 30 emblems, or 100 matches played
2018-10-13 17:54:53 -04:00
TehRealSalt
c4d1b80e97 Engine tweak 2018-10-13 17:07:30 -04:00
Monster Iestyn
c1d5c711a9 Be gone ye old texture hack 2018-10-11 21:08:25 +01:00
Monster Iestyn
9c464742b7 Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
Monster Iestyn
ef78c942f7 Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore) 2018-10-11 20:00:34 +01:00
Monster Iestyn
49c5a6f7e4 Remove unused "runcount" variable from p_local.h 2018-10-11 20:00:23 +01:00
Monster Iestyn
91b2f5e570 "t" is not needed to take out fencepost cases from viewangletox 2018-10-11 20:00:05 +01:00
Monster Iestyn
07dd527e7e Removed unused function prototypes in d_main.h
Also corrected what appears to be a typo in some comments above?
2018-10-11 19:59:47 +01:00
Monster Iestyn
61a29bed85 Remove unused sscount variable
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
2018-10-11 19:59:26 +01:00
Monster Iestyn
a4419abfdc debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else 2018-10-11 19:59:09 +01:00
TehRealSalt
005bb7a5e0 para 2018-10-10 17:46:23 -04:00
TehRealSalt
da68d40760 Removed bumping
K_KartBouncing is so flaky, I have no idea why it refuses to work.
2018-10-10 17:31:09 -04:00
TehRealSalt
8379bd3d31 Last batch of tweaks
- Rocket sneaker meter depletes more slowly when idle, but depletes much more when using it. This balances out to give it a couple more boosts when you use it well, but allows you to waste it more quickly when you don't want it anymore. Also demonstrates better to new players to not spam it like a gold shroom!
 - Vibrating frames on sneakers when they aren't being used.
 - Shoe weight is less strong.
2018-10-10 14:56:50 -04:00
TehRealSalt
0d56f68abc Merge branch 'master' into sweet-new-kicks 2018-10-10 13:43:05 -04:00
toaster
6a0b1526b9 Merge branch 'hellattack' into 'master'
Hell Attack

See merge request KartKrew/Kart!35
2018-10-10 13:33:57 -04:00
TehRealSalt
cf4adbd318 Merge branch 'master' into net-screen 2018-10-09 21:16:16 -04:00
TehRealSalt
4364caa4ea Merge branch 'master' into net-screen 2018-10-09 21:15:30 -04:00
Sal
2fc3195448 Merge branch 'new-engines' into 'master'
New engine sounds by VAda

See merge request KartKrew/Kart!38
2018-10-09 21:12:05 -04:00
TehRealSalt
5435737258 Some code cleanup & minor adjustments 2018-10-09 21:11:00 -04:00
TehRealSalt
94c92c2262 x2 distance, fix priority 2018-10-09 18:04:25 -04:00
toaster
52dc945804 4 -> 5 2018-10-09 23:02:21 +01:00
Monster Iestyn
8196c59557 Merge branch 'master' into next 2018-10-09 22:55:55 +01:00
toaster
49cf05a268 Merge branch 'karmegg' into 'master'
Karmegg

See merge request KartKrew/Kart!36
2018-10-09 17:47:11 -04:00
toaster
e248cf9421 Sal's request 2018-10-09 22:44:43 +01:00
toaster
a8a1f1b444 Spawn a poof if you get hit while karmegg.
(I've moved the comebacktimer set into one level up from that conditional; don't worry, I checked - there's nowhere that accesses this field while you have bumpers, it's just always set here for some dastardly reason.)
2018-10-09 22:40:42 +01:00
toaster
66d00b7cc6 HitEm sound for K_ExplodePlayer 2018-10-09 22:24:44 +01:00
toaster
83bfca8009 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg 2018-10-09 21:09:52 +01:00
toaster
76eebe6cf7 If you hit a one-bumper person with a karma fake, you get to come back immediately! 2018-10-09 21:09:39 +01:00
TehRealSalt
7900af2a0a Merge branch 'master' into net-screen 2018-10-09 15:43:38 -04:00
TehRealSalt
431ccce0e4 Merge branch 'master' into new-engines 2018-10-09 15:35:50 -04:00
TehRealSalt
8836cdeeee Merge branch 'master' into new-engines 2018-10-09 15:34:26 -04:00
Sal
b349063431 Merge branch 'sal-cleanup' into 'master'
Sal cleanup

See merge request KartKrew/Kart!23
2018-10-09 15:33:52 -04:00
TehRealSalt
aa12bbf039 Fix tabbing 2018-10-09 15:28:52 -04:00
Monster Iestyn
c469fc242f Merge branch 'movechasecamera-crashfix' into 'next'
Fix for Chicmunk's weird camera related crash

See merge request STJr/SRB2!284
2018-10-09 15:20:06 -04:00
Monster Iestyn
1b531ddcfe Merge branch 'tiny-joystick-fix' into 'master'
Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.

See merge request STJr/SRB2!292
2018-10-09 15:19:41 -04:00
Sryder
497314fdc4 Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.
No memory leak here, just a very tiny thing I noticed.
2018-10-09 19:43:18 +01:00
TehRealSalt
8132dd6be5 Merge branch 'master' into net-screen 2018-10-09 14:41:59 -04:00
Sryder
44726e1db7 Merge branch 'fix-mixed-declarations' into 'master'
Fix the mixed declaration and code warnings

See merge request KartKrew/Kart!37
2018-10-09 14:09:33 -04:00
TehRealSalt
5811ff521c Many adjustments
- Volume of your own engine is lower than default
 - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V
 - Starting countdown and drop dash revs up your engine now
 - Doubled sound distance
2018-10-09 14:07:05 -04:00
TehRealSalt
3a1d58ceb6 Reduce update frequency to match the sfx length better 2018-10-08 22:35:17 -04:00
TehRealSalt
bb3d01495a New engine sounds
9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-08 21:31:55 -04:00
Monster Iestyn
44ed8cebbb Merge branch 'freeSOC_stoagoodhome' into 'master'
Free SOC_s to a good home

See merge request STJr/SRB2!291
2018-10-08 18:07:23 -04:00
TehRealSalt
a6a229dea8 boostcam scales based on previous boost 2018-10-08 16:20:30 -04:00