fa65cbb43e
Somehow butchered the code cleanliness (indentation/not taking advantage of a macro I defined specifically for this) here a little by accident - tidied up.
2018-09-23 13:34:49 +01:00
c5e16f183e
Fix Sryder's crash (incorrect setting of dir_on when searching in subfolders).
...
Also, correct a minor copypaste failure in one of the I_Errors' messages.
2018-09-23 13:23:03 +01:00
2e158f2c21
Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic...
2018-09-23 13:22:00 +01:00
659810cd81
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
...
# Conflicts:
# src/dehacked.c
# src/info.c
# src/info.h
2018-09-23 11:47:29 +01:00
9f42e74fe2
Attempt to not let the camera into thok barriers
...
Doesn't really work right now; it'll still go into thok barriers and get caught up at its floor height
2018-09-22 22:46:06 -04:00
3949d0fcdb
Obvious first commit: enable the NOCLIPCAM define again
2018-09-22 22:22:44 -04:00
8ff0e976c2
Merge branch 'new-voices' into 'master'
...
New voices
See merge request KartKrew/Kart!15
2018-09-22 20:22:59 -04:00
c63518e0b2
Doing this looks more appealing to me
2018-09-22 20:15:12 -04:00
8a06e78ab6
Quick fix for other player's win/lose not playing
2018-09-22 20:14:32 -04:00
bb1aaf9d54
New sparkles
2018-09-22 19:55:26 -04:00
ad8d674e5e
Set nogravity on landing
...
Means you can't have a finishline that moves up and down, but eh, thinking this might help the fallback measure disappearing
2018-09-22 19:03:38 -04:00
a3b40c7577
Better particle spread
2018-09-22 19:00:30 -04:00
487e114fee
raceexittime var
2018-09-22 18:59:26 -04:00
d7f8d4507a
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
...
# Conflicts:
# src/sounds.c
# src/sounds.h
2018-09-22 23:11:14 +01:00
6cc7f97d8a
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into addons_menu
...
# Conflicts:
# src/m_menu.c
2018-09-22 23:00:46 +01:00
7256e99b12
Merge branch 'master' into this-is-a-sign
2018-09-22 17:58:35 -04:00
5f78807ef0
Merge branch 'encore' into 'master'
...
Encore
See merge request KartKrew/Kart!7
2018-09-22 17:52:33 -04:00
81249a084a
Merge branch 'shitsfree' into 'master'
...
:shitsfree:
See merge request KartKrew/Kart!12
2018-09-22 17:24:11 -04:00
be36d8ed84
Merge branch 'icon_update' into 'master'
...
Icon Update
See merge request KartKrew/Kart!9
2018-09-22 17:19:02 -04:00
f20710fbb4
Turns out I actually forgot to push this when I did the GL fade colour thing earlier, woops.
2018-09-22 21:05:20 +01:00
81c04480f9
List update as requested by Sal
2018-09-22 20:56:44 +01:00
3a76605772
* Seven new text colours! Gold, Lavender, Tea-green, Steel, Pink, Teal, and Peach, all added to the menu highlights cvar.
...
* Revamp the saycmd colour list to take advantage of them. Peach and Purple are used the least...
* In all of the string drawers, replace colormap only when charflags changes.
* Add V_SKYMAP to dehacked.c alongside the above (oversight from when I added it yonks ago...)
2018-09-22 18:22:04 +01:00
1f2ee32a83
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chat-changes
2018-09-22 15:14:21 +01:00
e63d4740ec
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
...
# Conflicts:
# src/info.c
2018-09-22 14:57:33 +01:00
4fd4deff8a
One last thing - make the OpenGL level loading bar screen have the correct background colour.
2018-09-22 12:43:54 +01:00
84c2a8c28f
Sign compare fix via boolean cast
2018-09-22 11:59:07 +01:00
e9d4fae5b9
Merge branch 'master' into new-voices
2018-09-21 21:13:46 -04:00
0e39bf2821
Slightly darker green backgrounds
2018-09-21 19:51:31 -04:00
f8c9ef9431
Did everything toaster suggested
2018-09-22 01:47:13 +02:00
dd6b63f9da
Different timings
2018-09-21 19:44:14 -04:00
23090e82b5
Changed thundershield sound
2018-09-22 01:15:04 +02:00
3fa7f4e7b4
Address review
...
- Reduced states
- Metal Sonic on sign roulette
- Landing sound
- New falling sound
2018-09-21 18:40:18 -04:00
20222c47e7
Okay, seems like reducing it to 1x is enough - making it singular is overkill and means that often if the furthest one away from you is the one to yell, you'll barely hear it. At least this way you'll only hear overkill chao if you're super close to the stands and the mapper's placed way too many
2018-09-21 22:06:27 +01:00
cb3c93e56e
Minor adjustments to the endsign color back table
2018-09-21 16:54:29 -04:00
80bc266f3f
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
...
# Conflicts:
# src/info.c
# src/k_kart.c
2018-09-21 21:05:47 +01:00
084b99a5c9
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore
...
# Conflicts:
# src/info.c
# src/m_menu.c
# src/y_inter.c
2018-09-21 20:54:38 +01:00
4fa1860543
Merge branch 'master' into this-is-a-sign
2018-09-21 15:40:12 -04:00
06a4a5e4dc
Prevent signs from disappearing
2018-09-21 15:37:30 -04:00
f88708bb75
Fix the weird indentation
2018-09-21 12:05:52 -04:00
68ec811909
Rearrange the code.
...
Thanks again MonsterIestyn!
2018-09-21 11:26:08 -04:00
58a0206783
Moved strlen(w_chat) out of the loop.
2018-09-21 17:03:09 +02:00
af58ba9ae3
Remove this that somehow slipped in.
2018-09-21 07:21:49 -04:00
be74b4e58b
Fix up errors with buildbots
2018-09-21 07:16:54 -04:00
25ae5a5e7f
Partially address Sal's review last night by switching to a more sensible default. I'm still unconvinced on the need to make encore mode a seperate knob on the grounds of overcomplexity and "you can't turn map hell off", but hopefully this'll be a shippable state we can come back to later.
...
Also, thank you for reminding me, Sryder - disable my very, very limited progress on encore mode in openGL so that stages aren't an unintended hodgepodge of different colourschemes for the objects versus the level environment.
2018-09-21 12:12:17 +01:00
4320e0f3a8
Fix visual error related to moving the cursor on multi-line messages.
2018-09-21 12:23:00 +02:00
3b928ca979
Condense this re: wolfs
2018-09-20 22:16:04 -04:00
378495cb2b
Add some stuff
2018-09-20 18:33:50 -04:00
a53f036149
Use MemAvailable instead
2018-09-20 18:30:46 -04:00
1a2f84a5ba
Smaller XPM with no redundant pixels
2018-09-20 22:36:01 +01:00
e2a7146667
Reeling back on this again
...
Kinda want to save it for another branch
2018-09-20 17:11:59 -04:00
e441b2bce4
Address review
...
(for anything code I did, anyway)
2018-09-20 17:11:11 -04:00
e90139c5b3
:shitsfree:
2018-09-20 17:45:19 +01:00
73c66e3bc4
Spark radius now follows players
2018-09-20 18:31:38 +02:00
f425ba4423
Spindash boost dust, pogo spring sfx
2018-09-19 20:13:48 -04:00
f207140791
Merge remote-tracking branch 'origin/misc_plus_menustuffs' into sal-misc
2018-09-19 18:45:47 -04:00
b2099678d1
Enable noclip cam again.
...
It's just... TOO good, despite the couple of issues with it
2018-09-18 23:56:26 -04:00
8013a064ab
Spark fix
...
(please don't spread these fixes out across different branches :boi:)
2018-09-18 15:51:27 -04:00
cb629303d6
Update a bunch of icons - `SDL_icon.xpm` and other targets' `.ico`s.
2018-09-18 19:37:03 +01:00
a1045d232b
:boi:
...
(fix driftsparks, and subsequently sliptides because i copypasted most of the code for them, disappearing underwater)
2018-09-18 17:40:39 +01:00
864f2466fe
Booster+wipeout fix
2018-09-17 20:24:03 -04:00
20c4702986
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 14:13:31 -04:00
c00e054979
correct oversight in merge
2018-09-17 11:36:22 +01:00
123778766a
Animated sky backport
2018-09-17 11:21:25 +01:00
8618d7bbec
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs
...
# Conflicts:
# src/k_kart.c
2018-09-17 11:19:17 +01:00
69cbbde7fc
Updated Dream
2018-09-17 02:48:10 -04:00
f2838f7ab3
More color tweaks
...
- Renamed Grey to Nickel, and Cloudy to Grey
- Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey
- Drastically changed Navy to be more distinct from Jet
- Replaced Indigo with Pomegranate
- Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow)
- Updated color opposite table to match
2018-09-17 02:09:22 -04:00
c9994c6ad8
Changed MD2 coloring again
...
Squares the colors to get nicer looking results (https://www.youtube.com/watch?v=LKnqECcg6Gw ), as well as only blending a small chunk of the skincolor to prevent desaturation from the brightest/darkest values.
2018-09-16 23:39:18 -04:00
ac2f81e423
New color brightness formula
...
Gets more accurate looking results
2018-09-16 23:28:10 -04:00
78a4cdab9f
Alternate TC_RAINBOW
...
Leaving behind a commented out define for now because I dunno if I like it yet
2018-09-16 18:10:29 -04:00
1b7b1f3f79
Fix order of operations messups by adding brackets
2018-09-16 20:25:07 +01:00
09287df890
Radius is now a define
2018-09-16 11:16:30 +02:00
0bb24a392e
Fixed crash when replacing first character.
2018-09-16 11:01:00 +02:00
ce5abdc6e3
Thunder Shield effect hardcode.
2018-09-16 10:31:24 +02:00
7edb99b87a
Revert this now that we have ESC functionality
...
(I mean. I still think this feels nicer than pressing the menu button, but...)
2018-09-15 20:13:29 -04:00
649d547209
Buff rainbow sparks
2018-09-15 19:59:39 -04:00
5ec79afad6
Grow/Shrink fixed min speed
2018-09-15 01:29:38 -04:00
cf7198f765
Updated speed lines
2018-09-15 01:24:29 -04:00
546fa383c1
Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items
2018-09-14 21:01:07 +01:00
6532c9ccf7
Add to DeHackEd!
2018-09-14 00:29:39 -04:00
6c6ca1a110
Bug fix
2018-09-13 23:49:24 -04:00
a76e341711
Rainbow sparks
2018-09-13 23:39:41 -04:00
981cf69afe
Ketchup, faster drift sparks
2018-09-13 23:29:14 -04:00
7d4d181715
Speed lines
2018-09-13 20:26:43 -04:00
fadef55b1e
angel island drift strat plus ketchup
2018-09-14 00:19:23 +01:00
ce85c2b7bd
Delay falling, longer exit timer
2018-09-13 19:13:43 -04:00
250c61dd00
This is a sign
...
Signpost with the face of the person in 1st falls down at a pre-determined location on race finish (or at the finishing player if none is found)
2018-09-13 17:42:34 -04:00
32d64a8282
Make these sparks fullbright (thanks, Ancient Tomb!)
2018-09-13 20:51:30 +01:00
ccc615e9b1
Fix a potential crash vector in the shadows code. (It DEFINITELY crashed when I was testing the thunder shield, for example.)
2018-09-13 20:41:37 +01:00
6fbc014ea3
Merge branch 'thwomp-fixes' into 'next'
...
Thwomp fixes: Don't trigger on spectator; don't trigger on ~FF_EXISTS
See merge request STJr/SRB2!277
2018-09-13 14:47:40 -04:00
57d333b6b5
Thunder shield stuff!
...
* Slightly bigger visual size!
* Light-shadow!
* Makes player fullbright if you have it!
* Visuals finally removed instantly on shield drop!
* Uses dark background for item icons!
* Goes behind the player on some frames, faking layering!
2018-09-13 19:01:36 +01:00
89a6694d67
Don't trigger thwomp on spectators
2018-09-13 11:32:40 -04:00
c32c72c401
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-13 11:32:38 -04:00
fd721d3761
Bugfix sad chao jumping in their sad state
2018-09-13 14:40:50 +01:00
395a83a56c
Dark SPB background
2018-09-13 14:36:48 +01:00
591ef1e394
Make the chao quieter (if it's still too loud, I can tone it down further, but not by much)
2018-09-13 14:35:20 +01:00
de611874ce
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-13 14:23:36 +01:00
ec2b4e0dfc
Tweak these blues
...
Try to make all the blues using this range look a little different, you know?
- Cyan is brighter, and has more contrast.
- Teal has 1 more shade of blue for slightly better anti-aliasing.
2018-09-13 03:04:01 -04:00
eca535d369
Instead of doing productive things, I changed around skincolors again
...
- Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey.
- Improved Pink & Ruby.
- Added Ketchup, replaced Canary with Mustard.
- Removed Army.
2018-09-13 02:07:00 -04:00
b1db70b38a
* Chao audience!
...
* Replaces the CZ64-era hopping Mario guys.
* ~50% randomised colours!
* 1/9 are FANS!
* On mapload, some Chao select a random player in the server (even spectators) as their idol.
* The fans cheer for their idol when they cross the finish line in a winning position!
* They also sob when their idol loses.
* The remaining percentage are the canon Aqua.
* Minor on-field spikeball/fake radius alterations requested by Oni.
2018-09-12 19:03:45 +01:00
6f6fcc9615
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
...
# Conflicts:
# src/info.c
# src/sounds.c
# src/sounds.h
2018-09-12 15:04:53 +01:00
a794386d8e
New drift sparks
2018-09-11 19:52:00 -04:00
3218ab17e0
Merge branch 'master' into next
2018-09-11 16:34:16 +01:00
fd7bc1c1ac
Do a bunch of major modifications to the voting system's rule change system!
...
* Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency.
* "Never" - does what it says on the tin.
* "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full
* "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps
* "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change
* There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense.
* Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps.
* Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 15:42:53 +01:00
2defaa4b74
.PNG error shows lump name
2018-09-10 15:15:14 -04:00
4ada0b0a9e
Update m_anigif.c
...
Remember gif_frames starts at 0
2018-09-10 17:12:10 +01:00
d26ba2ee54
Update m_anigif.c
...
More accurate GIF delay.
2018-09-10 17:12:04 +01:00
40ff436829
Remove commented out stuff, now I've confirmed everything works fine without them
2018-09-10 15:49:21 +01:00
67d57d82bc
I was getting annoyed by these arrows and their inconsistency, so I made them use the graphics.
2018-09-10 12:41:53 +01:00
5b27e597d7
More manual pages, plus renaming the option to `Tricks & Secrets (F1)` - PLUS, the magic of a little animated how-to for leafing through the pages. Requires new patch.kart, as I wanted the leading zeroes and Jeck wanted to add more pages without more commits later...
2018-09-10 12:39:59 +01:00
0e6bcee463
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs
2018-09-10 11:43:45 +01:00
d603d48a61
Don't allow joining 20 sec into the match
2018-09-10 04:29:37 -04:00
2c8bf584e4
Quick fix
...
No other keys bound to this, it should be 0
2018-09-10 03:35:10 -04:00
4be1e8b6c2
System menu default
2018-09-10 03:27:05 -04:00
f4c45877b2
Merge branch 'sonicitems' into sal-misc
2018-09-10 03:22:11 -04:00
538abbba99
Make Battle arrows consistent w/ the flashing item change earlier
...
Should make Hyudoro even more amazing in Battle, since you can tell which held items are off-limits~
2018-09-10 03:17:15 -04:00
ee94da90b2
Don't let players carry them between levels..........
...
(In return for not letting anyone experience this silly bug, I made spectators joining before the match starts in Battle spawn with bumpers)
2018-09-10 03:15:46 -04:00
6f867274ed
Item stuff
...
- Keep items on death, as long as you haven't used them yet.
- Restart the item roulette on spawn if you die during it.
- Held items that take up your item box now flash, to be consistent with Rocket Sneaker and Grow.
2018-09-10 02:48:10 -04:00
a8eb4af694
Camera fixes
...
- Fixed camera panning for higher distances.
- Because of this, re-enabled scaling the pan amount based on distance.
2018-09-10 02:24:21 -04:00
7a91398066
Drop Dash + alternate start boosts
...
New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker.
Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 01:47:23 -04:00
e5b947de0a
Change ESC menu override string to "Open/Close Menu (ESC)", adjust menu accordingly
2018-09-09 21:24:19 -05:00
aca9d505cc
New gamepad defaults
...
Based on input recieved from Jeck
2018-09-09 20:57:54 -04:00
9a82176f6f
Merge commit '72d80a9aa890d93dfd86e95af75c0752e1ff7e56' into sonicitems
2018-09-09 17:57:23 -05:00
1e8ae8aa0c
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-09 23:25:19 +01:00
76033a51d7
// we're fucking sick of this
...
Why hasn't SRB2 already done this themselves YEARS ago...
2018-09-09 18:24:09 -04:00
03e1ed179e
Comment ou remaining traces of cv_karthud
...
We've poured so much effort into our own HUD that it doesn't make much sense to have the option to replace it with another game's at this point
2018-09-09 18:10:11 -04:00
c1b9700e28
Revert pan speed
...
Old one was more exciting, and gave that feeling of "you're scraping against the walls" when you try to corner really hard
2018-09-09 18:04:35 -04:00
c0bf79ad8e
R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
...
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
c8639ed0e0
Disable the options you MEANT to disable.
2018-09-09 15:44:37 +01:00
3936a7ea7e
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs
2018-09-09 15:41:37 +01:00
1010950148
This isn't vanilla, don't be a shit about secrets and addfile (plus it helps that this fixes a crash)
2018-09-09 15:17:41 +01:00
dc0144540b
`// if this doesn't work i'm removing papersprites`
...
(check both the left and right side overflow of the sprite column being drawn)
2018-09-09 13:47:49 +01:00
86d4eb9655
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-09 00:51:54 +01:00
54bde9462d
Revert "Rebalanced odds table again"
...
This reverts commit fbe721e7d4
2018-09-08 19:50:31 -04:00
380cfa241c
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-08 23:46:07 +01:00
a9f34ce8ba
Camera adjustments
...
- reverted boostcam timing, different max dist
- zooms out based on camera momz
- drift panning is twice as slow
2018-09-08 18:45:57 -04:00
9eeefde0f4
Make bomb attacks HUD drop. (Karma may be changed later, but Oni said let's try all together first...)
2018-09-08 23:45:51 +01:00
1cdf5623db
weaker
2018-09-08 16:32:39 -04:00
e0aee8353c
Forgot a default case.
2018-09-08 17:53:41 +01:00
e1b645d103
Bugfix a Jawz crash Jeck got a few days ago.
...
Not menu-based, but I guess this branch is misc PLUS menu stuff, not just menu stuff based on sal-misc.
2018-09-08 17:50:53 +01:00
6c6bafd1d6
* User manual!
...
* Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 17:02:03 +01:00
f887ae6628
Watertight fix I was avoiding because it's definitely slower to check ranges at runtime, but papersprites are used intermittently enough that I don't think it's a super big deal.
2018-09-08 12:12:28 +01:00
745b914483
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-08 11:49:42 +01:00
0bd4a29f0e
Weight increases with speed
...
Might be a tad weak right now, but we'll see if people want it stronger
2018-09-08 04:04:10 -04:00
9096da926b
Merge branch 'sonicitems' into sal-misc
2018-09-08 03:24:59 -04:00
60ccbb1cd9
Critical inconsistency fix
2018-09-08 03:24:32 -04:00
fbe721e7d4
Rebalanced odds table again
2018-09-07 22:17:38 -04:00
6317ae5996
Okay do this correctly by doing a reacharound to grab the actual sfx id
2018-09-07 16:56:34 -04:00
f907a3c215
Speed pads always play a boost voice clip
...
For the extra SA1 feel :P
2018-09-07 16:20:20 -04:00
316c08bbbb
Merge branch 'netcode-nitpicking' into 'next'
...
Netcode nitpicking
See merge request STJr/SRB2!274
2018-09-07 15:59:49 -04:00
2cc07df3d2
Minor tweakings
...
- Win/lose quotes are only played for your player
- Win, lose, and gloat lines are played from farther away
2018-09-07 15:50:24 -04:00
baf50a1dbf
* Slightly more papersprite stability!
...
* Slightly more sane Minecraft item scaling!
2018-09-07 14:26:00 +01:00
d13e999c99
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
...
# Conflicts:
# src/info.c
2018-09-07 13:34:01 +01:00
52034646da
Placeholder boost effect
2018-09-06 23:49:51 -04:00
7760c7030e
Tweaked boost cam, again
2018-09-06 21:58:23 -04:00
8e9580cd7c
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-07 00:31:54 +01:00
be3ed17e19
Restore the one good bit
2018-09-06 19:31:28 -04:00
10be7e1a52
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-07 00:31:02 +01:00
34d27b06e0
Revert "Wrote a new function for MT_SOLID object bumping"
...
This reverts commit b4aa01ed61
2018-09-06 19:27:07 -04:00
6052573549
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-06 22:18:54 +01:00
4de68f7fe2
Dropping items!
...
* Shield Drop...
* Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.)
* Pops your Thunder Shield.
* Happens upon ANY hit, except for deathpits.
* HUD Drop...
* Also does the above, except for the Thunder Shield thing.
* If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item!
* You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type.
* Happens upon Size Down and battle elimination.
* Can also be forced on with `cv_kartdebughuddrop on`!
* Some other random stuff.
* Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity.
* Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter).
* Allow shrunken players to pick up item boxes again.
* Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.)
* Break NiGHTS a little through my machinations.
2018-09-06 22:17:29 +01:00
82cf95d9f1
Forgot this
2018-09-06 16:09:17 -04:00
e2643c5ebd
Player arrows can show x10
...
Requires new patch.kart
2018-09-06 16:06:37 -04:00
3520a3fb55
More Jawz tweaking
...
- Z pos checking is Battle-only now
- Made the Z pos limit much higher
- Increased its range in Battle
2018-09-06 16:05:57 -04:00
d299e59ce9
Sink bug fix
...
Sink would only spawn its trail ever if you threw it on a tic that was (leveltime % 4 == 0), because it called its action every 4 tics instead of every tic
2018-09-06 15:52:27 -04:00
bc15392514
Boost tweaks
...
Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 13:02:08 -04:00
b4aa01ed61
Wrote a new function for MT_SOLID object bumping
...
A lot more similar to the code used for player wall bumping, and is much less likely for you to just... pass through the object if you keep trying hard enough.
Also, falling rocks get pushed aside by invinicible players with no resistance.
2018-09-06 11:49:58 -04:00
36356f8a64
Boost cam
2018-09-05 11:19:00 -04:00
1548e59b2b
Change a few cvar defaults
2018-09-04 21:18:20 -04:00
ff26811646
Lowest speed happens slower
2018-09-04 21:14:42 -04:00
9b2d9f1915
Heavy as shit now
2018-09-04 20:51:16 -04:00
e271c2de5d
If the game would normally end in a bomb kill, then always switch their places
2018-09-04 20:16:42 -04:00
d3913a72df
Addressed some of Chrome's thoughts
...
- Don't drag
- Shield isn't visible to anyone but yourself
- Projectile is twice as heavy
2018-09-04 19:58:20 -04:00
001d46873d
Ghost sink "shield"
...
Sink shield that makes it double-press to use, gives the trailing item slowdown, and shows other people that you have it, but doesn't have any collision
2018-09-04 19:14:44 -04:00
b84e9a4133
Jawz ignores targets too high/low
2018-09-04 18:47:30 -04:00
733207d197
Splitscreen fix
...
Just changed order of operations
2018-09-04 18:27:36 -04:00
d49099693d
Alternate demo replay camera
...
Not good, but less bad than before :V
2018-09-04 18:21:55 -04:00
381883b747
Revert a few of the changes from last commit
...
Ended up not liking them
2018-09-04 17:07:53 -04:00
6e328a4e73
Misc camera fixes
...
- Fixed remaining instances where camera position would scale with the player instead of the level; the camera should almost 100% certainly not change now when you get Grown/Shrunk
- Reset camera when switching viewpoint, to make it not look *as* weird when switching after you've finished (needs tested)
2018-09-04 16:10:59 -04:00
2a20939617
Camera panning for drifts
2018-09-04 16:08:37 -04:00
9394179c12
Camera outrunning
2018-09-04 15:11:14 -04:00
fd16ece77c
Z pos smoothing
2018-09-04 02:51:00 -04:00
12bbb04fb9
This was not meant to be commited
2018-09-03 21:21:40 -04:00
c1d92a45f8
Camera now sticks close behind you, only the angle is lagged
2018-09-03 20:40:46 -04:00
38ac999d77
Merge branch 'addfile-verify-fix' into 'next'
...
Addfile command verify fix.
See merge request STJr/SRB2!272
2018-09-03 17:17:46 -04:00
ea06e8a62b
SOCK_Send: Split the actual sending data parts into a new function, SOCK_SendToAddr, to make everything look a bit neater in general
2018-09-03 20:53:40 +01:00
7b083f07cd
UDP_Socket: I doubt client addresses are meant to be included in the total for broadcast addresses
2018-09-03 15:56:02 +01:00
846bddfdcf
SOCK_Send: Fix what appears to be a mistaken use of i instead of j
2018-09-03 15:52:22 +01:00
24aafa6dac
UDP_Socket: Add missing limit checks for s, for client and broadcast addresses
2018-09-03 15:43:36 +01:00
83eb9c1b43
Redone stat graph
2018-09-03 00:06:17 -04:00
3b5f251ff0
Vote screen uses the font's intended character spacing
2018-09-02 22:53:40 -04:00
70b9f49c94
Move wall sector type to from Section1:14 to Section1:12
...
The SMK maps will probably need an update
2018-09-02 20:57:40 -04:00
e85688bfee
Remove an #ifdef here
2018-09-02 20:50:22 -04:00
6ae78da47e
Merge branch 'master' into next
2018-09-02 13:00:56 +01:00
54fec7fa5c
Merge branch 'master' into addfile-verify-fix
2018-09-01 19:33:59 -04:00
e01f2ff096
Update arrow rendering to use simple character function rather than overkill string function.
2018-08-31 22:38:56 +01:00
203b43a138
Toggle All option
2018-08-31 14:41:37 -04:00
68a94b5657
Small fix
2018-08-31 13:23:05 -04:00
e6303d1889
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 13:18:19 -04:00
322da62b3c
Fix HOM removal not working properly for non-green resolutions
2018-08-31 17:14:44 +01:00
ccc6f71980
Cleanup + coloured text for spectators / PMs
2018-08-31 15:02:48 +02:00
toaster