MonsterIestyn
d158d7e011
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00: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
Nev3r
34c472dfb7
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
Nev3r
623c7097f1
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
TehRealSalt
9bec65ca03
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -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
Marco Z
633c28b28a
VC build fixes
2018-11-20 21:54:20 -05: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
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
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
71452edda2
Merge branch 'master' into new-spb
2018-10-19 17:45:06 -04:00
toaster
df4e12ac15
No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal)
2018-10-19 21:53:02 +01:00
TehRealSalt
2ae44ab10e
New SPB
...
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
TehRealSalt
c4a249366c
Merge branch 'master' into no-spectate-griefing
2018-10-16 16:38:35 -04:00
TehRealSalt
0717db3f31
Prevent spectate griefing
...
If the player count dips below what was stored on the start of the last lap, then don't do time over so that someone can't just spectate at the end of a race out of rage. Y'all are assholes :V
2018-10-15 18:41:34 -04:00
toaster
1142fddc71
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
Monster Iestyn
89d7c55878
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/lua_script.c
# src/p_user.c
# src/sdl/i_system.c
# src/v_video.c
# src/w_wad.c
2018-10-10 14:51:34 +01:00
Monster Iestyn
afd62ec071
Merge branch 'master' into next
2018-10-09 22:55:55 +01:00
toaster
2ad2cbcc0a
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
2018-10-07 15:00:58 +01:00
toaster
dd5247811f
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
mazmazz
7dfe25d1b5
Merge branch 'master' into le-fadefof
2018-09-18 17:11:33 -04:00
Digiku
ba0b15a715
Merge branch 'fof-fixes-movingplatexists' into 'master'
...
Moving platform fix: Player snaps to floor when setting ~FF_EXISTS
See merge request STJr/SRB2Internal!188
2018-09-18 11:29:11 -04:00
Digiku
be6bae4ccb
Merge branch 'colormap-overhaul-fade' into 'master'
...
Linedef Exec 455 Fade Colormap, 456 Stop Fading Colormap
See merge request STJr/SRB2Internal!191
2018-09-18 11:06:09 -04:00
mazmazz
65aeea28bc
Merge branch 'colormap-overhaul-fade' into le-fadefof
2018-09-18 11:05:30 -04:00
mazmazz
83cfc7d0e4
Merge remote-tracking branch 'origin/master' into le-fadefof
2018-09-18 10:52:03 -04:00
Digiku
31ea145fb2
Merge branch 'polyobj-fade' into 'master'
...
Linedef Exec 492: Fade PolyObject
See merge request STJr/SRB2Internal!192
2018-09-18 10:48:46 -04:00
Monster Iestyn
c088d55547
Merge branch 'public_next'
2018-09-17 21:50:19 +01:00
mazmazz
f307c6d1b6
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 14:13:31 -04:00
Digiku
a35a4e052c
Merge branch 'colormap-overhaul' into 'master'
...
Colormap code overhaul
See merge request STJr/SRB2Internal!189
2018-09-17 11:24:14 -04:00
mazmazz
f57e7c7fc5
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-17 10:57:02 -04:00
mazmazz
e57bd5206c
Colormap netsync: Count ffloors for colormap loading upper limit
2018-09-17 10:38:17 -04:00
mazmazz
5f176f5525
Colormap netsync: Handle unaccounted dummy colormaps properly
2018-09-17 10:30:21 -04:00
mazmazz
30b57e22cd
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-17 08:06:17 -04:00
mazmazz
02ed2d247e
Colormap netsync: String format numsectors to UINT32 (thanks buildbot)
2018-09-17 08:05:51 -04:00
mazmazz
70a672229c
453: Use new colormap netsync for fade FOF thinker
2018-09-17 00:34:03 -04:00
mazmazz
02c33bcac8
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-17 00:28:16 -04:00
mazmazz
0cba69e75a
Colormap netsync: Mixed D+C fixes
2018-09-17 00:26:58 -04:00
mazmazz
e5d533edc2
New colormap netsync fixes
2018-09-16 22:42:36 -04:00
mazmazz
3bfdcad4cc
New colormap netsync fixes
2018-09-16 22:41:08 -04:00
mazmazz
82ebf0c64a
455: Fade colormap netsync use new colormap saving
2018-09-16 20:27:24 -04:00
mazmazz
1103503dee
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-16 20:25:59 -04:00
mazmazz
5923e85c5a
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-16 20:25:46 -04:00
mazmazz
20537f1310
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-16 08:20:57 -04:00
mazmazz
d8b57f32e7
492: Merge speed and duration logic for fade polyobject
2018-09-15 20:00:37 -04:00
Nev3r
2009c93ddd
The thinker is entirely unified now, and there is no difference in the light levels between the "old" behavior and this one now.
2018-09-15 12:21:25 +02:00
mazmazz
e2e1ca0ac6
420: Combine speed and duration logic for fade lighting
2018-09-15 19:01:21 -04:00
mazmazz
17ea15a050
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-15 01:51:06 -04:00
mazmazz
20eb98b89f
Colormap overhaul: %d format size_t -> UINT32 fix
2018-09-15 01:50:33 -04:00
