Commit graph

128 commits

Author SHA1 Message Date
Jaime Passos
f22e767380 fix conflict 2019-11-12 00:23:26 +01:00
James R
71e3ec55bf Revert "Revert "Fix Post Processing in 64-bit Software 3P/4P""
This reverts commit 995edfb1e8.
2019-05-28 15:09:29 -07:00
James R
cf36490ca6 Merge remote-tracking branch 'origin/v1' into v1 2019-05-28 14:24:52 -07:00
Sryder
ab7246d1f7 Fix Heatwave Post-processing Effect in 3P/4P 2019-05-27 22:59:58 +01:00
James R
995edfb1e8 Revert "Fix Post Processing in 64-bit Software 3P/4P"
This reverts commit a2a63c5e7f.
2019-05-27 14:20:12 -07:00
James R
06ddf55709 wip 2019-05-27 14:20:07 -07:00
Sryder
a2a63c5e7f Fix Post Processing in 64-bit Software 3P/4P
Vid_BlitLinearScreen didn't make sure that it was actually meant to be copying the entire screen rows before doing it properly.
2019-05-27 22:03:17 +01:00
wolfy852
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
wolfy852
9df84082e9 Default billboarding to "On" 2019-05-08 00:17:21 -05:00
wolfy852
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
TehRealSalt
f720dd3ddb Merge v1 2019-05-06 21:23:29 -04:00
wolfy852
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
Sryder
8273534967 Add a cvar for sprite billboarding, off by default. 2019-05-06 16:57:32 +01:00
TehRealSalt
201466b1c1 Merge v1 2019-05-02 01:36:19 -04:00
Latapostrophe
2350405ad3 Terminology changes 2019-04-23 23:49:46 +02:00
Latapostrophe
0f43546ada Add option to turn off the PLAY default md2 2019-04-22 11:29:44 +02:00
wolfy852
052104999f Generic model terminology 2019-04-12 00:35:35 -05:00
fickleheart
d6e77fc12e Merge remote-tracking branch 'remotes/internal/INTERNAL_netreplays' into INTERNAL_netreplays 2019-04-09 23:00:42 -05:00
fickleheart
15bb586c57 Only calculate vfx every other row to try to improve performance 2019-04-09 23:00:39 -05:00
Sryder
d579ee36bf Turn the INT8's into SINT8's 2019-04-09 19:34:34 +01:00
fickleheart
fe3cd967d1 Unused var 2019-04-09 01:18:10 -05:00
fickleheart
56c1f05217 Potentially apply VHS distortion semi-transparently?
Pros: fuckin SMOOTH effect especially for 256-color sw
Cons: might lose the intended color distortion, maybe
not a great idea for FPS
Conclusion: put it behind an ifdef for now
2019-04-09 01:09:13 -05:00
fickleheart
ae473585b7 Add VHS pause/rewind effect 2019-04-08 23:21:11 -05:00
fickleheart
6267986c72 Add demo rewinding
Preview is fairly basic, and only shows players
rewinding. Full state is restored via reloading
the replay and jumping to the timestamp once
the rewind is done.
2019-04-06 14:51:00 -05:00
fickleheart
d9bcb43d0b Support non-green resolutions in the replay hut 2019-04-06 11:16:19 -05:00
wolfy852
6b743d383b Merge branch 'next' into md3-vanilla-kart
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05:00
fickleheart
7fc1f02b07 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
2019-03-19 22:17:25 -05:00
Latapostrophe
a119d1cddd Lower default ping timeout + Fix chat arrows being missing while we're at it 2019-02-16 12:19:03 +01:00
wolfy852
07e56e550e New visuals for ping and fps display alike [REDO] 2019-02-15 21:08:08 -06:00
Alam Arias
dc5024f94c remove whitespaces 2019-02-05 15:42:37 -05:00
fickleheart
0ab690bc60 Draw player names in netreplays 2019-02-01 19:28:05 -06:00
mazmazz
4d5f7e78cd Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart 2019-01-10 22:08:37 -05:00
TehRealSalt
72bc1b48f6 Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05:00
Arthur
9774ecbdfb Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation
No longer using byte2float in DrawPolygon -- use the surface color data directly
Vertex Buffer Objects for non-interpolated model frames
Removed some old unused paletted texture stuff
2019-01-07 04:33:22 -05:00
SeventhSentinel
49f2d65e95 Fix errors from merge 2019-01-06 01:00:30 -05:00
SeventhSentinel
73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
SeventhSentinel
3e37d131ed Minor touchups/cleanup 2019-01-04 16:47:03 -05:00
MPC
ca4329bcb6 fix the fucking warning 2018-12-17 18:09:29 -03:00
MPC
82601e881b fix my fucking code 2018-12-17 17:57:53 -03:00
Latapostrophe
2fdf27c507 make sure to change p_dispy and not y for /pm list. Also make MPC happy. 2018-12-17 21:39:49 +01:00
Latapostrophe
45aba493c7 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
Latapostrophe
25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
TehRealSalt
5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
516cda90ec Default gr_md2 to on 2018-11-17 20:55:12 -05:00
MPC
ff642df1f2 Render the startup screen on OpenGL mode 2018-11-10 15:56:13 -03:00
TehRealSalt
499faec555 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
Monster Iestyn
22e8dd1f9d now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore 2018-10-30 14:22:21 +00:00
Monster Iestyn
df9c3ef3cd Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own 2018-10-29 12:36:09 +00:00
Monster Iestyn
834a5e6b35 V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP 2018-10-29 12:06:22 +00:00