TehRealSalt
e50f08a357
This effect assumed that it was spawned at base scale anyway...
2018-11-14 14:48:16 -05:00
TehRealSalt
0bf46935da
More lenient balloon color setting
2018-11-14 04:45:40 -05:00
TehRealSalt
e9a432f7d0
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
TehRealSalt
339a2a6ee6
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
9350721d12
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
692b1f0401
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
4834f098f5
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
8ed0428e9e
Use Silver for brake drift effect
2018-11-10 00:02:21 -05:00
Monster Iestyn
5532882303
Merge branch 'master' into next
2018-11-09 23:18:14 +00:00
TehRealSalt
0d95cd9fb2
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
22fc21228d
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-09 15:34:59 -05:00
toaster
4172503675
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
ebb27b1c3c
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
f780e1535e
A few mobj_scale fixes I missed on signposts
2018-11-08 20:39:18 -05:00
TehRealSalt
c7b0df8172
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
eef8119123
Minor remote viewpoint bugfixes.
2018-11-05 20:40:51 -02:00
toaster
94ea5b6c89
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
bf4846c42b
Battle arrow fixes and cleanup
2018-11-03 17:45:38 -04:00
TehRealSalt
ab02ea1e1a
Merge branch 'master' into all_hardcode
2018-11-02 01:42:34 -04:00
TehRealSalt
5360bff294
Merge branch 'master' into resync
2018-11-01 20:39:50 -04:00
TehRealSalt
053579371a
Merge branch 'master' into more-fixes
2018-11-01 18:10:53 -04:00
TehRealSalt
3c050b44f3
Change default brake color from Yellow to White
2018-11-01 17:37:59 -04:00
TehRealSalt
9223b06ff4
Merge branch 'master' into brake-drift
2018-11-01 17:37:10 -04:00
TehRealSalt
e59102365f
Battle points are visible
2018-11-01 00:57:38 -04:00
TehRealSalt
dd28bda75f
Brake drfit effect
2018-10-31 21:35:17 -04:00
TehRealSalt
ef44df0081
Fix incorrect scale of player arrows in non-splitscreen
...
whoops
2018-10-31 04:55:00 -04:00
TehRealSalt
65f6747887
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
b08fb14d62
Time over cam & signposts support mobjscale
2018-10-31 03:13:56 -04:00
toaster
8d575c9b56
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-29 21:37:06 +00:00
toaster
381264580d
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
37f949bb38
Make shadows more consistent on slopes for non-players
2018-10-29 05:21:47 -04:00
TehRealSalt
193941945e
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
f9d8ebd4e6
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
89cd20bd70
Higher default scale, WANTED indicator scales properly
2018-10-27 20:56:11 -04:00
toaster
0adfc93327
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode
2018-10-25 19:09:22 +01:00
Sal
f5a9ae016a
Merge branch 'karma-touchups' into 'master'
...
Karma touchups
See merge request KartKrew/Kart!59
2018-10-25 14:06:22 -04:00
toaster
a7940d068b
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
268fa6337e
Fullbright explosion and fire
2018-10-24 21:25:22 -04:00
TehRealSalt
b6f10baa00
Merge branch 'master' into fz-time-over
2018-10-24 21:20:51 -04:00
TehRealSalt
db6e1f9b94
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
67de207278
Turn cam on wall hit
2018-10-24 21:05:02 -04:00
TehRealSalt
f3d838b2b5
Merge branch 'master' into karma-touchups
2018-10-24 17:21:34 -04:00
TehRealSalt
bb70f08e0c
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
d9ad9fba8b
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
Sal
ec80cfc3d2
Merge branch 'new-spb' into 'master'
...
New SPB
See merge request KartKrew/Kart!56
2018-10-24 16:04:29 -04:00
Sal
87d51cc491
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
5a6524fc93
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
TehRealSalt
3c4b3342c5
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
e11fe766ef
fzboom.wad hardcode
2018-10-23 17:48:09 -04:00
toaster
83fcfc45c1
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