stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 21:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
4334 commits 60 branches 11 tags 94 MiB
Commit graph

486 commits

Author SHA1 Message Date
Sal
a2ab230bfa Merge branch '102-gameplay' into 'master' 
v1.0.2 gameplay

See merge request KartKrew/Kart!107
 2018-11-27 12:25:37 -05:00
Sryder
ab5dc3226b Revert change to P_SlopeLaunch 
Don't call slopelaunch just from object z difference if the slope has no physics.
 2018-11-26 23:10:24 +00:00
TehRealSalt
b5bf8e09c3 Karma fireworks 
Additionally:
- FZ boom no longer has that weird smoke bit before it spawns the smoke column
- Item blinking color is brighter
 2018-11-26 02:17:14 -05:00
TehRealSalt
0f1206af6f Shrink no longer causes old-style wipeout, getting squished reduces the timer on it. 
Maybe this might help some of the desyncing, too! Mainly done for gameplay reasons, though :p
 2018-11-25 20:14:01 -05:00
TehRealSalt
d467399480 Keep track of the place SPB is following 
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
 2018-11-24 20:41:17 -05:00
TehRealSalt
f47c78832a colorize arrow roulette 2018-11-24 18:00:27 -05:00
TehRealSalt
3f35ffd7c6 Franticized items for 2nd place VS SPB'd 1st 2018-11-22 23:38:54 -05:00
TehRealSalt
a30563da22 Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately 2018-11-21 19:30:00 -05: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
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
TehRealSalt
514cd0794b This effect assumed that it was spawned at base scale anyway... 2018-11-14 14:48:16 -05:00
TehRealSalt
6afcde4aa5 More lenient balloon color setting 2018-11-14 04:45:40 -05:00
TehRealSalt
d0f21ca415 Merge branch 'sfx-clean' 2018-11-12 04:26:02 -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
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
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
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
TehRealSalt
0f01e9513a Use Silver for brake drift effect 2018-11-10 00:02:21 -05:00
Monster Iestyn
4b8232d777 Merge branch 'master' into next 2018-11-09 23:18:14 +00:00
TehRealSalt
ad625296c2 Buff the fuck out of item drop speed 
no, dude, don't turn right back around and pick your shit right back up, stop
 2018-11-09 15:37:33 -05:00
TehRealSalt
2f5e8ceee2 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-09 15:34:59 -05:00
toaster
b0246d6cba Prevent using kartdebug cvars in Time Attack. 
(None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
 2018-11-09 20:16:12 +00:00
Monster Iestyn
b3befae143 Merge branch 'public-op-nightsbumper-fix' into 'next' 
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS

See merge request STJr/SRB2!299
 2018-11-09 12:11:11 -05:00
TehRealSalt
6c5acd6e0d A few mobj_scale fixes I missed on signposts 2018-11-08 20:39:18 -05:00
TehRealSalt
499faec555 Merge remote-tracking branch 'srb2public/next' 
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
 2018-11-07 16:15:14 -05:00
MPC
1cc8619c9e Minor remote viewpoint bugfixes. 2018-11-05 20:40:51 -02:00
toaster
8d4ce113e4 Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1. 2018-11-05 12:49:28 +00:00
TehRealSalt
d3944fe29b Battle arrow fixes and cleanup 2018-11-03 17:45:38 -04:00
TehRealSalt
5c1cc6e1df Merge branch 'master' into all_hardcode 2018-11-02 01:42:34 -04:00
TehRealSalt
e758e0f8fd Merge branch 'master' into resync 2018-11-01 20:39:50 -04:00
TehRealSalt
0c2a5cf9d3 Merge branch 'master' into more-fixes 2018-11-01 18:10:53 -04:00
TehRealSalt
7e103be393 Change default brake color from Yellow to White 2018-11-01 17:37:59 -04:00
TehRealSalt
6a31959381 Merge branch 'master' into brake-drift 2018-11-01 17:37:10 -04:00
TehRealSalt
7891a11fba Battle points are visible 2018-11-01 00:57:38 -04:00
TehRealSalt
ea4ca2eb1f Brake drfit effect 2018-10-31 21:35:17 -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
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
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
f1f8f91aea Higher default scale, WANTED indicator scales properly 2018-10-27 20:56:11 -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
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
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