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

3641 commits

Author SHA1 Message Date
Sal c419d973a3 Merge branch 'chat-changes' into 'master' 
Fix capslock wonkyness

See merge request KartKrew/Kart!98
 2018-11-17 16:54:56 -05:00
Sal 52e0379398 Merge branch 'introfadefix' into 'master' 
Make level white fade use timeinmap instead of leveltime

See merge request KartKrew/Kart!93
 2018-11-17 16:54:19 -05:00
Sal b27a44e79b Merge branch 'serverinfo_fix' into 'master' 
Serverinfo Fixes

Closes #33 and #31

See merge request KartKrew/Kart!92
 2018-11-17 16:54:08 -05:00
Sal 37596d445c Merge branch 'savedata_fixes' into 'master' 
Gamedata fixes

Closes #35

See merge request KartKrew/Kart!97
 2018-11-17 16:53:56 -05:00
Sal f17f5d08f5 Merge branch 'fix-splitscreen-join' into 'master' 
Prevent more local players than the server maxplayers limit joining

Closes #30

See merge request KartKrew/Kart!90
 2018-11-17 16:29:11 -05:00
Sal 8981093c85 Merge branch 'dedicated-battle-fix' into 'master' 
Fix Battle Causing the game to crash in dedicated servers

Closes #36

See merge request KartKrew/Kart!88
 2018-11-17 16:27:15 -05:00
Sal e4cb1bc430 Merge branch 'shrinkegg_fix' into 'master' 
Fix Eggman shrink bug

Closes #38

See merge request KartKrew/Kart!89
 2018-11-17 16:24:40 -05:00
Latapostrophe 477400020d forgot whitespaces.... 2018-11-17 22:23:23 +01:00
Latapostrophe e9767df4ff Fix capslock not working outside of chat/console and shifting non letter characters 2018-11-17 22:21:10 +01:00
toaster 4abb03a231 Two tweaks to gamedata saving: 
* Save gamedata in Y_UpdateRecordReplays(), so that you never unfairly lose out on your spoils by setting modifiedgame before the game ends.
* Always save your matchesplayed/totalplaytime increase at the successful completion of a level.
 2018-11-17 20:16:27 +00:00
toaster 176dc6e5ca Fix the first digit of all exiting players in positions 10 or worse flashing the first-place rainbow. 2018-11-17 18:02:04 +00:00
toaster 69228715fe Make level white fade use timeinmap instead of leveltime 2018-11-17 16:54:56 +00:00
toaster 56ed67397d * Fix the in-game MS browser thinking gametypes are unknown. 
* Fix the website MS browser mapname output being incomplete.
* Hide hell maps on the website MS browser mapname output.
* (unrelated) tweak Command_Showmap_f's logic for a more accurate name.
 2018-11-17 15:48:10 +00:00
Sryder c46efa7c41 Set the screen textures to use max higher texture IDs 
This should hopefully alleviate the issue where textures overwrite the screen, or the screen overwrites the texture for now.
THIS IS NOT A FULL SOLUTION TO THE PROBLEM, but I highly doubt we'll ever be loading 4 billion textures at once, ever.
 2018-11-17 15:23:12 +00:00
Sryder 5d991b6f2a Prevent more local players than the server maxplayers limit joining 2018-11-17 15:00:15 +00:00
toaster 8735dcd24b Fix Eggman shrink bug. 
Specifically: removed K_StripOther calls from touching fakes: No, none of these things need to be stripped! Also, poke K_StripOther just in case it eventually becomes relevant to have it.
 2018-11-17 14:41:08 +00:00
Sryder 8845043d31 Fix Battle Causing the game to crash in dedicated servers 
Check that the displayplayer mo exists before trying to use it for scaling on Player Arrow
 2018-11-16 23:07:27 +00:00
