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

3523 commits

Author SHA1 Message Date
TehRealSalt a2da81243e Double length of msg 2018-11-01 17:08:30 -04:00
TehRealSalt 43d72d72f9 Properly center this 2018-11-01 17:06:10 -04:00
TehRealSalt 7e9300c420 Lap hands touch-up 2018-11-01 16:15:25 -04:00
Steel Titanium 5a0cfc10f4 Update copyright info on some files 2018-11-01 14:47:19 -04:00
TehRealSalt 4cf9476510 First frame lasts longer 2018-11-01 13:44:09 -04:00
TehRealSalt 7891a11fba Battle points are visible 2018-11-01 00:57:38 -04:00
TehRealSalt a193a4adf2 YOU GOT EM 
Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
 2018-10-31 23:34:13 -04:00
TehRealSalt 6c557407d5 Added judging hands (if'd out) 2018-10-31 23:10:38 -04:00
TehRealSalt 4369917912 Fix offsets, add colormapping 2018-10-31 22:38:43 -04:00
TehRealSalt ea4ca2eb1f Brake drfit effect 2018-10-31 21:35:17 -04:00
toaster 659e6fa617 That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. 
* Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'!
* Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites.
* Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
 2018-11-01 00:10:34 +00:00
Monster Iestyn 4dd5abf534 Merge branch 'master' into next 2018-10-31 23:10:57 +00:00
Monster Iestyn c450a1aee2 Merge branch 'mi-minor-refactoring-backport' into 'master' 
MI minor refactoring

See merge request STJr/SRB2!294
 2018-10-31 16:49:30 -04:00
Monster Iestyn 61c1b12960 Merge branch 'multipatchtex-translucent-cyanpixel-fix-backport' into 'master' 
Multi-patch texture support for transparency AND translucency

See merge request STJr/SRB2!293
 2018-10-31 16:48:38 -04:00
Monster Iestyn e9ea1b47d5 Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens 2018-10-31 19:26:29 +00:00
TehRealSalt 2999c45d05 Item distribution experiments based on my experience in netgames 
Needs tested tonight.

- Grow & Rocket Sneakers are slightly more in the back
- Sneaker x3 gets handed out more in the back-middle
- Removed 5% from Ballhog towards the front
- Removed 5% from Shrink in the forward-most column it was in
 2018-10-31 15:14:53 -04:00
toaster 007ef084c6 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-31 16:19:50 +00:00
toaster 668acad8a7 Order of state enums was different to that of info table, so corrected. 2018-10-31 16:18:44 +00:00
Latapostrophe 1928dd86f1 I forgot a }, you may slap me. 2018-10-31 17:14:32 +01:00
toaster 8370064706 Merge branch 'wolfs_hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
 2018-10-31 15:19:39 +00:00
Latapostrophe 7a04fd1097 Resolved merge conflict and renamed gamerankings to minirankings 2018-10-31 15:18:05 +01:00
TehRealSalt 80b8aefdb2 Nerfed squishing 
After fixing flashing tics not being set properly, 2 seconds of being fully stopped and then another 1.5 seconds minimum of being unable to be hit just feels like an eternity :V
 2018-10-31 05:35:06 -04:00
TehRealSalt e76da7d5ca No item usage while squished or respawning 2018-10-31 05:32:59 -04:00
TehRealSalt 54f71d3dbf Use frameangle for rocket sneakers so they rotate around you when you spinout 2018-10-31 05:28:39 -04:00
TehRealSalt 6da700629f Fix incorrect scale of player arrows in non-splitscreen 
whoops
 2018-10-31 04:55:00 -04:00
