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
toaster
379dbaa92c
Here's my progress on making demoplayback camera less shit. I know what probably needs to be done to make it thorough is to replace all the consoleplayer stuff with displayplayer stuff in demoplayback, but don't feel like doing that right now.
2018-09-23 19:55:46 +01:00
mazmazz
2cac83d5e9
Initialize extra_colormaps to NULL on program start
2018-09-11 13:31:09 -04:00
mazmazz
0344ca70ba
Compiler fixes
2018-09-10 16:28:39 -04:00
Monster Iestyn
82e46d101c
Merge branch 'public_next'
...
# Conflicts:
# src/r_main.c
2018-09-04 15:53:07 +01:00
Monster Iestyn
7fc4d864a8
Fix HOM removal not working properly for non-green resolutions
2018-08-31 17:14:44 +01:00
Monster Iestyn
04b4e1d93b
Fix glitches with flats visible when looking up/down in 1st person
2018-08-18 23:31:20 +01:00
TehRealSalt
997c1bebe1
Merge branch 'master' into sonicitems
2018-07-08 17:51:44 -04:00
TehRealSalt
9f08890866
The remaining errors on a GCC 6.3 setup
2018-07-07 16:38:54 -04:00
toaster
a7b631701c
* Completely revamp a bunch of menu stuff!
...
* Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff.
* Port over the improved MP main menu from internal, including flattening the IP connect onto its level.
* Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices.
* Improve the layout of all of the level/gametype select menus slightly.
* (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area.
* (unrelated) Tweak minimap ordering slightly.
2018-06-30 16:01:03 +01:00
SeventhSentinel
4ede9d2edd
ssplayer -> viewnumber
2018-06-27 13:14:22 -04:00
SeventhSentinel
b18406aaa1
Disable viewheight cvar and vanilla's irrelevant first person HUD stuff, move Viewpoint HUD to a nicer spot
2018-06-26 11:33:54 -04:00
TehRealSalt
e9a1dbec82
Better menus
2018-06-14 20:18:29 -04:00
TehRealSalt
118f8f8b2d
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support
...
(also more item changes from last night that I just forgot to commit earlier)
2018-06-06 18:36:39 -04:00
Sryder
dee6c2b97d
Comment out calls to CV_SetValue for cv_analog
2018-03-12 03:18:45 +00:00
TehRealSalt
5ad82554db
Draw over the fourth screen *properly*
...
Thanks Sryder, for suggesting V_NOSCALESTART
2017-12-18 22:17:16 -05:00
TehRealSalt
349b27e0de
Change splitscreen into UINT8, fix HUD slightly more
2017-12-18 20:59:04 -05:00
TehRealSalt
122eb82170
Merge remote-tracking branch 'refs/remotes/origin/battle' into quads
...
# Conflicts:
# src/g_game.c
# src/k_kart.c
2017-12-18 01:02:53 -05:00
TehRealSalt
e7abd77299
Merge remote-tracking branch 'origin/quads' into quads
...
# Conflicts:
# src/d_main.c
# src/r_draw.c
2017-12-17 22:32:12 -05:00