TehRealSalt
a1a7a10ac1
Merge branch 'master' into net-screen
2018-10-09 21:16:16 -04:00
TehRealSalt
043c43f48f
Merge branch 'master' into net-screen
2018-10-09 21:15:30 -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
511944a1f1
Merge branch 'master' into net-screen
2018-10-09 15:43:38 -04: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
TehRealSalt
b6ff542803
Merge branch 'master' into net-screen
2018-10-09 14:41:59 -04: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
TehRealSalt
ab0c7b6ba8
use cvar mins
2018-10-08 14:49:48 -04:00
TehRealSalt
aa4c42fa98
Scale chat in splitscreen
...
Only covers things on P1's screen now
2018-10-08 14:38:29 -04:00
TehRealSalt
3e99d4838e
Simpler loop
2018-10-08 13:58:16 -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
TehRealSalt
d5c06b31ad
Fix Hyudoro arrows being visible
2018-10-08 00:16:27 -04:00
TehRealSalt
1acee694aa
Don't let chat/console eat inputs from anyone besides player 1
2018-10-08 00:14:29 -04:00
TehRealSalt
7a6a2f8946
Merge branch 'master' into net-screen
2018-10-07 23:26:56 -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
b5f409fcb8
Merge branch 'master' into net-screen
2018-10-07 18:54:22 -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
