TehRealSalt
312dd3f57f
Ensure ALL boxes are respawned for overtime
2018-12-07 18:50:36 -05:00
Sryder
d1a10d70f5
Initial step of Waypoints
...
Basically just copied what I planned out months ago and put it into code for now
Also changed waypointcap to be made from MT_WAYPOINTs and definitely broke position in this commit from that.
2018-12-07 23:40:28 +00:00
TehRealSalt
43af067415
Add a 5-second delay before the kill-field kicks in
...
Until it's ready, the orbs are transparent and the minimap icon blinks. Also, tons more sounds. ALSO, Super Overtime mode.
2018-12-06 18:13:40 -05:00
TehRealSalt
19ca7bf134
Show the central item on the minimap, and other minor aesthetic touches
2018-12-06 16:17:17 -05:00
TehRealSalt
dfa0522326
Battle Mode overtime
...
After the time limit is up, spawn a shrinking kill-field. This is one hefty initial commit!
2018-12-06 13:46:38 -05:00
Sryder
9b00709966
Merge branch 'master' into waypoints
2018-12-04 22:29:22 +00:00
TehRealSalt
2ff31a7b72
Buff item hitbox size
...
I was gonna hold off for v2 to do this, but frankly... this is too good to have. Honestly I think this is a big buff for karma items... people unable to hit as bombs will have a LOT less trouble as item.
2018-12-03 17:30:27 -05:00
Sryder
746a004f18
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/info.c
# src/p_mobj.c
# src/p_spec.c
2018-12-01 22:09:03 +00:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
TehRealSalt
68f465f7a6
Remove in death pits
2018-11-29 07:50:58 -05:00
TehRealSalt
ef19830c31
Set indirectitemcooldown for SPB/Shrink drops
2018-11-29 07:49:34 -05:00
TehRealSalt
b09c83e35f
...Welp, I mixed up my commit names :V
...
THIS commit's the MT_FIREDITEM fix, the LAST commit was me making sure the size of translationtablecache was correct.
2018-11-29 05:36:40 -05:00
mazmazz
363541d16a
Redundant type 1800 check for MT_COIN
2018-11-27 14:10:55 -05:00
Sal
5cad8e272f
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
5533f03351
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
1419eef5db
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
e4e70835c6
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
Monster Iestyn
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
TehRealSalt
d3fb778a52
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
0846d2cb2c
colorize arrow roulette
2018-11-24 18:00:27 -05:00
TehRealSalt
9bec65ca03
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -05:00
Digiku
7e48af8afd
Merge branch 'nights-ideyaspawn-dronebox' into 'master'
...
NiGHTS: Ideya Anchor Points
See merge request STJr/SRB2Internal!160
2018-11-21 21:03:29 -05:00
mazmazz
06b8128013
Missed sign cast
2018-11-21 20:30:26 -05:00
Digiku
aed64a7c73
Merge branch 'nights-dronebox' into 'master'
...
NiGHTS: Drone hitbox improvements and player position correction on Nightserize
See merge request STJr/SRB2Internal!158
2018-11-21 20:19:39 -05:00
TehRealSalt
bf9658fe04
Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately
2018-11-21 19:30:00 -05:00
Digiku
5101d6ef36
Merge branch 'nights-fastercapsule' into 'master'
...
NiGHTS: Faster Egg Capsule destruct sequence
See merge request STJr/SRB2Internal!164
2018-11-21 16:30:01 -05:00
Digiku
180a6b3dc2
Merge branch 'nights-onfootcapsulefix' into 'master'
...
NiGHTS: Allow player to destroy capsule on-foot before transforming into NiGHTS
See merge request STJr/SRB2Internal!185
2018-11-21 16:29:37 -05:00
Sryder
c7f7434f96
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
67f0b120c7
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
e50f08a357
This effect assumed that it was spawned at base scale anyway...
2018-11-14 14:48:16 -05:00
mazmazz
368b12d6d9
Line 457: Calculate input angle tolerance correctly
2018-11-14 10:13:39 -05:00
TehRealSalt
0bf46935da
More lenient balloon color setting
2018-11-14 04:45:40 -05:00
Digiku
3f7df0561d
Merge branch 'tracerangle' into 'master'
...
Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away
See merge request STJr/SRB2Internal!198
2018-11-13 10:48:01 -05:00
Digiku
d10191ea5d
Merge branch 'monitor-exec' into 'master'
...
Run linedef exec upon popping a monitor
See merge request STJr/SRB2Internal!199
2018-11-13 10:47:37 -05:00
mazmazz
9a36d559dc
Compile errors
2018-11-13 10:43: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
Monster Iestyn
7989e9a482
Merge branch 'public_next'
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
2018-11-10 15:41:57 +00: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