TehRealSalt e85e621d2c Minor credits issues 2018-11-16 12:05:57 -05:00
TehRealSalt 0de2d52bfd add TOL_TV to dehacked 2018-11-16 12:04:24 -05:00
TehRealSalt cb8bbf8e4c Ensure MS packets are sent correctly 2018-11-16 12:01:57 -05:00
TehRealSalt 692ea23a42 Final credits 2018-11-15 22:55:01 -05:00
TehRealSalt 879267a709 Don't allow kart files to be downloaded 2018-11-15 19:18:04 -05:00
TehRealSalt 6b772aab59 Add Kart files to Makefile 2018-11-15 19:17:49 -05:00
TehRealSalt 82f353be61 Remove music.dta from loading 
We've replaced/changed out all vanilla songs, so we no longer need it.
 2018-11-15 19:17:06 -05:00
toaster 5d6e15f8af More cinematic title demos (hide most HUD elements, show a title logo in the bottom right hand corner). 2018-11-15 14:30:11 +00:00
Sryder b8477b4067 Squash various warnings 
Shadowed declarations
Unsuffixed float constants
There's an unsuffixed float constant I can't fix because the define is outside of SRB2. We could have our own copy of Pi if we really wanted.
 2018-11-14 21:53:57 +00:00
Monster Iestyn 09f9572a8f Merge branch 'master' into next 2018-11-14 21:49:11 +00:00
Monster Iestyn 3e6fcf1b8b Merge branch 'opengl-hud-scale-fix' into 'master' 
OpenGL HUD scaling fix

See merge request STJr/SRB2!320
 2018-11-14 16:48:13 -05:00
Alam Ed Arias d4cb81cb28 Merge branch 'master' into next 2018-11-14 15:45:29 -05:00
TehRealSalt ad79b4b83b Add S_StopSoundByID to Lua 
It was brought up to me in another server that character creators might want to have unique engine sounds. While I don't want to support that ourselves, as we have consistent engines for gameplay reasons, this gives people the ability to script around it if they so choose.

Plus, it's just generally useful and I'm surprised vanilla hasn't added it, even though they have the function to stop ALL sounds on an object.
 2018-11-14 15:35:16 -05:00
TehRealSalt 514cd0794b This effect assumed that it was spawned at base scale anyway... 2018-11-14 14:48:16 -05:00
TehRealSalt 2d5551ca5b Double spectator movement speed to keep up with action better, scale it with map size 2018-11-14 14:41:28 -05:00
TehRealSalt 1201acce4b Slightly less duplication 2018-11-14 14:39:37 -05:00
MonsterIestyn 772c072064
Merge branch 'master' into analog-flipcam-synch-fix 2018-11-14 19:36:39 +00:00
TehRealSalt 887f4150c1 Hide unlockables with ???s 2018-11-14 14:15:24 -05:00
Alam Ed Arias 97fd69951a Merge branch 'master' into next 2018-11-14 11:07:12 -05:00
Alam Ed Arias de5b626520 Fix misleading indentation 2018-11-14 11:06:45 -05:00
Alam Ed Arias f81d01edca Merge branch 'vc-xpm-fix' into 'master' 
Remove unnecessary SDLCALL from IMG_xpm.c declarations

See merge request STJr/SRB2!327
 2018-11-14 11:00:20 -05:00
