SeventhSentinel
d9a3b37e30
Add a mapobjectscale global
...
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
Jimita
ad32af337b
Update p_user.c
2018-12-12 13:09:47 -02:00
MPC
a1b1d91acb
Fix remote viewpoint cameras for real
...
I'm so sorry
2018-12-11 20:48:45 -03:00
Monster Iestyn
ee474bab23
Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens
2018-12-11 18:39:58 +00:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
Latapostrophe
d240cfef86
Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s
2018-11-28 19:41:01 +01:00
TehRealSalt
261a50fe68
Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua
2018-11-28 00:45:33 -05:00
Latapostrophe
a6bea8483f
Separated the damage hooks into multiple more precise hooks for players.
2018-11-27 18:27:43 +01:00
Latapostrophe
69b5efa71c
Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players.
2018-11-26 21:23:41 +01:00
TehRealSalt
1d80f9d637
Merge branch 'master' into 102-gameplay
2018-11-26 10:14:41 -05:00
Monster Iestyn
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
toaster
151404f33f
Update HUD anim counters when dead.
...
* Split out the HUD-related counters from K_KartPlayerThink() into their own function.
* Called this function in P_DeathThink().
2018-11-25 13:48:46 +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
9bec65ca03
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -05:00
mazmazz
2eb1b5186c
Let skins jump their regular strength variances in NiGHTS
2018-11-21 21:24:44 -05:00
mazmazz
b1ddcb644e
Nerf jumping
2018-11-21 21:13:15 -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
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
mazmazz
3bb75690c4
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
TehRealSalt
9e51255963
Move countdown setting to P_CheckRacers
...
This fixes two bugs:
- Makes it so that the countdown happens when all the winners are ACTUALLY in instead of the first loser, because exiting timer wasn't set for the last winner in the place this was down before
- Means that the countdown timer can be set on disconnect
2018-11-19 22:37:24 -05:00
TehRealSalt
e4a13a3bdf
Move Shrink out of P_DamageMobj
2018-11-18 17:51:49 -05:00
toaster
2a389acb19
Negate (netgame || multiplayer) condition for countdown to use defaultvalue instead of value per the specifics of the previous implementation
2018-11-18 09:10:26 -05:00
TehRealSalt
54de9c42db
Finish countdown only starts when all winners are declared
...
Still removing/changing crusty vanilla holdovers, one at a time. :shitsfree:
2018-11-18 06:17:42 -05:00
TehRealSalt
202f4a65cb
Double spectator movement speed to keep up with action better, scale it with map size
2018-11-14 14:41:28 -05:00
mazmazz
99b24d6bcf
Force chasecam for tutorialmode
2018-11-12 20:37:55 -05:00
mazmazz
c9f56017d2
Freeze camera values in tutorialmode with proper defaults
2018-11-12 18:08:24 -05:00
mazmazz
e956536bb8
Merge branch 'tutorial-time' into tutorial-time-camera
2018-11-12 17:41:49 -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
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
mazmazz
722929a661
Force camera defaults during tutorialmode (doesn't work in all cases)
2018-11-10 01:31:30 -05:00
Monster Iestyn
5532882303
Merge branch 'master' into next
2018-11-09 23:18:14 +00:00
TehRealSalt
fbbddfff0a
Log this
2018-11-07 14:56:36 -05:00
MPC
eef8119123
Minor remote viewpoint bugfixes.
2018-11-05 20:40:51 -02:00
toaster
935607cfab
You were right, Sal, "%s ran out of time." should've died back when you were working on the branch to remove all the prints.
2018-11-05 14:33:39 +00: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
b08fb14d62
Time over cam & signposts support mobjscale
2018-10-31 03:13:56 -04:00
toaster
97274177d3
Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-29 21:47:34 +00:00
TehRealSalt
4bf4bcadda
Fix SMK RR thwomps casuing bounce-up
2018-10-29 17:45:59 -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
Sal
916fb49be6
Merge branch 'splitscreen-tuneup' into 'master'
...
Splitscreen tuneup
See merge request KartKrew/Kart!67
2018-10-29 05:30:49 -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
ab518c611c
Even better: base it off how much timer is left
...
So instead of prioritizing a specific track, the person who activated their powerup the latest gets their music. That should be a nicer solution for when multiple players are activating their powerups at the same time.
2018-10-28 01:38:01 -04:00
TehRealSalt
a8e549e0c5
More smoothly decide which invincibility music to use
...
Less P_RestoreMusic conflicts in splitscreen, just see the Toxic Palace video for an example :V
2018-10-28 01:22:26 -04:00
TehRealSalt
02c425696f
Reduce camspeed in splitscreen
2018-10-27 20:44:05 -04:00
