600a373739
Merge branch 'master' into next
2019-05-13 16:07:30 +01:00
2a9019c15e
Merge branch 'archiveworld-sigsegv-fix' into 'next'
...
Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.
See merge request STJr/SRB2!490
2019-05-13 07:02:48 -04:00
addf2bb3c4
Fix NONET build
2019-05-13 01:51:36 -04:00
8a14427420
Merge branch 'perpetual-modifier-updates' into 'master'
...
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
06961a8f5e
Merge branch 'no-frameskip' into 'next'
...
Don't skip frames when connecting or paused
See merge request STJr/SRB2!489
2019-05-13 00:35:11 -04:00
cad65ad5e9
Properly fix crash due to duplicated lines.
2019-05-13 00:23:43 -04:00
4e0cc2505a
Revert "Check that lumps are okay"
...
This reverts commit 7ac0a8b4d2
2019-05-13 00:20:39 -04:00
7cc5fddbd8
Fix viewpoint being reset on boost when spectating
2019-05-12 16:38:50 -05:00
68ad2a9932
Fix rewind previews not showing for player 1
2019-05-12 14:42:39 -05:00
334056a77d
whoops
...
Fixes stupid obvious mistakes and changes the prefcolor reset to item.
2019-05-12 04:22:34 -05:00
f61f7f4411
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
90e4a45aa4
Have Look Back reset your color to prefcolor
2019-05-12 03:21:46 -05:00
3b308c6aa4
Merge branch 'master' into next
2019-05-09 23:12:38 -04:00
2f31dd3ab7
fix the array-bounds warning by setting a upper limit
2019-05-09 23:11:26 -04:00
38f33027a0
fix the array-bounds warning by setting a upper limit
2019-05-09 23:10:23 -04:00
571e9be7d8
fix up misleading indentation of a if statement
2019-05-09 23:03:32 -04:00
a9baf71a65
Merge branch 'upstream-merge' into 'next'
...
Upstream merge of next
See merge request KartKrew/Kart-Public!139
2019-05-09 19:13:58 -04:00
7ac0a8b4d2
Check that lumps are okay
2019-05-08 20:30:19 -04:00
f0e16cad32
Merge branch 'master' into next
2019-05-08 16:31:05 +01:00
8ea9d0e95c
Merge branch 'alias_recursion_hotfix_2' into 'master'
...
Alias recursion hotfix 2
See merge request STJr/SRB2!482
2019-05-08 11:25:15 -04:00
8f05d75926
Don't skip frames when connecting or paused
2019-05-08 09:39:45 -05:00
9df84082e9
Default billboarding to "On"
2019-05-08 00:17:21 -05:00
a357a38ae1
Merge remote-tracking branch 'remotes/srb2pub/next' into upstream-merge
2019-05-07 21:43:12 -05:00
e394f41c52
Merge branch 'public-musicplus-tagfix' into 'next'
...
Fix music load lag by reverting tag changes
See merge request STJr/SRB2!486
2019-05-07 22:42:13 -04:00
777f1675fc
Correct a merge mistake
2019-05-07 02:06:59 -05:00
b98f8f7504
Battle, not Match
2019-05-07 01:34:49 -05:00
2c363c4e1e
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
167f0bfe8b
Forgot to update date
2019-05-06 22:54:47 -04:00
4308d3b681
Don't cover chat with pause effect
2019-05-06 22:39:20 -04:00
c5577526c5
Merge branch 'cherry-pick-dfc4b22c' into 'v1'
...
Merge branch 'version-prep' into 'master'
See merge request KartKrew/Kart!150
2019-05-06 22:06:31 -04:00
5022cde443
Merge branch 'version-prep' into 'master'
...
Version prep
See merge request KartKrew/Kart!148
(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)
183e75ff9629fb3239bea80bf99a5a6afd148ec2e772a7503d71a0aa071b335d0cd815cb
2019-05-06 22:05:56 -04:00
1b6b09b915
Merge branch 'no-limits' into 'v1'
...
Remove add-on limit
See merge request KartKrew/Kart!149
2019-05-06 22:04:36 -04:00
47484c5b6b
Merge branch 'v1' into no-limits
2019-05-06 21:55:33 -04:00
f3f74388e6
Merge branch 'INTERNAL_netreplays' into 'v1'
...
Netreplays
See merge request KartKrew/Kart!146
2019-05-06 21:46:18 -04:00
43b55d4f7c
Merge branch 'slight-grow-improvements' into 'v1'
...
Slight grow improvements (v1.1)
See merge request KartKrew/Kart!142
2019-05-06 21:29:17 -04:00
f720dd3ddb
Merge v1
2019-05-06 21:23:29 -04:00
a7df73a35f
Fix skybox bug
2019-05-06 21:17:32 -04:00
2dc91d1723
Merge branch 'skins-fix' into 'v1'
...
Remove skin shit
See merge request KartKrew/Kart!145
2019-05-06 21:07:24 -04:00
360a6ff89a
Merge branch 'public_flatsprite' into 'public_flatsprite'
...
Merge in next and don't billboard papersprites in GL
See merge request STJr/SRB2!488
2019-05-06 15:34:35 -04:00
97493fdfd7
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/hardware/hw_main.c
# src/hardware/hw_main.h
# src/m_menu.c
# src/r_main.c
# src/v_video.c
2019-05-06 14:26:09 -05:00
b304b268c8
No sprite billboarding on papersprites
2019-05-06 20:24:26 +01:00
1f1d67cd7e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
...
# Conflicts:
# src/p_user.c
2019-05-06 20:20:57 +01:00
535b386f8e
Merge remote-tracking branch 'remotes/pub/master' into next
2019-05-06 14:17:02 -05:00
58c5979a1e
Merge branch 'newping' into 'master'
...
New ping command
See merge request KartKrew/Kart-Public!123
2019-05-06 15:12:56 -04:00
62140e1481
Merge branch 'autofocus' into 'master'
...
Grab mouse focus whenever the window is focused
See merge request KartKrew/Kart-Public!120
2019-05-06 15:12:48 -04:00
b2a8e555bb
Merge branch 'ms-connectionfail-bandaid' into 'master'
...
Don't try operating on a closed socket
See merge request KartKrew/Kart-Public!133
2019-05-06 15:12:39 -04:00
406c3619d7
Merge branch 'master' into next
2019-05-06 19:38:53 +01:00
aab2f55aec
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
ae25e8ea07
Merge branch 'console-wait-fix' into 'master'
...
Don't count down wait timer when executing a command line
See merge request STJr/SRB2!483
2019-05-06 12:56:07 -04:00
8b8e165d19
Merge branch 'opengl-sprite-billboarding' into 'master'
...
OpenGL Sprite Billboarding
See merge request STJr/SRB2!485
2019-05-06 12:45:53 -04:00
Monster Iestyn