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
0d56f68abc
Merge branch 'master' into sweet-new-kicks
2018-10-10 13:43:05 -04:00
6a0b1526b9
Merge branch 'hellattack' into 'master'
...
Hell Attack
See merge request KartKrew/Kart!35
2018-10-10 13:33:57 -04:00
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
5435737258
Some code cleanup & minor adjustments
2018-10-09 21:11:00 -04:00
94c92c2262
x2 distance, fix priority
2018-10-09 18:04:25 -04:00
52dc945804
4 -> 5
2018-10-09 23:02:21 +01:00
8196c59557
Merge branch 'master' into next
2018-10-09 22:55:55 +01:00
49cf05a268
Merge branch 'karmegg' into 'master'
...
Karmegg
See merge request KartKrew/Kart!36
2018-10-09 17:47:11 -04:00
e248cf9421
Sal's request
2018-10-09 22:44:43 +01:00
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
66d00b7cc6
HitEm sound for K_ExplodePlayer
2018-10-09 22:24:44 +01:00
83bfca8009
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg
2018-10-09 21:09:52 +01:00
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
431ccce0e4
Merge branch 'master' into new-engines
2018-10-09 15:35:50 -04:00
8836cdeeee
Merge branch 'master' into new-engines
2018-10-09 15:34:26 -04:00
b349063431
Merge branch 'sal-cleanup' into 'master'
...
Sal cleanup
See merge request KartKrew/Kart!23
2018-10-09 15:33:52 -04:00
aa12bbf039
Fix tabbing
2018-10-09 15:28:52 -04:00
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
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
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
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
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
3a1d58ceb6
Reduce update frequency to match the sfx length better
2018-10-08 22:35:17 -04:00
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
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
a6a229dea8
boostcam scales based on previous boost
2018-10-08 16:20:30 -04:00
1324e0bfcd
* 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
12e0222929
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
1049f3451a
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
1115f41f8e
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
640e0e09c6
Merge branch 'master' into sal-cleanup
2018-10-08 00:22:44 -04:00
36696b1fbb
Merge branch 'noclip-cam' into 'master'
...
Noclip cam
See merge request KartKrew/Kart!32
2018-10-07 23:15:06 -04:00
b8d86bb096
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
842430dbdb
Rocket Sneakers appear beside you
2018-10-07 18:53:46 -04:00
027e6e8e3c
Change win_snd.c also
2018-10-07 15:00:48 -04:00
232a7ae7b7
Change order of the ifdef
2018-10-07 14:52:25 -04:00
def090c9f0
Move the ifdef
2018-10-07 14:45:03 -04:00
a5fb2143fd
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
e4f2a3d7b6
Merge branch 'skill-option' into 'master'
...
-skill launcher option
See merge request KartKrew/Kart!34
2018-10-07 12:25:06 -04:00
d3e489e986
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
42307c0ea0
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
b1e02467bf
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
eebde386cf
Merge branch 'frameperfectegg' into 'master'
...
Frame Perfect Egg
See merge request KartKrew/Kart!31
2018-10-07 09:39:45 -04:00
64ceed280a
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
da4853f4d5
Merge branch 'droptweaks' into 'master'
...
Droptweaks
See merge request KartKrew/Kart!27
2018-10-07 09:37:02 -04:00
2f061a531a
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
fb6c329870
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
02597e0bf9
Fix compiler warnings.
2018-10-07 09:26:18 +01:00
8ba3f88553
Don't need thissec
2018-10-06 23:37:27 -04:00
TehRealSalt