4b9d5f251e
Fix incorrect alignment of selected-level Ruby in vote drawer.
2018-10-02 16:51:17 +01:00
348f4dc2cd
Merge branch 'master' into next
2018-10-02 09:14:59 -04:00
58b52adf7e
Address toast review
...
- Re-add highlighting to the header text, and shift it back up slightly
- Move the viewpoint loop break out of a while and into the main loop
2018-10-01 19:23:38 -04:00
445013b0f9
Wrong bracket level for flashing-set.
2018-10-01 22:44:17 +01:00
147b7a5786
Modified SPB to not route through P_DamageMobj (so wehave more control over the shield dropping/item obliteration, given Sryder picking up his own Thundershield...)
2018-10-01 21:48:52 +01:00
d42736fe3d
Include srb2.org in the credits per Rob's wishes.
2018-10-01 21:23:00 +01:00
033667a0ee
Merge branch 'keysmash' into 'master'
...
(Mic)key('s Dick) Smasher
See merge request KartKrew/Kart!18
2018-10-01 14:58:31 -04:00
49acbe9bee
Fix /me and sayteam, except sayteam now actually doesn't do anything anymore.
2018-10-01 20:23:56 +02:00
c9da6cd856
Minor HUD offset tweak for splitscreen eggnum.
2018-10-01 18:10:12 +01:00
d0e629a8e2
Correct some inconsistencies I missed in the previous commit.
2018-10-01 13:51:23 +01:00
e6fd41339a
DrawFill supports splitscreen offset flags
2018-10-01 08:41:44 -04:00
379772e5aa
Allow respawning spectators before starttime is up because they no longer spawn in a condition that allows them to get an unfair advantage (drop dash or its ghetto 2.0-esque predecessor)
...
Also, some camera tweaks:
* Force chasecam when exiting, just like it's forced when you're dead and not a spectator.
* Force a horizontal camera angle aiming when spectator and dead, to avoid skybox bugs.
2018-10-01 13:25:13 +01:00
14a5ffbfd8
Based on netgame comments last night, update the tab rankings info to show less information in race.
2018-10-01 12:52:54 +01:00
f1267f8ae1
Don't allow a new driftboost of lesser magnitude to completely cancel an existing driftboost.
2018-10-01 12:27:35 +01:00
96506359f1
Goodbye cvar
2018-10-01 07:21:02 -04:00
0ec952d019
Add a `SECTIONRACE` map flag. So far, all it does is prevent the number of laps from exceeding the map default, but it's a base to work off of if we want to add any other changes specifically for section races in future.
2018-10-01 12:12:48 +01:00
487a2ecf2e
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc
2018-10-01 11:46:13 +01:00
73100b22d5
Please don't punish offline practice
2018-09-30 21:46:12 -04:00
800b3bb240
Move player + player mobj existence checks to top of P_MoveChaseCamera. This is the only place it makes sense to even check them tbh.
...
While I'm at it, let's also use the "mo" variable instead of player->mo throughout the function (to be consistent)
2018-09-30 22:18:48 +01:00
005e3ce514
Merge branch 'hack_the_de_damnit' into 'master'
...
Fix dehacked list incongruence
See merge request KartKrew/Kart!20
2018-09-29 16:52:41 -04:00
ab59504be0
Experimental: Making the ghetto waypoints we have right now their own mobj list in order to make them slightly less bullshit
2018-09-29 20:28:27 +01:00
1be13e8e2d
Fix dehacked list incongruence.
2018-09-29 16:43:00 +01:00
2c1db167da
Correct that thing Lat` found where sometimes the controls menus'd get "stuck" replacing the second key every time, effectively only allowing one key until you clear it and try again.
...
Also, sounds.
2018-09-29 16:18:16 +01:00
21ba9921da
Some credits tweaks (alphabetical ordering plus new names, plus slight downwards adjustment of `TYLER52`)
2018-09-28 20:10:22 +01:00
8ccaa1fcee
Flip dynamic slope toggle.
2018-09-28 12:58:07 +01:00
68bf1f60f3
"TICRATE*1"?!
2018-09-27 18:44:14 -04:00
7c5d47deb5
No mashing in Record Attack
2018-09-27 18:42:42 -04:00
7de6a63207
Talk key is a two-way toggle for non-keyboard binds
2018-09-27 18:32:48 -04:00
6d798f00e7
Yet another scale fix
2018-09-27 18:26:37 -04:00
5419ac82ee
1 more fix
2018-09-27 17:21:06 -04:00
30005ad39b
Scale fixes
2018-09-27 17:17:04 -04:00
cf5c0a7a6a
New bindable keys
...
You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads
They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 16:55:21 -04:00
169411e3da
Disable `cv_joinnextround` behind `#define VANILLAJOINNEXTROUND`.
2018-09-27 21:38:19 +01:00
fb102f8131
Fix dash-dust spawning not happening when drop-dashing, despite its function being called.
2018-09-27 18:39:54 +01:00
7f5b5ecb60
Spring *panels* now use `sfx_kc2f` again (but pogo spring *items* still do `sfx_kpogos`, in case you were worried).
2018-09-27 18:32:07 +01:00
e4f6015b50
Revamp flat alignment to be consistent across all renderer functions except for the software slope renderer, which me and fickle tried our best at but couldn't get to work. (This is a backport of 2.2 code that slightly postdates the improved flat alignment Kart's had for a while.)
...
This fixes #11 .
2018-09-27 18:11:43 +01:00
3d582bc98f
Viewpoint key improvements
...
- Don't cycle through exiting players
- Don't cycle through karma players in Battle
- Disable console print on switch, it's already got a HUD element
2018-09-26 21:35:57 -04:00
1a37335675
ESC rebind works on both bound keys
2018-09-26 20:51:25 -04:00
a223375cc0
Remove the commented out SALLYALTRAINBOW define
...
The relative luminance tweak fixes what it was meant to fix, but without changing the core functionality
2018-09-26 20:40:26 -04:00
8aff76b8c3
Just realised the inputwheel jittering in Sryder's videos was my fault, so fix this even better
2018-09-25 22:37:04 +01:00
a85682983b
Manual has more pages and less terrible large-size support.
2018-09-25 22:33:22 +01:00
eb4a967d8e
Merge branch 'minimap_in_demos' into 'master'
...
Show minimap in demo playback
See merge request KartKrew/Kart!16
2018-09-23 18:14:09 -04:00
c9e994ae07
smoll to tiny
2018-09-23 23:07:38 +01:00
c0a16be662
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
...
# Conflicts:
# src/info.c
# src/info.h
# src/sounds.c
# src/sounds.h
2018-09-23 23:07:16 +01:00
9c10a85596
Merge branch 'itemdrop' into 'master'
...
Itemdrop
See merge request KartKrew/Kart!11
2018-09-23 17:51:28 -04:00
de91eb9793
You're right, this works fine
2018-09-23 22:34:59 +01:00
a1ad4d79d0
Turns out `Playing()` evaluates to false when playing back demos. Who knew?
2018-09-23 19:58:15 +01:00
8bc1a217fe
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-09-23 12:58:06 -04:00
d2d6e67f48
Forgot I did this optimisation! Updated for the new colours.
2018-09-23 16:39:07 +01:00
73116f2b60
The pipeline halted for some reason, so here's the smallest possible legitimate change to bump it back into action: Replacing commenting-out with `#ifdef`ing.
2018-09-23 16:13:58 +01:00
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
toaster