SteelT
5bfebef1e9
Fix models texture PNG path when attempting to load fallback models
2020-10-02 15:25:12 -04:00
SteelT
045aaa678c
Merge branch 'ogl-model-uv-adjust' into 'next'
...
Re-adjust model UVs when sprite texture dimensions change
See merge request STJr/SRB2!1068
2020-09-25 21:19:59 -04:00
James R
997d142cb5
SPLITSCREEN FOV
...
Object tracking is off, but it was off before so I don't know if I actually
broke it. Minor refactoring in HWR_RenderPlayerView and HWR_RenderSkyboxView.
2020-09-23 17:50:47 -07:00
James R
a32486b5b9
And fix opengl splitscreen
2020-09-23 17:50:47 -07:00
SteelT
6a168ac5e9
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Jaime Passos
98c6b54994
Improved memory management for patches
2020-09-07 02:23:07 -03:00
Hannu Hanhi
9473de18c5
Convince the compiler that I know what I'm doing, I think
2020-08-18 23:21:26 +03:00
Jaime Passos
d18d12fdea
Introduce Doom patch format into picture formats
...
Fixes sprite rotation
2020-08-15 21:52:01 -03:00
Jaime Passos
7bc4af41ab
Merge branch 'pictureformats' into patch-stuff-again-2
2020-08-15 20:48:28 -03:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Nev3r
e80e0b6007
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
2020-08-15 13:44:59 +02:00
Sally Coolatta
19016db338
Got through OGL
2020-08-15 06:20:22 -04:00
Sally Coolatta
873474ac87
Make it to s_sound
2020-08-15 01:54:45 -04:00
Sally Coolatta
dfd733eb80
Up to screen.o
...
Lots of renderer files I didn't need to touch at all here :)
2020-08-15 00:55:30 -04:00
Jaime Passos
cb3660331a
Refactor renderer switching
2020-08-14 22:27:16 -03:00
Sally Coolatta
c665393bd0
actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V
2020-08-14 21:21:17 -04:00
Sally Coolatta
5a6263c36b
Make it past p_mobj
2020-08-14 20:48:06 -04:00
Sally Coolatta
2f2e813e52
m_anigif, m_cheat, m_cond, m_fixed
...
Up to m_menu, and it's screaming, so I'm going to take a break :V
2020-08-14 01:31:37 -04:00
Sally Coolatta
1500d682d2
hu_stuff & y_inter
2020-08-14 01:06:55 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
135e9b9797
f_finale now compiles
2020-08-11 23:13:25 -04:00
Sryder
7f9850644b
A few opengl file build fixes
...
Also ogl_win.c had a merge conflict remaining apparently.
2020-08-12 00:12:42 +01:00
Sally Coolatta
b9436ee015
More fixing up
...
Got tired again, but now it makes it to f_finale
2020-08-11 18:46:00 -04:00
Sally Coolatta
8731c6b7a4
Another round of fixing up
...
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
Sally Coolatta
fef19410fd
Merge hw_main.h
2020-08-10 17:25:44 -04:00
Sally Coolatta
6906b56b4a
Duplicate defs
2020-08-10 17:23:20 -04:00
Sally Coolatta
a30d20590c
Merge hw_main.c
2020-08-10 16:23:48 -04:00
Sally Coolatta
dd89f333e2
Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge
2020-08-10 15:56:45 -04:00
Sally Coolatta
d2ecf0dd92
Use vanilla hw_bsp.c
2020-08-10 15:47:19 -04:00
SteelT
a93282d893
Forgot hw_light.h
2020-08-10 15:34:59 -04:00
SteelT
7d51db242d
Merge hardware/hw_light.c
2020-08-10 15:33:36 -04:00
Sryder
67486dc0b6
Fix Simple opengl merge conflicts
...
hw_cache.c, hw_data.h, hw_defs.h, hw_dll.h, hw_draw.c, hw_drv.h, hw_glob.h, hw_md2.c, hw_md2.h, r_opengl.c
2020-08-10 17:39:34 +01:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
737f5c35c4
Merge r_opengl.c/h
2020-08-09 20:45:29 -04:00
James R
66d36d4fdf
Merge branch 'opengl-skydome-fixes' into 'next'
...
Move the sky dome code out of r_opengl.c, fix issues with shaders
See merge request STJr/SRB2!1071
2020-08-09 20:45:01 -04:00
Sally Coolatta
aeeedac1ea
Merge hw_md2.c
2020-08-09 19:35:13 -04:00
Jaime Passos
a7f3dd7eff
Refactor patch loading
2020-08-08 05:16:47 -03:00
Jaime Passos
368e550ab1
Shader code cleanup
2020-08-07 18:17:05 -03:00
James R
36210abee8
Merge branch 'ogl-model-lighting-shader' into 'next'
...
Add capability to use model lighting with shaders enabled
See merge request STJr/SRB2!1073
2020-08-05 19:50:31 -04:00
James R
8ff4410102
Merge branch 'ogl-sector-alignment-fix' into 'next'
...
Fix sector flat alignment issues in OpenGL
See merge request STJr/SRB2!1094
2020-08-03 12:47:29 -04:00
James R
6222c39d42
Merge branch 'ogl-big-room-fix' into 'next'
...
Big room fix for OpenGL
See merge request STJr/SRB2!1089
2020-08-03 12:44:09 -04:00
Nev3r
29f3d0e693
Fix smooth brain bruhments.
2020-07-31 22:38:37 +02:00
Sal
02e98c4d31
Merge branch 'hud-slidein' into 'master'
...
HUD slide in, and better splitscreen HUD support
See merge request KartKrew/Kart!306
2020-07-31 11:23:01 -04:00
Nev3r
9189e4980d
Fix the OpenGL FOF issue with a different approach. Not fond of it either but at least it works.
2020-07-31 14:55:26 +02:00
Sally Coolatta
1008dcce36
Vertical flip for shadows
2020-07-29 23:55:36 -04:00
Sally Coolatta
72bfbefad3
SHORT fixes from vanilla for shadows
2020-07-29 21:28:09 -04:00
Nev3r
64130e32de
Fix FOF intersections with multitags for the OpenGL in a kind of hacky way.
2020-07-29 14:53:27 +02:00
Nev3r
3854b56228
Merge branch 'next' into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
2020-07-29 13:55:14 +02:00
Nev3r
69cdd00be6
Fix gl_linedef renaming which went off radars on the udmf branch
2020-07-28 20:39:11 +02:00
Nev3r
3d90a6aebe
Merge branch 'udmf-next' into 'next'
...
Merge udmf-next into next
See merge request STJr/SRB2!1075
2020-07-28 14:03:59 -04:00