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
TehRealSalt
a3d2b48329
Fix up more stuff
...
Now in a mergable state
2019-04-18 12:20:13 -04:00
TehRealSalt
089be795a2
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
Jaime Passos
0ff96207c7
More Softwarification
2019-04-14 19:08:59 -03:00
wolfy852
aec9e721dc
Generic model terminology
2019-04-12 00:35:35 -05:00
Jaime Passos
4548b4bb13
The player should be able to toggle shaders
2019-04-07 00:09:53 -03:00
Jaime Passos
fbc3e27592
stuff
2019-04-06 23:33:34 -03:00
fickleheart
f60e92aa70
Move public demo vars to a single struct
2019-03-24 21:32:15 -05: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
Jaime Passos
fd5fb73671
gl4
2019-03-17 22:27:50 -03:00
fickleheart
f2d7021199
Adjust FOV change for 2p
2019-02-24 11:59:21 -06:00
fickleheart
39603af6a1
Add field-of-view support in software mode
2019-02-23 10:31:37 -06:00
fickleheart
b085355bdd
Move fov cvar out of OGL-specific code
2019-02-23 10:18:20 -06:00
mazmazz
aae6eb945d
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
Monster Iestyn
d4d30e9e9c
resolve conflict in r_main.c
2019-01-07 16:52:46 +00: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
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
Jimita
b8b2fbb816
Merge branch 'next' into sw_largeroomfix
2018-12-20 16:56:05 -02:00
MPC
9372baf427
Software plane fixes
2018-12-14 14:08:25 -03:00
MPC
dd78224528
Large room fix
2018-12-09 19:34:17 -03:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
Monster Iestyn
358e84f56d
Merge branch 'mpc-software-yslope-fix' into 'master'
...
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)
See merge request STJr/SRB2!282
2018-11-25 11:51:54 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Monster Iestyn
eb4eef6104
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
2018-11-20 14:33:10 +00:00
toaster
5fe9cbba3d
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
...
# Conflicts:
# src/d_clisrv.c
# src/m_misc.c
2018-11-18 18:26:50 +00:00
TehRealSalt
8398d43d6f
Fix cvar bugs
...
- karteliminatelast uses CV_YesNo instead of CV_OnOff
- chatbacktint defaults to on
- soniccd defaults to off
2018-11-17 20:47:11 -05:00
mazmazz
99b24d6bcf
Force chasecam for tutorialmode
2018-11-12 20:37:55 -05:00
toaster
94ea5b6c89
Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1.
2018-11-05 12:49:28 +00:00
LJSonik
3a8ee79cb1
Merge branch 'master' into analog-flipcam-synch-fix
2018-10-29 19:52:08 +01:00
Louis-Antoine
2dc6a102bb
Fix desynch when toggling analog mode or flipcam
...
Special thanks to Lat' for asking weird questions
2018-10-29 00:49:23 +01:00
TehRealSalt
d93f09ccf4
Merge branch 'master' into net-screen
2018-10-19 15:59:13 -04:00
TehRealSalt
c7d40482af
Merge branch 'master' into democam
2018-10-17 18:17:42 -04:00
toaster
12d67e62bc
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen
2018-10-16 22:13:45 +01:00
toaster
806cb47b17
More sensible drawdist_precip_cons_t maximum (slightly more conservative than Sryder's suggestion)
2018-10-14 23:13:11 +01:00
toaster
6469956d6a
Final weather stuff.
...
* Multiplied rain speed by 3, per Oni's request.
* Disable weather density - force to 1 if weather draw distance, otherwise zero
* Move the ceilingpic check into a more convenient part of the weather spawning loop.
* `drawdist_precip_cons_t` - replaces "Infinite" with "None".
* Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that.
* Disable cv_drawdist_nights entirely.
2018-10-14 22:32:34 +01: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
adc9d3b1ec
"t" is not needed to take out fencepost cases from viewangletox
2018-10-11 20:00:05 +01:00
Monster Iestyn
6fb3dcb52f
Remove unused sscount variable
...
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
2018-10-11 19:59:26 +01:00
TehRealSalt
37b5a9327c
Merge branch 'master' into net-screen
2018-10-05 16:13:25 -04:00
toaster
b5e090f0df
Correct some inconsistencies I missed in the previous commit.
2018-10-01 13:51:23 +01:00
toaster
2cce9a0fcb
Allow respawning spectators before starttime is up because they no longer spawn in a condition that allows them to get an unfair advantage (drop dash or its ghetto 2.0-esque predecessor)
...
Also, some camera tweaks:
* Force chasecam when exiting, just like it's forced when you're dead and not a spectator.
* Force a horizontal camera angle aiming when spectator and dead, to avoid skybox bugs.
2018-10-01 13:25:13 +01:00
TehRealSalt
3dfc5753f5
Online splitscreen
...
It WORKS, including kicking players in splitscreen
2018-09-30 00:51:03 -04:00