Commit graph

3783 commits

Author SHA1 Message Date
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
TehRealSalt
a41cddc94a use cvar mins 2018-10-08 14:49:48 -04:00
TehRealSalt
7838a29f3d Scale chat in splitscreen
Only covers things on P1's screen now
2018-10-08 14:38:29 -04:00
TehRealSalt
1807466474 Simpler loop 2018-10-08 13:58:16 -04:00
toaster
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
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
TehRealSalt
640e0e09c6 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -04:00
TehRealSalt
9e51c10337 Fix Hyudoro arrows being visible 2018-10-08 00:16:27 -04:00
TehRealSalt
3101eb1a18 Don't let chat/console eat inputs from anyone besides player 1 2018-10-08 00:14:29 -04:00
TehRealSalt
42766db48c Merge branch 'master' into net-screen 2018-10-07 23:26:56 -04:00
Sal
36696b1fbb Merge branch 'noclip-cam' into 'master'
Noclip cam

See merge request KartKrew/Kart!32
2018-10-07 23:15:06 -04:00
Sal
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
TehRealSalt
e5183523a5 Merge branch 'master' into net-screen 2018-10-07 18:54:22 -04:00
TehRealSalt
842430dbdb Rocket Sneakers appear beside you 2018-10-07 18:53:46 -04:00
Steel Titanium
027e6e8e3c Change win_snd.c also 2018-10-07 15:00:48 -04:00
Steel Titanium
232a7ae7b7 Change order of the ifdef 2018-10-07 14:52:25 -04:00
Steel Titanium
def090c9f0 Move the ifdef 2018-10-07 14:45:03 -04:00
Monster Iestyn
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
Sryder
e4f2a3d7b6 Merge branch 'skill-option' into 'master'
-skill launcher option

See merge request KartKrew/Kart!34
2018-10-07 12:25:06 -04:00
Sryder
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
toaster
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
toaster
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
Sryder
eebde386cf Merge branch 'frameperfectegg' into 'master'
Frame Perfect Egg

See merge request KartKrew/Kart!31
2018-10-07 09:39:45 -04:00
Sryder
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
Sryder
da4853f4d5 Merge branch 'droptweaks' into 'master'
Droptweaks

See merge request KartKrew/Kart!27
2018-10-07 09:37:02 -04:00
toaster
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
Sryder
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
Sryder
02597e0bf9 Fix compiler warnings. 2018-10-07 09:26:18 +01:00
TehRealSalt
8ba3f88553 Don't need thissec 2018-10-06 23:37:27 -04:00
TehRealSalt
ff7b402dc5 OGL support 2018-10-06 19:25:59 -04:00
Sryder
d072dd2725 I think that should be NULL, not 0 actually. 2018-10-07 00:22:23 +01:00
Sryder
7b417b573c Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound.
Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk.
I went back to Z_Malloc and Z_Free for this because they still work after this.
2018-10-07 00:15:42 +01:00
Sryder
725a65c1f7 Call SDL_RWclose after an SDL_RWFromMem call to close the RWops. 2018-10-07 00:15:11 +01:00
toaster
031f142459 You got it, Sal 2018-10-06 21:53:39 +01:00
TehRealSalt
3d7a1d44d5 Do clipsolid for doorclosed only while your camera is outside of the sector 2018-10-06 16:22:36 -04:00