vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3669 commits 50 branches 7 tags 75 MiB
Commit graph

3074 commits

Author SHA1 Message Date
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 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
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
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
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
toaster 41ad3de999 Access to map hell maps in record attack. Currently dependent on 50 emblems. 
Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
 2018-10-06 21:08:09 +01:00
TehRealSalt ea6bdca949 Remove R_DoorClosed 
This function has caused me, so much unexpected pain because of just how out of the way it is, and NOTHING else uses it
 2018-10-06 15:13:57 -04:00
toaster 2effb6adc3 Halt frame-perfect egg crash. 
(The code is slightly modified from what I put in bug-reports as a potential fix, but I'm glad I was on the right track.)
 2018-10-05 23:24:26 +01:00
Monster Iestyn 1ec601af6b Draw a star for continues if invalid skin numbers are somehow supplied 2018-10-05 22:42:36 +01:00
TehRealSalt cc2af8a329 Merge branch 'master' into net-screen 2018-10-05 16:13:25 -04:00
Sal 5a80d036e7 Merge branch 'always-move-cam' into 'master' 
Move camera less often

See merge request KartKrew/Kart!30
 2018-10-05 11:47:55 -04:00
Sal 352c824ee1 Merge branch 'chat-changes' into 'master' 
Chat changes

See merge request KartKrew/Kart!26
 2018-10-05 11:47:45 -04:00
Sryder d1daa99289 Merge branch 'vsync-default-off' into 'master' 
Disable VSync by default

See merge request KartKrew/Kart!29
 2018-10-05 10:44:48 -04:00
Latapostrophe df824eb370 Say-team (key and command) now depend of G_GametypeHasTeams(), so you'll only have to modify this function to have say-team work in the gametypes of your choice. 2018-10-05 12:13:11 +02:00
TehRealSalt 3417f57e92 -skill launcher option 
Requested by Sev(?), for map editing; sets kartspeed using the same name as Doom's difficulty launcher option
 2018-10-04 23:58:44 -04:00
TehRealSalt 34aa3762c9 -splitscreen launcher option 
Now you can join a game in splitscreen mode from a launcher
 2018-10-04 23:55:28 -04:00
Steel Titanium b812a6a4ab Really fix DD compiling this time. 2018-10-04 22:56:11 -04:00
Steel Titanium fc5d969642 Fix DD compiling 2018-10-04 22:44:26 -04:00
Steel Titanium 49cb1ffe9f Restore deleted endif 2018-10-04 22:38:59 -04:00
TehRealSalt d51e4c3140 Scale explosions properly 2018-10-04 22:09:12 -04:00
TehRealSalt c5e30aa018 Don't allow non-keyboard keys to screenshot/gif in menus 2018-10-04 22:06:56 -04:00
TehRealSalt 85ed88ac20 Merge branch 'master' into net-screen 2018-10-04 20:16:25 -04:00
TehRealSalt 376656343a Revert "Attempt to not let the camera into thok barriers" 
This reverts commit 9f42e74fe2.
 2018-10-04 20:08:29 -04:00
TehRealSalt 7de16e2528 Foolish 2018-10-04 20:06:55 -04:00
Steel Titanium 79f5f4885c Split zlib and libpng 2018-10-04 19:47:19 -04:00
TehRealSalt 639a170c78 Merge branch 'master' into sal-cleanup 2018-10-04 18:51:45 -04:00
TehRealSalt 6bae5e952b Brown text colormap instead of teal, revert sky-blue 2018-10-04 18:07:56 -04:00
TehRealSalt 71efda2b20 Always move the camera 
According to wolfs, this improves fps. Let's confirm, shall we?
 2018-10-04 17:50:50 -04:00