TehRealSalt 66a7adfc34 Push fakes away from other items 
Prevents stupid item stacking in Battle (you can still do it with bananas, but THOSE are removable, and don't have a similar sprite)
 2018-10-31 04:46:24 -04:00
TehRealSalt cc5d248c90 Time over cam & signposts support mobjscale 2018-10-31 03:13:56 -04:00
TehRealSalt 20d86f01c7 Cancel pogo spring when bumping a wall 
Prevents instances where you can use it to stick in one spot in Battle
 2018-10-31 03:07:33 -04:00
TehRealSalt db731209e5 Fix ENTER GAME option not working 2018-10-31 03:06:36 -04:00
TehRealSalt 69354856b7 "Joined with" kicks display in the chat instead of console 2018-10-31 02:46:16 -04:00
wolfy852 932f1f929a SOC_CHAO hardcode 
TODO: fix comment alignment
 2018-10-30 20:35:33 -05:00
TehRealSalt aea453f6f2 Set stats to what we want them to be for R2 anyway 
(Eggman's will need updating in the wad)
 2018-10-30 20:11:15 -04:00
toaster 26241d32ce Have HU_DrawRankings and K_drawKartPositionFaces learn a thing or two from each other, considering the latter was originally copypasted code from the former but then diverged a bit. 
Hopefully this solves our disconnect woes.
 2018-10-30 23:01:17 +00:00
toaster fe177975ca Fix ping alignment. 2018-10-30 22:44:05 +00:00
TehRealSalt f1ea725319 Clean up for player->mo resyncing 
Make most of the order match the struct, make sure proper type conversions are used when needed
 2018-10-30 18:20:56 -04:00
Latapostrophe f2eea0b31a I'm a genius and forgot to rename the stuff correctly 2018-10-30 23:10:56 +01:00
toaster ad78c75430 Make the horizontal line at the bottom of the tab rankings use the duptweaks. 2018-10-30 22:09:04 +00:00
Latapostrophe b6b19c8250 Removed some useless stuff 2018-10-30 23:08:58 +01:00
toaster f36d58dd09 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup 2018-10-30 22:08:17 +00:00
toaster 6c020aab2e Some adjustments to the position faces. (Currently untested, but I need to merge master in and accidentially did this before that and I still have to compile from scratch for this branch, so...) 2018-10-30 22:07:35 +00:00
Latapostrophe 6841458546 got rid of the settop as well 2018-10-30 22:51:05 +01:00
Latapostrophe 799d8d2749 remove gL check 2018-10-30 22:29:28 +01:00
TehRealSalt f9d559b03c Fuck it, add back in the old vars 
If we want a smaller resync packet, let's actually remove these FOR REAL
 2018-10-30 17:03:11 -04:00
TehRealSalt 7fbfed535b Add hnext/hprev to consistancy, add marescore to resynchend 2018-10-30 16:24:27 -04:00
Latapostrophe a0495142df Small hud library additions 2018-10-30 19:40:59 +01:00
Latapostrophe 232a19edf4 A few additions to the hud library 2018-10-30 18:24:03 +01:00
Monster Iestyn 22e8dd1f9d now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore 2018-10-30 14:22:21 +00:00
Monster Iestyn 2fa0896fd0 Fix an error I made in HWR_DrawFixedPatch 2018-10-30 13:44:01 +00:00
toaster 98f9d73ca8 No fucking wonder these weren't showing up, I set their duration to 1 tic instead of -1 tic 
(The Volcanic Valley issue is because the most recent Volcanic Valley update in maps.kart lost all the Objectspecial flags from mapthing 2018)
 2018-10-30 11:08:53 +00:00
TehRealSalt 48a400c347 Clean up resync pak 2018-10-30 01:23:21 -04:00
toaster 7f24836d00 Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:47:34 +00:00
TehRealSalt 08144b96f1 Fix SMK RR thwomps casuing bounce-up 2018-10-29 17:45:59 -04:00
toaster 52523fc4b4 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:37:06 +00:00
toaster f1a6e1e6cd Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 
# Conflicts:
#	src/info.c
#	src/info.h
#	src/p_mobj.c
 2018-10-29 21:36:39 +00:00
toaster 318d692c3c Make dropped floatingitems not carry player momentum (sorry for leaving this so long, Oni!) 2018-10-29 14:43:21 +00:00
Monster Iestyn b022ff02a5 add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well 2018-10-29 13:34:54 +00:00
Monster Iestyn f8fd8f8ec5 HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields 2018-10-29 13:29:16 +00:00
Monster Iestyn df9c3ef3cd Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own 2018-10-29 12:36:09 +00:00
Monster Iestyn 834a5e6b35 V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP 2018-10-29 12:06:22 +00:00
toaster 1e4207c1de Merge branch 'master' into 'toast_pokes' 
# Conflicts:
#   src/hu_stuff.c
 2018-10-29 07:04:35 -04:00
toaster e2399c1638 Fix Sonic's minimap icon not being properly initialised. (Experimenting with the online editor, since I'm low on time, but this is 100% correct and I'll make a new exe later.) 2018-10-29 06:57:45 -04:00
toaster adcf5a9a4e Merge branch 'master' into 'chars_cleanup' 
# Conflicts:
#   src/hu_stuff.c
 2018-10-29 06:48:18 -04:00
Sal 07a31c20d6 Merge branch 'grow-shrink-fixes' into 'master' 
Invincibility item & Shrink fixes

See merge request KartKrew/Kart!68
 2018-10-29 05:32:20 -04:00
Sal 292a18804a Merge branch 'splitscreen-tuneup' into 'master' 
Splitscreen tuneup

See merge request KartKrew/Kart!67
 2018-10-29 05:30:49 -04:00
Sal 8dbb636b2f Merge branch 'div-sounds' into 'master' 
Divide sound with number of local players

See merge request KartKrew/Kart!66
 2018-10-29 05:26:51 -04:00
TehRealSalt f8d87c8f08 Preface with splitscreen checks 2018-10-29 05:26:17 -04:00
TehRealSalt 14fcda0eca Make shadows more consistent on slopes for non-players 2018-10-29 05:21:47 -04:00
TehRealSalt 9f18164ad4 The motherload: all of my Lua is hardcoded 
This took like 6 straight hours of work, never ask me for anything ever again
 2018-10-29 05:00:08 -04:00
TehRealSalt 9630e01616 Camera crash fixes 
UNRELATED, but they made this branch a pain in the ass to test so I needed to fix this here :V
 2018-10-28 17:31:59 -04:00
TehRealSalt b83286b532 Use k_itemtype as the additional check instead of pw_shield 2018-10-28 14:45:01 -04:00
TehRealSalt 9d6563fcf7 Fix kartspeed/kartweight writes 2018-10-28 14:43:58 -04:00
toaster 75efd3e2c5 Ping offset fixed even more 2018-10-28 18:06:21 +00:00
TehRealSalt a23c62e60e Move lap animation up slightly 
(I'm not gonna remember to do this later either)
 2018-10-28 13:52:25 -04:00
toaster 49e25abb60 fix ping drawing offset (this won't be in the exe I uploaded before I disappear for a bit) 2018-10-28 16:34:02 +00:00
toaster fe00f34562 unused variable [screams] 2018-10-28 16:29:56 +00:00
toaster a9b4a56d23 Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. 
* Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps.
* Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix).
* Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything.
* Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers.
* Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
 2018-10-28 16:27:55 +00:00
TehRealSalt a885f340ae Use V_ORANGEMAP for blinking WANTED text in Battle splitscreen 2018-10-28 01:50:27 -04:00
TehRealSalt 84c9dbfcce Even better: base it off how much timer is left 
So instead of prioritizing a specific track, the person who activated their powerup the latest gets their music. That should be a nicer solution for when multiple players are activating their powerups at the same time.
 2018-10-28 01:38:01 -04:00
TehRealSalt 67a8ee178d More smoothly decide which invincibility music to use 
Less P_RestoreMusic conflicts in splitscreen, just see the Toxic Palace video for an example :V
 2018-10-28 01:22:26 -04:00
TehRealSalt b6d8c3ea7d This didn't commit with for some reason... 2018-10-28 01:02:49 -04:00
TehRealSalt 93e989cf61 Fix invincibility item cap 
It was supposed to be capped at 2 invincibility items at a time, not 3. (may consider scaling with number of players, just not for R1)
 2018-10-28 01:02:30 -04:00
TehRealSalt 5a719afbc1 Fix up respawning so that it takes respawning with Shrink into account 2018-10-28 00:58:49 -04:00
TehRealSalt 8d78ee7458 No more rescaling gfx for countdown/finish 2018-10-27 23:14:11 -04:00
TehRealSalt e9515294e8 Show LOSE/COOL in splitscreen again 
Looked goofy offline, with 1 WIN and 3 LOSEs, but now that there's COOL and online splitscreen I thought it should come back
 2018-10-27 22:43:57 -04:00
TehRealSalt d0a50ae247 This bothers me, so I might as well do it while I'm in here. 2018-10-27 21:48:50 -04:00
TehRealSalt dc5a738f7f "if !splitscreen" instances that SHOULD be "if netgame" 2018-10-27 21:45:04 -04:00
TehRealSalt f1f8f91aea Higher default scale, WANTED indicator scales properly 2018-10-27 20:56:11 -04:00
TehRealSalt 339a857cba Reduce camspeed in splitscreen 2018-10-27 20:44:05 -04:00
toaster 4c7f083d13 toaster: not good at stuff (signpost z offset fix) 2018-10-27 22:23:44 +01:00
toaster e8410b2575 Fix and then subsequently disable the zoom tube angle setting stuff. 2018-10-27 22:05:15 +01:00
toaster 3d760271e3 Fix the issue with sliding I identified this morning. 
Also, apply it to being in a zoom tube, too! For extra forwards compatibility with all the terrible SRB2 Riders ports that are almost an inevitability.
 2018-10-27 21:41:45 +01:00
toaster 119c9f34ae Minor correction - Jeck initially got it wrong, but informed me after lots of testin's. 2018-10-27 21:30:41 +01:00
toaster 8b382d2e40 As requested by Jeck: 
* gr_md2 on the menu.
* Disable interpolerated model option completely for now.

Also, tweaked the GL menus a bit to suck less, since I was ferreting around in that area.
 2018-10-27 21:16:19 +01:00
toaster 68da56671e Make it so hitting enter on the ipv4 option doesn't close all menus with the warning, only if you start trying to connect. 2018-10-27 20:44:18 +01:00
toaster 88b6e9e1bd Minor things that annoyed me to NO GOOD END. 
* Tweak the demo info layout (holding tab while demoplayback) to better match the Viewpoint text in MP.
* Make the tab rankings view support widescreen better, including the spectator ticker (but not the player name layout).
* Make the tab rankings view always have a darkened background, to get around the fact we can't darken it based on player state for battle.
* Remove FREE PLAY from tab rankings.
 2018-10-27 20:43:33 +01:00
toaster 564cfb33b4 Fade stuff! 
* Make the white intro fade always drawn, rather than potentially disable-able through tab or HUD disable.
* Slightly increase the darkness of the intermission fade, since its current value had a negative effect on SKINCOLOR_SAPPHIRE.
 2018-10-27 20:39:41 +01:00
Monster Iestyn 32077897b6 Removed all remaining traces of VID_X11 code in hw_drv.h and hw_data.h, the macro is no longer used by Linux etc versions of SRB2. 
Unlike the rest of the commits in this branch (as of writing), I didn't make this commit between 1 and 2 years ago, I made it right now ;)
 2018-10-27 19:58:51 +01:00
Monster Iestyn aebcf3520b Remove pointless drawtextured variable and redundant fake planes checks (R_FakeFlat would already have made gr_frontsector/backsector something else if they were) 2018-10-27 19:32:55 +01:00
Monster Iestyn 3d88ee9d55 Added missing checks in HWR_AddLine from the software version, move v** vars to the top since R_PointToAngle calls use the same values anyway 2018-10-27 19:31:24 +01:00
Monster Iestyn 09eecd36b4 Hack to make sure even (extra)subsectors without planepolys have segs adjusted 
this fixes a crash in (old) GFZ2 at the ramp as a result of creating pv1/pv2. This probably means before pv1/pv2 there could have been some silly typecasting from vertex_t to polyvertex_t to get fixed vertex coords and such...
 2018-10-27 19:29:45 +01:00
Monster Iestyn 90cfa5ef16 Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore 
Yes I know they're void * in r_defs.h's seg_t definition, it's quicker than trying to figure out if including hardware/hw_glob.h is a good idea or not
 2018-10-27 19:29:31 +01:00
Monster Iestyn 1cf2ce63c0 More optimising and otherwise fixing bizarre formatting in hw_trick.c 2018-10-27 18:58:05 +01:00
Monster Iestyn 2107aab666 Moved my added slope checks in hw_trick.c to isCeilingFloating/isFloorFloating 
I also optimised those two functions while I was there (why keep a "floating" variable when setting it to false guarantees the functions return false?)
 2018-10-27 18:57:28 +01:00
Monster Iestyn 787d5b598d gr_correcttricks fix: don't check if top/bottom textures are missing for sloped sectors, just ignore and cancel the hack 
This fixes GFZ2's mysterious flying flats at the ramp to the big room
 2018-10-27 18:56:38 +01:00
Monster Iestyn 67a2922558 Ensure file is closed whenever MD2 reading errors happen 2018-10-27 18:53:38 +01:00
Monster Iestyn b150e842fc Add MD2_INDENT and MD2_VERSION so we can cleanly check that it's a valid MD2 from magic number/version 2018-10-27 18:53:18 +01:00
Monster Iestyn 29d8e34d03 Call V_DoPostProcessor only in software mode (it cancels itself in OGL anyway) 2018-10-27 18:52:34 +01:00
Monster Iestyn 9fb301ecb5 don't bother with inlining the function, on second thoughts 2018-10-27 16:47:56 +01:00
Monster Iestyn bb3d850bbf static the buffer, forgot to do this earlier 2018-10-27 16:27:00 +01:00
toaster bd36816b39 dumbass who forgot to stage most of the actual changes because she actually deleted all the changes and then remade them by accident 2018-10-27 16:25:25 +01:00
Monster Iestyn e4e76f83c3 Use temporary buffer with a max size of 255 bytes instead of having Microsoft's FormatMessageA alloc one for us. Also, provide a fallback message in case no message was available for some reason 2018-10-27 16:09:14 +01:00
Monster Iestyn 3b39a25ade Save the result of errno (aka WSAGetLastError() for WinSock) as soon as possible, to prevent anything in SOCK_GetNodeAddress resetting the value to 0 while trying to print the message for the error itself! 2018-10-27 15:49:04 +01:00
toaster d78368d4d2 Felt like cleaning up the character frame list. Definitely won't merge conflict with anything else. 
Requires charscleanup.kart. Ezo, if you want me to, I can fix up bonuschars for this tweaked system.
 2018-10-27 15:43:33 +01:00
Monster Iestyn ab38e6cebb Creating a quick get_WSAErrorStr function to act as a wrapper for FormatMessageA so we can string-ify Winsock errors properly 
Untested!
 2018-10-27 15:36:15 +01:00
TehRealSalt a8dfd45d9c Merge branch 'master' into div-sounds 2018-10-26 01:15:10 -04:00
TehRealSalt 8058b77743 Combine spinout & wipeout timers 
Turns out they were only 1 tic apart originally, sooo
 2018-10-26 01:07:54 -04:00
TehRealSalt 6dd7718d6e More consistent face-forward 
Needs it to still land in a close ballpark, so the timer changes are still needed, but  this makes it less prone to error
 2018-10-26 01:07:14 -04:00
TehRealSalt 240d7a44c1 CRITICAL BUGFIX 
Make sure flashing tics don't go down WHILE you're in a hit animation (wipeout, squished)
 2018-10-26 00:56:02 -04:00
TehRealSalt 27f118a06c Adjust spinout times to face your forward about 90% of the time 2018-10-26 00:55:20 -04:00
TehRealSalt 555fbbe2f5 Speed up spinout based on timer left 2018-10-26 00:51:58 -04:00
TehRealSalt 146c8b228b - Reduce volume reduction 
- Don't apply to sounds without an origin mobj
 2018-10-25 22:53:58 -04:00
toaster 4595328e6d Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 2018-10-25 19:09:22 +01:00
Sal 7f2090aeae Merge branch 'karma-touchups' into 'master' 
Karma touchups

See merge request KartKrew/Kart!59
 2018-10-25 14:06:22 -04:00
Latapostrophe b9c6210822 Reimplemented the splitscreen chat fix 2018-10-25 20:02:43 +02:00
Latapostrophe 20cfd80767 Fixed the menu highlight thing 2018-10-25 19:41:14 +02:00
Latapostrophe e5d4020f3e Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill 2018-10-25 13:21:44 +02:00
toaster 19a6bd948c Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
#	src/p_enemy.c
#	src/p_mobj.c
 2018-10-25 10:46:18 +01:00
Latapostrophe 26093de2e9 Merge branch 'master' into chat-changes 2018-10-25 11:14:49 +02:00
TehRealSalt aa00ca72e2 Fix merges 
(Don't bother me hastily to merge something in again, please)
 2018-10-24 21:51:43 -04:00
TehRealSalt f2f03d03a7 Merge branch 'master' into fz-time-over 2018-10-24 21:39:02 -04:00
Sal eef1ba3660 Merge branch 'lat-hardcode' into 'master' 
Midnight Channel + Mementos hardcode

See merge request KartKrew/Kart!61
 2018-10-24 21:26:02 -04:00
TehRealSalt 974f6d47e1 Fullbright explosion and fire 2018-10-24 21:25:22 -04:00
TehRealSalt 25414edb57 Merge branch 'master' into fz-time-over 2018-10-24 21:20:51 -04:00
TehRealSalt 224408210c Extra safety 
The turn action happens on (k_timeovercam > 2*TICRATE). This ensures it happens immediately, although it was probably fine as is
 2018-10-24 21:18:15 -04:00
TehRealSalt 326955dd30 Turn cam on wall hit 2018-10-24 21:05:02 -04:00
Sal 8109890913 Merge branch 'explosion-spinout-fix' into 'master' 
Explosion spinout fix

See merge request KartKrew/Kart!60
 2018-10-24 20:18:34 -04:00
TehRealSalt f3a61b43d7 Wrong variable 2018-10-24 19:38:46 -04:00
Latapostrophe 6e67aaa9cd Resolved conflict 2018-10-25 01:35:55 +02:00
Sal 3e556cde44 Merge branch 'last-netgame-tweaks' into 'master' 
Last netgame tweaks

See merge request KartKrew/Kart!57
 2018-10-24 19:33:47 -04:00
Latapostrophe 474bebaad3 I'm an idiot and keep forgetting to hit trim trailing space. 2018-10-25 00:59:43 +02:00
Latapostrophe a24507b2eb Midnight Channel: warning sign hardcode 2018-10-25 00:58:59 +02:00
TehRealSalt 7ab6cefb99 Remove these 2018-10-24 18:14:25 -04:00
Latapostrophe ac4a2f3d02 Reduced aggravating stationary Shadow range + fixed whitespace 2018-10-24 23:57:08 +02:00
Latapostrophe 77fd7704e8 Midnight Channel: HUD static effect hardcode 2018-10-24 23:55:12 +02:00
TehRealSalt ac9e00a425 Karma point changes 
- Number of points needed to come back is now 2.
- Bombs no longer give extra points.
 2018-10-24 17:29:13 -04:00
TehRealSalt 43c6e25668 Update SPB hitbox too 
Even more consistency!
 2018-10-24 17:22:58 -04:00
TehRealSalt 0e4d5fd50e Merge branch 'master' into karma-touchups 2018-10-24 17:21:34 -04:00
TehRealSalt 3dba084fd9 Give karma items their own hitbox size 
Bombs & fakes get 24, items get 36. Technically a slight nerf to bomb, but it's more consistent and it's so tiny of a change that it'll be unnoticeable I feel :V
 2018-10-24 17:16:32 -04:00
toaster 3d2efc751f Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode 
# Conflicts:
#	src/info.c
#	src/p_inter.c
 2018-10-24 22:15:08 +01:00
toaster 03a4cca0b6 SPR_VAPE on S_VVVAPING1 2018-10-24 21:48:09 +01:00
Latapostrophe 0874e6bb8e Reaper will repeat chain sound + 1 small targetting bugfix 2018-10-24 22:28:44 +02:00
Sal 08791269be Merge branch 'new-spb' into 'master' 
New SPB

See merge request KartKrew/Kart!56
 2018-10-24 16:04:29 -04:00
Sal 65d9b05966 Merge branch 'battleoffline' into 'master' 
Battle Offline

See merge request KartKrew/Kart!54
 2018-10-24 16:01:58 -04:00
Sal 2a375e0f1c Merge branch 'howdyalikethemcherries' into 'master' 
How'd'ya like them cherries

See merge request KartKrew/Kart!53
 2018-10-24 16:01:47 -04:00
Sal d93a4106b6 Merge branch 'some_scaling_stuff' into 'master' 
Two scale things I noticed.

See merge request KartKrew/Kart!51
 2018-10-24 16:01:39 -04:00
Latapostrophe 553013ddbf Reaper new anim + fast spawn for testing 2018-10-24 21:07:25 +02:00
TehRealSalt b4fd249742 Partially revert Jawz x2 changes 
Several races in a row with several people getting x2 Jawz in the same spot... sorry Oni, it's BAD. Kept the increase in the further behind spot, we'll see if it's any better
 2018-10-23 21:13:14 -04:00
TehRealSalt 5ff1817c34 Divide sound volume by number of local players 2018-10-23 20:53:05 -04:00
TehRealSalt 9d7163675d Remove the local dontdraw 
Not only did I not implement this for everything, but I also REALLY like seeing other player's. If it's a problem, then let's just turn down the fuse and/or tics
 2018-10-23 19:45:35 -04:00
TehRealSalt 39bfad150f Fix camera movement when turning 2018-10-23 19:43:20 -04:00
TehRealSalt 0fcb45a9af reset these too 2018-10-23 19:08:13 -04:00
TehRealSalt 78ef057f81 Reset cam pan if dead/reset/still 2018-10-23 19:06:26 -04:00
TehRealSalt 017d606828 fzboom.wad hardcode 2018-10-23 17:48:09 -04:00
toaster 2b968a5087 With the permission of Sev, SOC_SEV, SOC_SG, SOC_PEAC and SOC_DHST are now done. 2018-10-23 22:16:40 +01:00
toaster 75669a4b9b SOC_COAT and SOC_SMOK. 
To make the MT_PETSMOKER make vaping clouds for Volcanic Valley instead, apply MTF_OBJECTSPECIAL on the spawnpoint.

Since I had to compile, I ALSO discovered SOC_PALM's palmtree was already hardcoded as well!!!! Gosh dang inconsistencies...
 2018-10-23 20:44:54 +01:00
toaster 86c4542a98 Remove all of the DKRBALLOON stuff I added from SOC_PALM, as the object already existed as MT_DOOD_BALLOON. 2018-10-23 17:47:15 +01:00
Latapostrophe 5224461184 another few whitepsaces i forgot from copypasting... 2018-10-23 18:35:42 +02:00
Latapostrophe 96877c22d3 I'm an idiot and COMPLETELY forgot about dehacked, also removed whitespaces 2018-10-23 18:31:34 +02:00
Latapostrophe e8d424784c Jack In The Box + Color Drive hardcode 2018-10-23 17:59:19 +02:00
toaster 2c06d55f46 SOC_XMAS (untested). Well, mostly. At least, all elements with sprites provided - there are two bushes that, weirdly enough, do not have their graphics provided in gfx.kart but ARE soc'd, and I feel like there's no point hardcoding that stuff..? 
Also, I'm being cheeky and doing this in the middle of a lecture. :shitsfree:
 2018-10-23 14:59:09 +01:00
TehRealSalt ba6adc39a2 Spread out SPB odds 2018-10-22 22:29:30 -04:00
TehRealSalt 8cc24e61e5 New item odds to accomedate new SPB behavior 2018-10-22 21:09:37 -04:00
toaster 2426d4e348 SOC_PALM (untested) 2018-10-22 23:28:38 +01:00
TehRealSalt 7aa8b94b22 Cam follows faster in 2P 2018-10-22 17:48:21 -04:00
toaster 43bb6749fe D2 Balloon Panic, plus minor, minor touchup to Rusty Rig lamp's light positioning. (Sorry, Drt.) 2018-10-22 22:36:04 +01:00
TehRealSalt 3dc02a4eb4 Minor mistakes on my part 2018-10-22 17:24:58 -04:00
TehRealSalt cdbe5fa34f Fix Thunder Shield not killing SPBs 2018-10-22 17:08:34 -04:00
TehRealSalt 7407c9a8dc Don't destroy all of your balloons in 3 tics 2018-10-22 17:05:44 -04:00
TehRealSalt 685ccf53cc Remove restart audio system from the menu 
Learned the cause of the seemingly random crashes it causes; doesn't seem easy to fix, so it can stay a relatively-unknown console command until it does
 2018-10-22 17:03:02 -04:00
toaster ffa9289cc6 Rusty Rig plus minor touchups to what I did already (I haven't made a new exe this stuff is simple enough, and I'll test it when I do the balloon panic stuff) 2018-10-22 21:56:14 +01:00
TehRealSalt 40b9644e0c Use COM_ImmedExecute("restartaudio") instead of duplicated code 2018-10-22 16:32:06 -04:00
TehRealSalt a1da768a87 Keep specator join request on respawn 2018-10-22 16:26:24 -04:00
TehRealSalt 3ec228d34f No more cheesing Shrink by dying 
(If that was kept, we'd see it exploited all the time on release :V)
 2018-10-22 16:22:41 -04:00
TehRealSalt ebb0733a3c Fix camera not noclipping FOFs 2018-10-22 16:16:57 -04:00
TehRealSalt 89887ccf0d Modify distx/disty to ensure it never goes too low 2018-10-22 16:08:46 -04:00
TehRealSalt 9cd47643df Falling rocks only collide with players and other rocks 2018-10-22 15:08:04 -04:00
TehRealSalt 9e4937d07f Don't f12 time over'd players 2018-10-22 15:06:07 -04:00
toaster dceab0ce70 Hardcoding start! toast's stuff specifically. 
* Marble Zone!
	* Torch decoration.
	* Incense burner decoration.
* CD Special Stage 1!
	* The UFO, now with improved death animation!
	* Turns out I duplicated sounds that already existed in sounds.kart. When we touch up the files later, yalls can remove both `DSFUFOx`'s from it.
 2018-10-22 00:34:47 +01:00
toaster 3a87596fbe Initial commit, revert this before merging the branch: Make it so it uses a seperate copy of gfx.kart with the Lua lumps hardcoded taken out, for easier work without conflict. 2018-10-22 00:29:17 +01:00
Monster Iestyn e95b54e64f missed this ESLOPE-needed area from a few commits ago apparently :V 2018-10-21 20:35:14 +01:00
Monster Iestyn 772004d3fd Fix editing slope xydirection with Lua 2018-10-21 18:25:13 +01:00
Monster Iestyn 3ec8743c1b Fix up the ability to edit slope zdelta and zangle with Lua (zangle is untested as of writing) 2018-10-21 17:32:53 +01:00
Monster Iestyn e15ed742c1 add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved 2018-10-21 16:27:54 +01:00
Monster Iestyn bd0c187e68 Merge branch 'next' into lua-slopes 2018-10-21 16:03:48 +01:00
Monster Iestyn 10f9403619 Merge branch 'master' into next 2018-10-21 15:39:30 +01:00
Monster Iestyn 87afae9cf5 Fix unarchiving of mapheader_t userdata Lua variables 2018-10-21 15:15:54 +01:00
Monster Iestyn efff869e6e Add mobj.standingslope to Lua 2018-10-21 15:12:51 +01:00
Monster Iestyn 2ec4f2024f Added support for pslope_t userdata variables in Lua archive/unarchive code 2018-10-21 15:00:07 +01:00
Latapostrophe e695eba570 Console color default changed to Black + resolved mergeconflict hopefully 2018-10-21 14:58:50 +02:00
Latapostrophe db60bdd49d Merge branch 'chat-changes' of git.magicalgirl.moe:KartKrew/Kart into chat-changes 2018-10-21 14:53:22 +02:00