wolfy852
2222738e1c
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
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
wolfy852
f808072937
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
64fb7f90f0
Add a cvar for sprite billboarding, off by default.
2019-05-06 16:57:32 +01:00
Steel Titanium
98c5a2c0f5
Generic model terminology
2019-05-02 22:55:45 -04:00
TehRealSalt
f1f664e9b1
Merge v1
2019-05-02 01:36:19 -04:00
Latapostrophe
dab5469b4a
Terminology changes
2019-04-23 23:49:46 +02:00
Latapostrophe
60428fbc29
Add option to turn off the PLAY default md2
2019-04-22 11:29:44 +02:00
Jaime Passos
0ff96207c7
More Softwarification
2019-04-14 19:08:59 -03:00
Jaime Passos
c8b19a9af5
fix includes
2019-04-13 18:14:55 -03:00
wolfy852
aec9e721dc
Generic model terminology
2019-04-12 00:35:35 -05:00
fickleheart
ad7eb75bf2
Merge remote-tracking branch 'remotes/internal/INTERNAL_netreplays' into INTERNAL_netreplays
2019-04-09 23:00:42 -05:00
fickleheart
c4ee58cfab
Only calculate vfx every other row to try to improve performance
2019-04-09 23:00:39 -05:00
Sryder
04895c72d3
Turn the INT8's into SINT8's
2019-04-09 19:34:34 +01:00
fickleheart
5535f8936f
Unused var
2019-04-09 01:18:10 -05:00
fickleheart
b98639e852
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
25f55b6351
Add VHS pause/rewind effect
2019-04-08 23:21:11 -05:00
Jaime Passos
4548b4bb13
The player should be able to toggle shaders
2019-04-07 00:09:53 -03:00
fickleheart
25ff05fdd0
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
c7125c862c
Support non-green resolutions in the replay hut
2019-04-06 11:16:19 -05:00
Jaime Passos
08efec4cf3
destroy hw_glide.h because no modern GPU supports such API
2019-03-21 18:23:40 -03:00
wolfy852
963cbf4671
Merge branch 'next' into md3-vanilla-kart
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05:00
fickleheart
be458c1d05
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
Jaime Passos
fd5fb73671
gl4
2019-03-17 22:27:50 -03:00
Latapostrophe
aeef900bc2
Lower default ping timeout + Fix chat arrows being missing while we're at it
2019-02-16 12:19:03 +01:00
wolfy852
db280e64a1
New visuals for ping and fps display alike [REDO]
2019-02-15 21:08:08 -06:00
Alam Arias
380bce88a0
remove whitespaces
2019-02-05 15:42:37 -05:00
fickleheart
684ca46d8f
Draw player names in netreplays
2019-02-01 19:28:05 -06:00
mazmazz
aae6eb945d
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
TehRealSalt
09da50000e
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
mazmazz
4f40d2abdb
Merge errors for compile
2019-01-07 17:05:20 -05:00
Arthur
2b8f49fd5e
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
046d66d803
Fix errors from merge
2019-01-06 01:00:30 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
SeventhSentinel
9365f7f235
Minor touchups/cleanup
2019-01-04 16:47:03 -05:00
mazmazz
81352aece1
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
Arthur
c0fbd2f841
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
2018-12-27 00:35:29 -05:00
MPC
79653dd094
fix the fucking warning
2018-12-17 18:09:29 -03:00
MPC
a28aeaf23b
fix my fucking code
2018-12-17 17:57:53 -03:00
Latapostrophe
71074ccce1
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
4c88271cfb
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
Latapostrophe
34f13e9f20
merge conflict
2018-12-16 16:48:15 +01:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
TehRealSalt
d0e691f01a
Default gr_md2 to on
2018-11-17 20:55:12 -05:00
mazmazz
ccffb0538d
Merge branch 'control-selector' into text-prompts
2018-11-12 21:11:53 -05:00
MPC
7c18702f84
Render the startup screen on OpenGL mode
2018-11-10 15:56:13 -03: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
2106ff30f0
Make gray/black text prompt backcolor darker in OpenGL
2018-11-09 22:52:13 -05:00
mazmazz
b7af1e385b
Set up separate background color for prompts vs. console
2018-11-09 22:38:55 -05:00
