TehRealSalt
cd30ae3fb1
para
2018-10-10 17:46:23 -04:00
TehRealSalt
0f2ec53255
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
b8db9581c2
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
b2a9193e3b
Merge branch 'master' into sweet-new-kicks
2018-10-10 13:43:05 -04:00
toaster
254adfc154
Merge branch 'hellattack' into 'master'
...
Hell Attack
See merge request KartKrew/Kart!35
2018-10-10 13:33:57 -04:00
Sal
e8bfef3944
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
8489bf7613
Some code cleanup & minor adjustments
2018-10-09 21:11:00 -04:00
TehRealSalt
805b1dd0e8
x2 distance, fix priority
2018-10-09 18:04:25 -04:00
toaster
c3b8054daf
4 -> 5
2018-10-09 23:02:21 +01:00
Monster Iestyn
afd62ec071
Merge branch 'master' into next
2018-10-09 22:55:55 +01:00
toaster
1bef57576c
Merge branch 'karmegg' into 'master'
...
Karmegg
See merge request KartKrew/Kart!36
2018-10-09 17:47:11 -04:00
toaster
e5386fd214
Sal's request
2018-10-09 22:44:43 +01:00
toaster
af09546b03
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
587e11449d
HitEm sound for K_ExplodePlayer
2018-10-09 22:24:44 +01:00
toaster
0adfccf7da
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg
2018-10-09 21:09:52 +01:00
toaster
56cd6cebea
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
3aa7a9a65c
Merge branch 'master' into new-engines
2018-10-09 15:35:50 -04:00
TehRealSalt
f25c74b152
Merge branch 'master' into new-engines
2018-10-09 15:34:26 -04:00
Sal
dac50d0a7c
Merge branch 'sal-cleanup' into 'master'
...
Sal cleanup
See merge request KartKrew/Kart!23
2018-10-09 15:33:52 -04:00
TehRealSalt
7a8dc91b6a
Fix tabbing
2018-10-09 15:28:52 -04:00
Monster Iestyn
7407ee6c0e
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
9914353758
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
a7ba0b958a
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
Sryder
18fd49b1f5
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
89d08fda84
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
445254dab6
Reduce update frequency to match the sfx length better
2018-10-08 22:35:17 -04:00
TehRealSalt
cdef7f4e1d
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
bda6a1195b
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
59dbb95ce0
boostcam scales based on previous boost
2018-10-08 16:20:30 -04:00
toaster
d62566e3ea
* Fix a memory leak regarding implementation of SOC_ (improperly copypasted code from LUA_LoadLump!!)
...
* Optimise the repeated strlen usage into a single call, which is stored for later.
2018-10-08 18:50:17 +01:00
Monster Iestyn
19eb6ba7de
Merge branch 'drwhoandthesleepingweather' into 'master'
...
Dr. Who And The Sleeping Weather
See merge request STJr/SRB2!288
2018-10-08 09:36:18 -04:00
Monster Iestyn
049d123d1f
Merge branch 'sp-savegame-continue-crash-fix' into 'master'
...
SP savegame continues icon crash
See merge request STJr/SRB2!290
2018-10-08 09:20:45 -04:00
Monster Iestyn
12752e0a43
Merge branch 'zlib-split' into 'master'
...
Makefile: Split zlib and libpng
See merge request STJr/SRB2!285
2018-10-08 07:20:27 -04:00
TehRealSalt
1bce22cf72
Merge branch 'master' into sal-cleanup
2018-10-08 00:22:44 -04:00
Sal
2f43e56774
Merge branch 'noclip-cam' into 'master'
...
Noclip cam
See merge request KartKrew/Kart!32
2018-10-07 23:15:06 -04:00
Sal
85430da37f
Merge branch 'thinkerclean' into 'master'
...
Nuke a bunch of iteration things that have no purpose in SRB2Kart.
See merge request KartKrew/Kart!25
2018-10-07 23:14:53 -04:00
TehRealSalt
68a06a14c8
Rocket Sneakers appear beside you
2018-10-07 18:53:46 -04:00
Steel Titanium
0c9e8cff07
Change win_snd.c also
2018-10-07 15:00:48 -04:00
Steel Titanium
4d883e740d
Change order of the ifdef
2018-10-07 14:52:25 -04:00
Steel Titanium
fa1377d540
Move the ifdef
2018-10-07 14:45:03 -04:00
Monster Iestyn
ef9cbb5fe1
Merge branch 'fixer-mixer' into 'master'
...
Fixer mixer: Mixer Memory Leaks
See merge request STJr/SRB2!287
2018-10-07 13:10:26 -04:00
Sryder
db332478d5
Merge branch 'skill-option' into 'master'
...
-skill launcher option
See merge request KartKrew/Kart!34
2018-10-07 12:25:06 -04:00
Sryder
9e1584fbb0
Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue.
2018-10-07 15:35:54 +01:00
toaster
e3c052e1d0
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg
...
# Conflicts:
# src/p_inter.c
2018-10-07 15:17:31 +01:00
toaster
2ad2cbcc0a
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
2018-10-07 15:00:58 +01:00
Sryder
b46aa4201e
Merge branch 'frameperfectegg' into 'master'
...
Frame Perfect Egg
See merge request KartKrew/Kart!31
2018-10-07 09:39:45 -04:00
Sryder
ce2980f228
Merge branch 'colors' into 'master'
...
Edit Pink, Navy, and Jet, add brown text
See merge request KartKrew/Kart!28
2018-10-07 09:39:22 -04:00
Sryder
b631a8436d
Merge branch 'droptweaks' into 'master'
...
Droptweaks
See merge request KartKrew/Kart!27
2018-10-07 09:37:02 -04:00
toaster
49472858d9
Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with frameperfectegg.
...
Also includes some adjustments to:
* Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better.
* Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop.
* Correctly wipe k_eggmanblame when it is appropriate to do so.
2018-10-07 11:40:06 +01:00
Sryder
d9d98ec1a9
Fix the crashing bug hopefully
...
A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory)
For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy)
So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.
2018-10-07 10:37:45 +01:00
