Latapostrophe
272f3fbb53
fix conflict
2019-11-12 00:41:26 +01:00
Latapostrophe
aab87012df
dontencoreremap flag + colormaps
2019-11-12 00:40:25 +01:00
Latapostrophe
abcb1e9981
Merge branch 'gl-encore' into gl-qol
2019-11-12 00:23:56 +01:00
Jaime Passos
f22e767380
fix conflict
2019-11-12 00:23:26 +01:00
Latapostrophe
3bd62175f6
fix encore for ogl
2019-11-12 00:21:37 +01:00
Sryder
c3f6f263d4
Update Skywall handling
...
I've tried to make this so it almost never under-compensates, and over-compensates very little where possible.
I don't think it's 1:1 to software's current behaviour, and probably never will be due to software being very strange.
2019-06-26 23:17:45 +01:00
Sryder
414eee58ba
checkforemptylines can be static
2019-06-24 20:50:37 +01:00
Sryder
d67ea859e3
Match CheckClip to software's clipping check in R_AddLine
...
Has the added benefit of fixing noclip camera for opengl
Unfortunately SkyWalls are kinda broken with this. I'll be looking into them shortly.
2019-06-24 20:21:30 +01:00
Sryder
11c94d3312
Stop OpenGL having infinite precipitation draw distance
2019-06-19 20:05:20 +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
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
b304b268c8
No sprite billboarding on papersprites
2019-05-06 20:24:26 +01:00
Sryder
1f1d67cd7e
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
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
Sryder
4d77ed925e
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
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
TehRealSalt
a187656a8f
Fix up more stuff
...
Now in a mergable state
2019-04-18 12:20:13 -04:00
wolfy852
052104999f
Generic model terminology
2019-04-12 00:35:35 -05:00
wolfy852
7911fa24d0
Fix Visual Studio compiling
2019-03-21 00:32:27 -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
Alam Arias
e2a5e8a18d
Merge branch 'master' into next
2019-03-11 10:01:57 -04:00
Alam Arias
5ca69ce234
Fix compiling with VS
2019-03-11 09:58:37 -04:00
James R
62820bb4bf
Merge remote-tracking branch 'origin/next' into longdouble
2019-03-04 18:51:11 -08:00
Alam Arias
56e8f09ae8
fixed compiling for MSVC 2017
2019-03-04 16:33:06 -05:00
James R
f0a0666223
Use long double suffix
2019-03-02 15:56:44 -08:00
fickleheart
1499a47541
Change OGL splitscreen hack to match software behavior
2019-02-24 12:26:46 -06:00
fickleheart
d6b9a75230
Move fov cvar out of OGL-specific code
2019-02-23 10:18:20 -06:00
Sryder
d959dd6934
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
c0c2ba4ca6
Fix clobbering error in MD2 texture code
2019-01-18 20:28:31 -06:00
Sal
5982e26bb5
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
abf2da9e9b
Merge remote-tracking branch 'mazmazz-kart-public-gl/md3-vanilla-kart' into md3-vanilla-kart
2019-01-10 22:15:05 -05:00
mazmazz
4d5f7e78cd
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
wolfy852
dbb7267f22
Missed a few spots
2019-01-09 15:53:59 -06:00
wolfy852
90148f79eb
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
7806c43ecf
Kart Public Next merge
2019-01-08 18:43:49 -05:00
Latapostrophe
a4641e1010
use PLAY as default player MD2 if avaiable.
2019-01-08 18:57:10 +01:00
Digiku
3cd4b253b1
Update hw_md2.c -- Redundant AngleFixed operation when modifying anglef
2019-01-08 11:30:04 -05:00
Digiku
090ecdb6e5
Update hw_md2.c -- player->frameangle fix
2019-01-08 11:22:33 -05:00
mazmazz
05a1a7e24a
Dummy out nextframe lerping (unused in Kart)
2019-01-07 04:38:17 -05:00
mazmazz
8504b000bb
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
cc3b57a96c
Compile fix -- remove (void)alpha from DoScreenWipe
2019-01-07 04:34:17 -05:00
Arthur
531d42c1bd
Eliminate some old GL functions so we don't slide back into bad habits!
2019-01-07 04:34:16 -05:00
Arthur
25ef570a81
Fix screen transitions
2019-01-07 04:33:28 -05:00
mazmazz
08579d9447
Buildbot fixes
2019-01-07 04:33:27 -05:00
mazmazz
62596bed38
Compile fixes -- specify GLubyte for pglColor4ubv
2019-01-07 04:33:25 -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