Alam Ed Arias d14f87b8c6 Cleanup whitespace 2018-11-14 10:54:33 -05:00
Alam Ed Arias 938bf1605c Merge branch 'master' into next 2018-11-14 10:52:49 -05:00
Alam Ed Arias f73ea4f984 Clean up warnings 2018-11-14 10:52:16 -05:00
toaster 3b48bf0079 Hide SMK Cup until you've unlocked the Chao Cup on EXTRAS unless you've unlocked the Chao Cup. Fits with our modus operandi of minimising Mario exposure, while still having it for the committed. 2018-11-14 15:29:32 +00:00
toaster d9b1d33d89 Bugfixes: 
* Use CV_NOSHOWHELP as an obstacle for CV_CompleteVar (so the hidden variables don't show up and ruin our party or anything).
* Hack around the karteliminatelast thing so we don't have to hex-edit the netids, and can release with current assets (but a different executable, of course, to get the credits).
* Fix M_HandleConnectIP not saving your current position on the menu if you use it while it's empty.
 2018-11-14 15:28:17 +00:00
Marco Z 8777d5c6c9 Comment context for declaration changes; remove extern terms 2018-11-14 08:15:38 -05:00
Marco Z 51768e7dd1 Remove unnecessary SDLCALL from xpm declarations 2018-11-14 08:06:07 -05:00
Monster Iestyn f3b59c1731 Fix VC project files to include hw_clip.c/h 2018-11-14 12:11:57 +00:00
TehRealSalt ba9818c8ca Skip errors for staff ghosts 2018-11-14 05:20:51 -05:00
TehRealSalt 6afcde4aa5 More lenient balloon color setting 2018-11-14 04:45:40 -05:00
TehRealSalt 9119191b43 maps.kart quick patch 2018-11-14 04:16:13 -05:00
TehRealSalt 106d8c6d3f Remove "Kart" in front of the version number 
Just looks silly :V
 2018-11-14 01:12:58 -05:00
Sal f10e7bade4 Merge branch 'disable-develop' into 'master' 
Disable DEVELOP mode

See merge request KartKrew/Kart!85
 2018-11-14 00:52:00 -05:00
TehRealSalt 682599def8 Update hashes 
NO MORE FILE EDITING FOR V1!!
 2018-11-14 00:51:36 -05:00
TehRealSalt f859139353 Final title screen 2018-11-14 00:30:51 -05:00
Marco Z 0b97b2a76c Missed #ifdef HAVE_LIBGME in win_snd 2018-11-13 22:50:08 -05:00
TehRealSalt 7c2535808f Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-13 21:02:49 -05:00
TehRealSalt 1ab5ac58a7 Title demos don't interrupt the music 2018-11-13 21:01:59 -05:00
toaster 6fb45fa2a9 replacement quit sounds per sal 2018-11-14 01:30:26 +00:00
toaster 5d2e638e8a final menu tweaks before i fall asleep in my chair 2018-11-14 01:27:01 +00:00
TehRealSalt 5a06ae76ea Switch Chao Cup & SMK Cup 2018-11-13 18:34:37 -05:00
Monster Iestyn 302358c403 Merge branch 'mixer-sound-x64-fix' into 'master' 
mixer_sound fix x64 build issue

See merge request STJr/SRB2!323
 2018-11-13 17:42:23 -05:00
mazmazz 2db2b6e6af Win32 boolean fixes 2018-11-13 17:24:19 -05:00
Steel Titanium 95ed3fcf7e Save current renderer to screenshots 2018-11-13 17:19:22 -05:00
mazmazz 894ee02f3f Fix x64 build issue 2018-11-13 17:12:18 -05:00
Monster Iestyn e9fe0ebae1 Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy 2018-11-13 18:14:59 +00:00
Monster Iestyn 0d38061db8 Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode 2018-11-13 18:13:51 +00:00
TehRealSalt d09fd4b861 Carry over old explosion sfx flags 2018-11-13 01:09:36 -05:00
TehRealSalt 29c9448148 Fix clash sound flags not being carried over 2018-11-13 01:06:13 -05:00
TehRealSalt b009bddd3b Lowered volume of drift sparks, made local 2018-11-12 17:18:39 -05:00
TehRealSalt 13b51823ba Some tweaking 
- Swap order of Silver & Gold, for menu appearances & bug fixing
- Ensure that totalplaytime and matchesplayed aren't kept when M_ClearSecrets getss called in M_EraseDataResponse
- Set sensible defaults for emblem sprite/color
 2018-11-12 17:09:37 -05:00
Monster Iestyn e85f73117c Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set! 2018-11-12 20:07:45 +00:00
TehRealSalt faaea8abe3 Final emblem setup 
- Added silver time medals for the new maps
- Added gold dev time medals for all maps
- Added 4 more matches played milestone medals
- Changed requirements for most silver time medals to be easier, especially in the early game
- Made all unlockable requirements higher, in both medals & matches, to balance out with the additional medals and make sure stuff is unlocked further into the first release week
 2018-11-12 14:42:52 -05:00
Monster Iestyn 63ba59341b Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing 2018-11-12 16:23:59 +00:00
TehRealSalt d0f21ca415 Merge branch 'sfx-clean' 2018-11-12 04:26:02 -05:00
TehRealSalt 91ae26e213 Use S2 rips on the title screen 2018-11-11 19:22:15 -05:00
TehRealSalt 93ab9850a3 Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots 
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
 2018-11-11 17:30:30 -05:00
toaster 71c72bf0c5 Realign YOU ARE THIS PLAYER highlight on non-green-res voting 2018-11-11 14:36:24 +00:00
Sryder 799efd5b31 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into nextmerge 2018-11-10 22:29:37 +00:00
toaster aece934083 Fix not found 40833 2018-11-10 22:27:04 +00:00
Sryder 6af56273bf Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge 
# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
 2018-11-10 21:14:53 +00:00
Monster Iestyn fced19d291 Merge branch 'master' into next 2018-11-10 19:05:33 +00:00
Monster Iestyn c7e58b7cd5 Merge branch 'opengl-new-clipping-backport' into 'master' 
OpenGL new clipping backport

See merge request STJr/SRB2!315
 2018-11-10 13:57:16 -05:00
Monster Iestyn 46b58cba55 Merge branch 'alias-recursion-hotfix' into 'next' 
Alias recursion hotfix

See merge request STJr/SRB2!314
 2018-11-10 13:56:43 -05:00
Monster Iestyn 51df32dd3d Merge branch 'gcc-compiling-cleanup' into 'master' 
Compiling cleanup and fixes

See merge request STJr/SRB2!311
 2018-11-10 13:56:17 -05:00
toaster e1a28bbe1c Three more CV_NOSHOWHELP's I missed the first time around. (Not making another exe for this, it'll show up the next time one is made... not that important.) 2018-11-10 18:50:19 +00:00
toaster 45fc2c46e9 Merge branch 'fof-slope-skew-backport' of https://git.magicalgirl.moe/STJr/SRB2.git 2018-11-10 18:27:13 +00:00
Sryder a0165f1ac1 Merge branch 'com_cleanup_redo' into 'master' 
Improved "HELP" command

