Commit graph

778 commits

Author SHA1 Message Date
Steel Titanium
2e8aae5d6a Merge branch 'next' into jimita-flashpals-on-screenshots 2019-05-25 19:37:17 -04:00
Monster Iestyn
36415b0050 Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both 2019-05-23 21:51:58 +01:00
Monster Iestyn
a2e0c1998a Update hw_light.c
(though I'm not sure why we bother, since coronas have been disabled for a decade now)
2019-05-23 21:08:27 +01:00
Jaime Passos
83bef14a5a Fix warnings 2019-05-21 11:03:53 -03:00
Jaime Passos
7ffb6bb09b HOLD UP 2019-05-21 09:50:39 -03:00
Jaime Passos
775b64f540 Support for patches and textures to be used in place of sector flats
Still a work in progress.
2019-05-21 00:28:52 -03:00
Monster Iestyn
dc5d13da46 Merge branch 'steelt-acz-things-hardcode' into 'master'
Hardcode some ACZ things

See merge request STJr/SRB2Internal!220
2019-05-17 12:22:21 -04:00
Monster Iestyn
5e87ab4fa7 Merge branch 'public_flatsprite' 2019-05-16 16:00:24 +01:00
Monster Iestyn
04a8c9a283 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Steel Titanium
ed6bd64014 Hardcode some ACZ things 2019-05-11 22:56:23 -04:00
mazmazz
a542999563 Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla 2019-05-08 17:59:49 -04:00
mazmazz
dc14318f02 Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-05-08 17:56:05 -04: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
Steel Titanium
98c5a2c0f5 Generic model terminology 2019-05-02 22:55:45 -04:00
mazmazz
6a21ff5147 Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla 2019-05-02 17:56:49 -04:00
Jaime Passos
1379cfafc1 Unbind VBO from model during mid-frame
https://git.magicalgirl.moe/STJr/SRB2/merge_requests/397?commit_id=79fed1e954ce77fabb2f09573e2fcd00d6326cef#note_11536
2019-05-02 17:56:06 -04:00
mazmazz
b7f5aeec69 Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla 2019-05-02 17:50:38 -04:00
Jaime Passos
efadbc84af Unbind VBO from model during mid-frame 2019-05-02 17:49:10 -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
Nev3r
09ff071656 Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r
345984a396 Fix mobj list iteration oversights.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 12:58:22 +02:00
Nev3r
baeda5060c Basic multiple thinker list implementation
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02:00
Monster Iestyn
3d719a5fc3 added support for both horizontal and vertical flipping (not sure if complete or not atm, but I've done enough for tonight I think) 2019-02-13 22:40:48 +00:00
Monster Iestyn
f378ef1451 some more mucking about with function arguments (preparing for alpha/flip support adding particularly), also fixed a slipup I made when I first made HWR_DrawColumnInCache 2019-02-13 20:56:59 +00:00
Monster Iestyn
d097af50a1 split HWR_DrawPatchInCache into two functions: one for texture patches and one for everything else 2019-02-13 20:12:10 +00:00
Monster Iestyn
6da3914eca Turns out the consts ARE needed after all, also fix some other errors the compiler reported 2019-02-13 18:20:26 +00:00
Monster Iestyn
04d1313a8d blockmodulo and bpp do not need to be args of HWR_DrawPatchInCache 2019-02-13 17:27:20 +00:00
Monster Iestyn
65add2dc60 whoops, removed some variables I shouldn't have, so I've added them back 2019-02-13 16:52:51 +00:00
Monster Iestyn
01fd861deb Split the column caching code of HWR_DrawPatchInCache into a new function, HWR_DrawColumnInCache. This should make modifying the OpenGL caching code look a little less daunting, hopefully.
I also removed some "const"s for now, since I wasn't sure if they were needed or even correct to use or not here... if they're fine I could add them back later though.

(Note: I have not tested if this compiles yet)
2019-02-13 16:39:37 +00:00
Digiku
5a48a22bb1 Update hw_md2.c -- add comment about anglef player->frameangle from Kart 2019-01-08 11:26:39 -05:00
mazmazz
70f2e9a7ab Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-01-07 04:06:45 -05:00
mazmazz
ccd742d92e 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-03 00:57:14 -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
Jimita the Cat
6f72f69575 dumb 2019-01-02 01:01:57 -03:00
Jimita the Cat
2cc6a22d12 Add support for flashpals in screenshots 2019-01-02 00:41:52 -03:00
mazmazz
f7f0c3bbf6 Merge branch 'timedemo-revise' into md3-vanilla 2018-12-29 12:09:32 -05:00
Digiku
1517c16c4d Merge branch 'MSVC-ARM' into 'master'
ARM and ARM64 support with MSVC toolchain

See merge request STJr/SRB2!412
2018-12-28 01:05:40 -05:00
mazmazz
670107ed63 Add framecount increment to HWR_RenderPlayerView
Analogue to R_RenderPlayerView; used for timedemo FPS reading
2018-12-27 23:05:06 -05:00
mazmazz
1686448b2a Compile fix -- remove (void)alpha from DoScreenWipe 2018-12-27 22:29:12 -05:00
Arthur
60afa76c3a Eliminate some old GL functions so we don't slide back into bad habits! 2018-12-27 22:10:10 -05:00
Arthur
5f6108f278 Fix screen transitions 2018-12-27 22:09:00 -05:00
mazmazz
cd6964876e Buildbot fixes 2018-12-27 01:00:09 -05:00
mazmazz
fe77293122 Compile fixes -- specify GLubyte for pglColor4ubv 2018-12-27 00:50:43 -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
Arthur
f18e09e638 Removed unused PF_Md2 flag
More OpenGL performance increase by making assumptions about client state
2018-12-27 00:30:07 -05:00
Arthur
f01d708edf boolean fix for VS
add GL_NORMALIZE
2018-12-27 00:24:21 -05:00
mazmazz
eb78f92641 Ignored fread fix 2018-12-27 00:01:51 -05:00
mazmazz
1ec384e3d0 More mixed d&c fixes 2018-12-26 23:50:35 -05:00