Commit graph

419 commits

Author SHA1 Message Date
TehRealSalt
dc41fe3d8d Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff 2019-05-12 17:19:49 -04:00
wolfy852
9ac41cca73 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
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
70ff9be419 No sprite billboarding on papersprites 2019-05-06 20:24:26 +01:00
Sryder
7792b48ea3 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
Sryder
64fb7f90f0 Add a cvar for sprite billboarding, off by default. 2019-05-06 16:57:32 +01:00
TehRealSalt
f1f664e9b1 Merge v1 2019-05-02 01:36:19 -04:00
Sryder
913d5dd595 OpenGL sprite billboarding
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
2019-05-01 20:15:00 +01: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
wolfy852
aec9e721dc Generic model terminology 2019-04-12 00:35:35 -05:00
wolfy852
9518939a9d Fix Visual Studio compiling 2019-03-21 00:32:27 -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
Alam Arias
06cd65cc72 Merge branch 'master' into next 2019-03-11 10:01:57 -04:00
Alam Arias
ed0df9966d Fix compiling with VS 2019-03-11 09:58:37 -04:00
James R
e55a778a81 Merge remote-tracking branch 'origin/next' into longdouble 2019-03-04 18:51:11 -08:00
Alam Arias
aaccb4edff fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
James R
ca861ba0c5 Use long double suffix 2019-03-02 15:56:44 -08:00
fickleheart
0d32f71d05 Change OGL splitscreen hack to match software behavior 2019-02-24 12:26:46 -06:00
fickleheart
b085355bdd Move fov cvar out of OGL-specific code 2019-02-23 10:18:20 -06:00
Sryder
23b8646cbd Should hopefully fix the MD2 crash reported
I wasn't able to replicate it personally, but this should hopefully avoid it crashing where the RPT given pointed out.
2019-01-21 22:48:57 +00:00
fickleheart
6cb8818a46 Fix clobbering error in MD2 texture code 2019-01-18 20:28:31 -06:00
Sal
a17824ac76 Merge branch 'default-md2' into 'next'
Default model for players

See merge request KartKrew/Kart-Public!27
2019-01-15 03:42:19 -05:00
mazmazz
8c793216c9 Merge remote-tracking branch 'mazmazz-kart-public-gl/md3-vanilla-kart' into md3-vanilla-kart 2019-01-10 22:15:05 -05:00
mazmazz
aae6eb945d Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart 2019-01-10 22:08:37 -05:00
wolfy852
8f1617a4dc Missed a few spots 2019-01-09 15:53:59 -06:00
wolfy852
6943f59e79 If kmd2.dat isn't found in srb2home, search the game's directory for it 2019-01-09 15:38:37 -06:00
Marco Z
74c57ad447 Kart Public Next merge 2019-01-08 18:43:49 -05:00
Latapostrophe
654901a4b5 use PLAY as default player MD2 if avaiable. 2019-01-08 18:57:10 +01:00
Digiku
bfd6d83a3b Update hw_md2.c -- Redundant AngleFixed operation when modifying anglef 2019-01-08 11:30:04 -05:00
Digiku
22cf53b8ae Update hw_md2.c -- player->frameangle fix 2019-01-08 11:22:33 -05:00
mazmazz
b056842deb Dummy out nextframe lerping (unused in Kart) 2019-01-07 04:38:17 -05:00
mazmazz
157cbe4b23 Fix blinking MD2 models
MD2 models are forced to load float frames, so mesh->indices is never loaded, so glDrawElements can't be used. Use glDrawArrays instead.
2019-01-07 04:34:19 -05:00
mazmazz
7f88e13492 Compile fix -- remove (void)alpha from DoScreenWipe 2019-01-07 04:34:17 -05:00
Arthur
f41951bfb1 Eliminate some old GL functions so we don't slide back into bad habits! 2019-01-07 04:34:16 -05:00
Arthur
d1b448f8d1 Fix screen transitions 2019-01-07 04:33:28 -05:00
mazmazz
89cdc1cbc2 Buildbot fixes 2019-01-07 04:33:27 -05:00
mazmazz
766fb9d836 Compile fixes -- specify GLubyte for pglColor4ubv 2019-01-07 04:33:25 -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
Arthur
f5562c47ec Removed unused PF_Md2 flag
More OpenGL performance increase by making assumptions about client state
2019-01-07 04:33:20 -05:00
Arthur
191f9454c3 boolean fix for VS
add GL_NORMALIZE
2019-01-07 04:30:54 -05:00
mazmazz
dbcdacc8bb Ignored fread fix 2019-01-07 04:30:53 -05:00
mazmazz
c0547d56aa More mixed d&c fixes 2019-01-07 04:30:52 -05:00
mazmazz
3a2203018a byte -> char 2019-01-07 04:30:51 -05:00
mazmazz
d60b77b062 Mixed D&C fixes 2019-01-07 04:30:49 -05:00
mazmazz
6f70a07cb6 Fix floating point comparisons 2019-01-07 04:30:48 -05:00
Arthur
9617e604bb Removed all glBegin/glEnd references
MD2/MD3 now works, with the exception of WAD textures for some odd reason
2019-01-07 04:30:47 -05:00