See merge request KartKrew/Kart!82
 2018-11-10 12:51:51 -05:00
Monster Iestyn 323c89dbaf fix using abs() on unsigned 2018-11-10 17:40:09 +00:00
Monster Iestyn dd83652b71 Whoops, this broke my non-NEWCLIP test build 2018-11-10 16:10:25 +00:00
Monster Iestyn 8ba0f2a177 clipping code didn't seem so bad this time (at least compared to without), let's enable it now? 2018-11-10 16:09:52 +00:00
Monster Iestyn c4569e61a8 Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly 
R_IsEmptyLine is now a thing too btw
 2018-11-10 16:09:21 +00:00
Monster Iestyn 1e98e3b4f2 More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now 
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
 2018-11-10 16:08:56 +00:00
Monster Iestyn a733a29f4c Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least 
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
 2018-11-10 16:08:26 +00:00
Monster Iestyn 31301660cd Merge branch 'master' into next 2018-11-10 14:27:27 +00:00
Monster Iestyn 925a56ad98 Merge branch 'opengl-improvements-backport' into 'master' 
Opengl improvements backport

See merge request STJr/SRB2!304
 2018-11-10 09:25:18 -05:00
Monster Iestyn e01c7ae743 Merge branch 'copyright-info-update' into 'master' 
Update copyright info

See merge request STJr/SRB2!309
 2018-11-10 08:33:09 -05:00
Monster Iestyn 2da335a1c4 Place limit on the amount of alias recursion allowed, to prevent cycles or otherwise excessive recursion 2018-11-10 13:08:26 +00:00
toaster 5b286d89a8 Hide the numlaps change message in record attack. (It plays every time you load a demo of a map with a differing quantity of laps to the default value...) 2018-11-10 12:34:04 +00:00
toaster a0badacd22 * Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first. 
* Apply the "YOU ARE THIS PERSON" highlight to all non-splitscreen circumstances that use the tiny player icons. (New locations: Tab rankings, intermission, completed votes.)
 2018-11-10 12:31:41 +00:00
TehRealSalt fa989f2f7f Shorter Karma sticker 2018-11-10 01:03:34 -05:00
TehRealSalt 0f01e9513a Use Silver for brake drift effect 2018-11-10 00:02:21 -05:00