530b5784b8
platersprite_t is not the same as unsigned
2019-09-19 21:42:59 -04:00
5f6c702ed6
sky barreling
2019-09-17 23:38:04 -03:00
a6831aff9c
compile fix
2019-09-17 22:29:53 -03:00
35e3d9acab
Revert "Merge branch 'gl_skydome' into 'master'"
...
This reverts merge request !326
2019-09-17 20:20:09 +00:00
2a33ffb7d7
PNG support: use png_const_bytep, so we do not drop const type
2019-09-17 16:18:54 -04:00
db979845e0
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-09-15 16:24:24 -03:00
a86e2332da
Fix MD2 loading
2019-09-15 16:24:17 -03:00
aa91627ba2
Allow PNG graphics to be used as patches
...
Also allows them to be used as sprites.
2019-09-11 16:59:28 -03:00
2ced626518
Merge branch 'gl_skydome' into 'master'
...
OpenGL sky dome
See merge request STJr/SRB2Internal!326
2019-09-11 11:58:05 -04:00
1bafec9f55
Merge branch 'ast_newstyles' into 'master'
...
Patch translucency styles
See merge request STJr/SRB2Internal!324
2019-09-11 11:57:45 -04:00
fec579db8c
Merge remote-tracking branch 'origin/master' into gl_skydome
2019-09-10 19:20:20 -03:00
8057eeaaca
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
f0788598c9
Better fades
2019-09-09 23:31:48 -03:00
0a973af5b8
Comments
2019-09-09 19:27:08 -03:00
da93e0f1f5
I am the CEO of renderers
2019-09-09 16:20:17 -03:00
043bb86acd
Revert "Merge branch 'flats-png_port' into 'master'"
...
This reverts merge request !322
2019-09-09 18:40:21 +00:00
0a69190848
Missing arguments
2019-09-09 15:39:10 -03:00
6553d816ea
Merge remote-tracking branch 'origin/master' into flats-png_port
2019-09-09 14:12:28 -03:00
725d0b4c44
still making things better
2019-09-08 21:37:24 -03:00
8c035ecb86
Merge branch 'lightning_polys' into 'master'
...
Lightning Polys
See merge request STJr/SRB2Internal!294
2019-09-08 19:04:56 -04:00
19e50062cc
more stuff. i hope i didnt mess this up.
2019-09-08 18:59:49 -03:00
c7e01a558e
initial stuff
2019-09-08 18:44:40 -03:00
2863ede7bf
initial stuff
2019-09-08 18:27:35 -03:00
ff1fa3f92b
Implement all the other alpha blend styles
2019-09-08 13:21:00 -03:00
4adff34402
opengl patch translucency
2019-09-07 22:43:29 -03:00
f461b76bb0
fix translucency
2019-09-07 16:54:26 -03:00
d38ba4d88c
define stuff idk
2019-09-06 19:41:29 -03:00
2a85ed0bdd
test
2019-09-06 19:26:05 -03:00
0cc553be5f
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
6aedca899f
2.2 skies aren't flipped
2019-09-05 17:42:36 -03:00
c6f3e4d53d
Make sky dome look a bit better
2019-09-04 13:59:09 -03:00
f0b4a609a8
Very tiny fix
2019-09-03 23:44:04 -03:00
53ddf19f94
Interpolation flag support
2019-09-03 22:57:54 -03:00
4760ff0963
Crash prevention
2019-09-03 21:31:32 -03:00
916bdeb880
3 digits frame number
2019-09-03 18:31:59 -03:00
1dca3338fd
Sprite2 support but I'm not a dumbass
2019-09-03 18:27:22 -03:00
f6d2b5109b
PRBoom sky dome
2019-09-03 02:12:17 -03:00
c21d83e8af
Sprite2 support!
2019-09-02 23:29:16 -03:00
d99026df3b
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 20:27:50 -03:00
6a9da63d7f
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 19:19:54 +01:00
806b106905
Hardcoded the Pyre Fly
2019-08-30 08:17:25 +02:00
50e51c137e
Hardcoded the lavafall
2019-08-25 23:05:38 +02:00
2a5c576c1c
Hardcoded the RVZ scenery
2019-08-25 12:40:32 +02:00
1f2baf5b6b
Make polyobjects agree with sector lighting/colormap like a FOF.
...
Caution: has weird retry/reload bug. Ask sphere for sample map/coords.
2019-08-22 22:30:36 +01:00
f68652aa66
I
2019-08-18 14:16:48 -03:00
a6fe6ebcd3
Fix signed vs unsigned comapre
2019-08-07 12:41:22 -04:00
e1e2572357
More post-merge fixes
2019-08-04 21:49:31 -04:00
84c9633579
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-08-04 21:33:13 -04:00
b1f402538f
Post-merge fixes (todo: spr2)
2019-08-04 21:32:41 -04:00
a87e1b8aa6
Fix inadvertent fallthrough and associated whitespace.
2019-08-04 10:27:36 +01:00
48e09d56bf
Fix HWR_DrawConsoleFill.
2019-08-04 10:27:09 +01:00
5b284c8170
gcc7 compile fixes (Fall through; spr2 var comparison)
2019-08-03 23:01:10 -04:00
384533165c
* Fix crash error in GL.
...
* Re-enable the perplayer stuff in V_DrawFadeFill - not worth having it disabled when it'll just have to be re-enabled later.
* Remove some "consistency with software" stuff in hw_draw.c that already has equivalents
2019-07-28 17:47:57 +01:00
063e350c63
A good and bad ending cutscene now exist.
...
Also:
* SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in).
* Minor oversights in SPR2 support corrected.
* Better evaluation, featuring ending assets.
* Intro has warping-in blackrock, reusing ending assets.
* Cutscene text now supports lowercase (intro and custom).
* Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.)
* Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)
Bugs:
* OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-28 00:32:57 +01:00
b3e953c8c3
Correct some extant fuckups.
2019-07-14 14:21:32 +01:00
323d5d61d3
Correct some more minor issues with hw_light.c and the ALAM_LIGHTING. (Hi Alam! ^u^)
2019-07-13 14:07:40 +01:00
47f138ac34
I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here.
2019-07-13 13:43:22 +01:00
166f1fac66
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
...
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-13 01:42:03 +02:00
f62087ef30
Fix MascaraSnake's issues with sign-compare (hopefully)
2019-07-09 21:43:38 +01:00
2df90888bb
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum
...
# Conflicts:
# src/p_mobj.c
# src/sounds.c
# src/sounds.h
2019-07-09 19:52:52 +01:00
3e305c0993
Merge branch 'toast_cleanup' into 'master'
...
PITY IN PINK and everything associated (formerly toast_fixes)
See merge request STJr/SRB2Internal!232
2019-07-09 14:31:25 -04:00
ef984eb336
Merge branch 'metalfixes' into 'toast_cleanup'
...
Metal Sonic Boss fixes (again)
See merge request STJr/SRB2Internal!245
2019-07-09 14:29:42 -04:00
98b6280d03
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
...
# Conflicts:
# src/p_mobj.c
2019-07-08 13:53:31 +01:00
867f7ecfca
ha ha ha how can i possibly describe this commit
...
Just wait for the MR, it won't be far behind.
2019-07-08 13:26:40 +01:00
ec8f64100e
Hardcode brick debris
2019-07-06 00:36:02 -04:00
4ad1703ae3
Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'""
...
This reverts commit c04b560e92
2019-07-03 00:58:02 +01:00
c04b560e92
Revert "Merge branch 'metalfixes' into 'toast_cleanup'"
...
This reverts merge request !239
2019-07-02 23:49:10 +00:00
e9978b2955
Merge branch 'master' into thinkerlists
...
# Conflicts:
# src/f_finale.c
# src/p_enemy.c
2019-07-02 23:08:37 +02:00
dc0a92ea62
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
521d8fd8c1
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
faebe0f9af
Metal Sonic fixes!
...
* Add more context clues to his fight, including an indicator for which laser attack is being used after chargeup.
* Make missiles able to vectorise him.
* Add another laser orb attack - vertical slice - and change the laser orb sequence to accurately reflect that horizontal is the hardest of the ones in 2.1.
* Optimise TC_BLINK, and fix an issue with TC_ALLWHITE that somehow avoided coming up in testing.
* Fix colorized bosses losing their colorization when flashing, by forcing TC_ALLWHITE.
2019-06-28 20:48:14 +01:00
d5988c4f8c
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
...
# Conflicts:
# src/p_mobj.c
2019-06-26 20:43:37 +01:00
28566008b4
Merge remote-tracking branch 'upstream/master' into flats-png
2019-06-25 16:02:35 -03:00
6371de806b
Improve rain/weather.
...
* Like Kart, remove cv_precipdensity.
* Like Kart, replace "Infinite" draw distance value with "None".
* Better thinker with more return optimisation.
* Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.
2019-06-22 16:50:30 +01:00
2e6898f29e
PITY IN PINK!
...
* Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites.
* Added LHRT object, designed to be summoned with CA2_MELEE.
* Gives a pink Pity Shield (SH_PINK) on same-team player contact.
* Deals damage to non-player enemies.
* Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods).
* Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.
2019-06-19 23:20:24 +01:00
1d65caa250
With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it):
...
* Port across the additional colour translation maps, including mobj-level support for "colorized" objects.
* Make Fangboss and both Metal Sonic objects greyscale if, on spawn, there is a player in the game who is not a spectator whose skin is that character.
* Allow bosses with MF_GRENADEBOUNCE to opt out of the MF2_FRET colour-flashing tomfoolery, and give this flag to Fang.
2019-06-18 17:55:57 +01:00
861d0d0b0a
Improve rain/weather.
...
* Like Kart, remove cv_precipdensity.
* Like Kart, replace "Infinite" draw distance value with "None".
* Better thinker with more return optimisation.
* Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.
2019-06-18 14:22:10 +01:00
95a0b3fc86
Merge branch 'master' into new-acz-minecarts
2019-06-17 20:43:21 +02:00
ba9c7d9310
More incomplete minecart hardcoding
2019-06-13 21:45:30 +02:00
fafabaae2b
Hardcoded the saloon door
2019-06-12 21:20:14 +02:00
068e07974d
Hardcoded the new Snapper behavior
2019-06-10 20:32:50 +02:00
ae6997621d
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-10 18:14:03 +02:00
0e80d2ec5d
Hardcoded the new Minus behavior
2019-06-10 17:42:37 +02:00
98ea229680
Hardcoded the Canarivore
2019-06-10 13:58:16 +02:00
e7e3b0ef38
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/hardware/hw_draw.c
# src/m_misc.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
3a16a7d7d4
Hardcoded train dust and steam spawner
2019-06-09 17:16:07 +02:00
6df14492a5
Hardcoded train cameo
2019-06-09 13:48:07 +02:00
ca4ab06abf
Hardcoded wood debris
2019-06-09 12:27:09 +02:00
7b603f4ac8
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 10:51:33 +02:00
546af19c82
Hardcoded oil lamp
2019-06-08 15:50:01 +02:00
1aaccfcd5c
Hardcoded dust devil
2019-06-08 09:51:46 +02:00
0795c7811a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-07 13:11:51 +02:00
264386f842
Add visplane portal creation functionality and use it to replace the skybox rendering.
...
The skybox rendering process has been replaced with portals instead. Those are generated after the first BSP tree pass by looking for existing sky visplanes at the time, and their windows are used to define new portals.
The skybox portals are still incomplete and cause visual glitches when masked elements are involved.
2019-06-02 00:07:55 +02:00
39857a846a
PNG support
2019-05-26 23:37:23 -03:00
0bcf89679e
Hardware renderer: Fix polyobjects
2019-05-26 18:16:13 -03:00
a4a529bdb5
Hardware renderer: Disable Glide-specific texture handling
2019-05-26 17:41:10 -03:00
93f60267c1
Minor fixes
2019-05-26 16:22:33 -03:00
dc273d3f23
Merge branch 'next' into jimita-flashpals-on-screenshots
2019-05-25 19:37:17 -04:00
677801f5ff
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
e60b0b1a80
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
869f1e4e8d
Fix warnings
2019-05-21 11:03:53 -03:00
35d6da159d
HOLD UP
2019-05-21 09:50:39 -03:00
714c997aac
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
ec0719f74f
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
572328a4fa
Merge branch 'public_flatsprite'
2019-05-16 16:00:24 +01:00
66bc287688
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
b34aa86403
Hardcode some ACZ things
2019-05-11 22:56:23 -04:00
f30d91ee75
Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla
2019-05-08 17:59:49 -04:00
6d803decb6
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-08 17:56:05 -04:00
b304b268c8
No sprite billboarding on papersprites
2019-05-06 20:24:26 +01:00
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
8273534967
Add a cvar for sprite billboarding, off by default.
2019-05-06 16:57:32 +01:00
6aac014608
Generic model terminology
2019-05-02 22:55:45 -04:00
05b576dde8
Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla
2019-05-02 17:56:49 -04:00
39c422506e
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
0bbdfa8bef
Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla
2019-05-02 17:50:38 -04:00
79fed1e954
Unbind VBO from model during mid-frame
2019-05-02 17:49:10 -04:00
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
a9110c0645
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
696ccbd943
Fix mobj list iteration oversights.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 12:58:22 +02:00
39ba20be6b
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
cb986bf1c0
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
7321df8015
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
d2c6b995d3
split HWR_DrawPatchInCache into two functions: one for texture patches and one for everything else
2019-02-13 20:12:10 +00:00
497e79d1de
Turns out the consts ARE needed after all, also fix some other errors the compiler reported
2019-02-13 18:20:26 +00:00
ff2ebf20fb
blockmodulo and bpp do not need to be args of HWR_DrawPatchInCache
2019-02-13 17:27:20 +00:00
efa042a995
whoops, removed some variables I shouldn't have, so I've added them back
2019-02-13 16:52:51 +00:00
30a00c812c
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
d05caf5963
Update hw_md2.c -- add comment about anglef player->frameangle from Kart
2019-01-08 11:26:39 -05:00
66e6a6f940
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-01-07 04:06:45 -05:00
bbcc82e9b4
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
075f28b7c8
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
892e650712
dumb
2019-01-02 01:01:57 -03:00
e765b9400c
Add support for flashpals in screenshots
2019-01-02 00:41:52 -03:00
1a4f1e54f3
Merge branch 'timedemo-revise' into md3-vanilla
2018-12-29 12:09:32 -05:00
80e30c6aaa
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
1d9b8d357b
Add framecount increment to HWR_RenderPlayerView
...
Analogue to R_RenderPlayerView; used for timedemo FPS reading
2018-12-27 23:05:06 -05:00
34915f0508
Compile fix -- remove (void)alpha from DoScreenWipe
2018-12-27 22:29:12 -05:00
4f1f315563
Eliminate some old GL functions so we don't slide back into bad habits!
2018-12-27 22:10:10 -05:00
b83790260f
Fix screen transitions
2018-12-27 22:09:00 -05:00
f7a01c60a4
Buildbot fixes
2018-12-27 01:00:09 -05:00
f6e8b26af1
Compile fixes -- specify GLubyte for pglColor4ubv
2018-12-27 00:50:43 -05:00
587ffa9ada
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
a812acc3d4
Removed unused PF_Md2 flag
...
More OpenGL performance increase by making assumptions about client state
2018-12-27 00:30:07 -05:00
0978732ecd
boolean fix for VS
...
add GL_NORMALIZE
2018-12-27 00:24:21 -05:00
8c3e6642a7
Ignored fread fix
2018-12-27 00:01:51 -05:00
5ec40cf906
More mixed d&c fixes
2018-12-26 23:50:35 -05:00
52f668e9b0
byte -> char
2018-12-26 23:40:29 -05:00
036e44aa21
Mixed D&C fixes
2018-12-26 23:39:34 -05:00
b175629748
Fix floating point comparisons
2018-12-26 23:15:28 -05:00
74d6921f47
Merge tag 'SRB2_release_2.1.23' into md3-vanilla-ssn
2018-12-26 22:55:25 -05:00
b19252651f
Removed all glBegin/glEnd references
...
MD2/MD3 now works, with the exception of WAD textures for some odd reason
2018-12-23 17:00:11 -05:00
1b61e15b1b
Merge branch 'master' into SRB2-CHAT
2018-12-23 10:26:08 +01:00
102fd11cb4
More work to cleanup the ARM builds
2018-12-22 19:50:32 -05:00
b6a917cda1
Added ARM/ARM64 to whole vc10 sln
...
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
2018-12-21 16:47:10 -05:00
06ff171e19
Adjust vid.width floating point comparson for CHAT
2018-12-21 11:37:22 -05:00
58a2cec70f
Merge branch 'float_equal' into 'master'
...
Clear Float equal warnings
See merge request STJr/SRB2!383
2018-12-20 16:58:37 -05:00
6c5bb7f541
Small Mixed D&C fix
2018-12-19 20:56:58 -05:00
4728ad97eb
Fixed a few unnoticable mistakes [vanilla]
2018-12-19 20:52:47 -05:00
7982b1695a
Merge branch 'ogl-zfighting-fix' into 'master'
...
OpenGL z-fighting fix [by Azeonus]
Closes #43
See merge request STJr/SRB2!395
2018-12-19 13:05:04 -05:00
59826860ab
Ifdef nextFrame handling under USE_MODEL_NEXTFRAME
2018-12-19 10:33:13 -05:00
90bd80d17a
Interpolation fix attempt?
...
* Fix pglNormal3bv pointer because typo
2018-12-19 01:57:54 -05:00
c4f5bdc347
Adapt re-enabled DrawMD2 code block for meshes
2018-12-19 00:38:00 -05:00
98d18509e6
Hide/add Kart FTransform mirror and anglez behind ifdef
2018-12-19 00:17:51 -05:00
45f0f725cd
More hw_md2 merge errors; re-enable interpolation code block
2018-12-18 23:44:38 -05:00
65543545c6
hw_md2 merge errors
2018-12-18 22:50:00 -05:00
3a45b169eb
Ignore fread return value (buildbot error)
2018-12-18 20:48:55 -05:00
6b2f4b5858
Buildbot fixes (changed byte types to char; mixed d&c)
2018-12-18 20:23:08 -05:00
3dbda54d3c
GCC compile fixes
2018-12-18 19:17:33 -05:00
4276758491
Remove CONS_Printf message that isn't even doing what it says it is!
2018-12-18 17:52:53 -05:00
4713200fb5
push test
2018-12-18 17:52:50 -05:00
76dabd5e9d
Support for 'tinyframes', and lots more optimization
2018-12-18 17:52:47 -05:00
3ed0edbcfe
Common model format, with MD2/MD3 loading
2018-12-18 17:52:45 -05:00
96cad09db6
Change 0.05 to 0.05f
2018-12-18 16:59:59 -05:00
67cd6dcdd2
dispoffset OGL fix [by Azeonus]
2018-12-18 16:50:03 -05:00
1d40676f3a
Merge branch 'master' into automap_fix
2018-12-17 17:46:29 -02:00
11aef0b3f1
Merge branch 'master' into float_equal
2018-12-16 13:52:45 -05:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
15d0673685
fix compiling for clang
2018-12-14 21:31:37 -05:00
78634679f1
fix compiling for MSVC
2018-12-14 20:42:37 -05:00
6fd66bdb49
Clear float equal warnings
2018-12-14 20:34:06 -05:00
e0079ea1a2
remove NearVertice (which was unused anyway), clean up maz's changes
2018-12-14 23:28:07 +00:00
abae63a64b
SameVertice floating point match; fixes 64-bit OGL holes
2018-12-14 16:47:24 -05:00
c1e0041a0b
copy doom legacy's replacement for the den == 0.0 calc in fracdivline
2018-12-14 21:22:13 +00:00
623d1574ce
minor cleanup
2018-12-14 21:00:53 +00:00
b42c306ef3
remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway
2018-12-14 18:14:08 +00:00
52fd3dcbed
split loading status code into a separate function
2018-12-14 18:11:30 +00:00
02fc845a72
Make sure nptfront is explicitly > 0, so we don't alloc a poly for negative number points at all
2018-12-14 18:01:18 +00:00
4089b6b8e9
use continue if NULL instead of a big if block if ...not NULL
...
also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards
2018-12-14 18:00:08 +00:00
3a125dbbd5
compare with actual doubles, not ints
2018-12-14 17:14:03 +00:00
6b22dc183b
Fix the automap
2018-12-12 18:01:52 -03:00
4b0d45afd8
Merge branch 'opengl-noloading' into 'master'
...
Hide OpenGL loading screen
See merge request STJr/SRB2!349
2018-11-26 15:30:45 -05:00
a71ca1d259
Merge branch 'fof-slope-skew-backport' into 'master'
...
FOF wall slope skewing backport
See merge request STJr/SRB2!341
2018-11-26 08:54:29 -05:00
930835f1a2
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
2018-11-25 21:47:56 -05:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
0a0336a674
Merge branch 'master' into fof-slope-skew-backport
...
# Conflicts:
# src/r_segs.c
2018-11-23 22:40:28 +00:00
30b9cef043
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
...
Render the skies correctly on splitscreen in OpenGL mode
2018-11-23 14:48:05 -05:00
bb38aa649f
Merge branch 'nov20-build-fixes' into 'master'
...
Nov20 build fixes
See merge request STJr/SRB2Internal!205
2018-11-21 17:23:20 -05:00
74da082c75
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
c0df7b47c5
Merge branch 'c88bbda028a21a51058488ee0214ce925625f0a0' into nov20-build-fixes
...
# Conflicts:
# src/hardware/hw_main.c
2018-11-20 22:42:20 -05:00
ddd357d27c
VC build fixes
2018-11-20 21:54:20 -05:00
224c0fccdb
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
3e6fcf1b8b
Merge branch 'opengl-hud-scale-fix' into 'master'
...
OpenGL HUD scaling fix
See merge request STJr/SRB2!320
2018-11-14 16:48:13 -05:00
f73ea4f984
Clean up warnings
2018-11-14 10:52:16 -05:00
0d38061db8
Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode
2018-11-13 18:13:51 +00:00
6c69dd1f78
Merge branch 'master' into text-prompts
2018-11-13 11:12:44 -05:00
a362407886
Merge branch 'control-selector' into text-prompts
2018-11-12 21:11:53 -05:00
eb4a72440a
Render the skies correctly on splitscreen in OpenGL mode
2018-11-10 16:19:41 -03:00
e4f157786c
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/doomtype.h
# src/hardware/hw_clip.c
# src/hardware/hw_main.c
# src/sdl12/sdl_sound.c
2018-11-10 19:18:34 +00:00
323c89dbaf
fix using abs() on unsigned
2018-11-10 17:40:09 +00:00
dd83652b71
Whoops, this broke my non-NEWCLIP test build
2018-11-10 16:10:25 +00:00
c4569e61a8
Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly
...
R_IsEmptyLine is now a thing too btw
2018-11-10 16:09:21 +00:00
1e98e3b4f2
More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now
...
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
2018-11-10 16:08:56 +00:00
a733a29f4c
Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least
...
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
2018-11-10 16:08:26 +00:00
d456a5362c
Whoops, mucked up this part of the conflict resolving
2018-11-10 15:55:09 +00:00
268bde3fdf
Merge branch 'public_next'
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
2018-11-10 15:41:57 +00:00
925a56ad98
Merge branch 'opengl-improvements-backport' into 'master'
...
Opengl improvements backport
See merge request STJr/SRB2!304
2018-11-10 09:25:18 -05:00
9ee894f777
Make gray/black text prompt backcolor darker in OpenGL
2018-11-09 22:52:13 -05:00
444462732b
added HWR_DrawTutorialBack for OpenGL
2018-11-04 22:32:46 -05:00
2fa0896fd0
Fix an error I made in HWR_DrawFixedPatch
2018-10-30 13:44:01 +00:00
b022ff02a5
add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well
2018-10-29 13:34:54 +00:00
f8fd8f8ec5
HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields
2018-10-29 13:29:16 +00:00
32077897b6
Removed all remaining traces of VID_X11 code in hw_drv.h and hw_data.h, the macro is no longer used by Linux etc versions of SRB2.
...
Unlike the rest of the commits in this branch (as of writing), I didn't make this commit between 1 and 2 years ago, I made it right now ;)
2018-10-27 19:58:51 +01:00
aebcf3520b
Remove pointless drawtextured variable and redundant fake planes checks (R_FakeFlat would already have made gr_frontsector/backsector something else if they were)
2018-10-27 19:32:55 +01:00
3d88ee9d55
Added missing checks in HWR_AddLine from the software version, move v** vars to the top since R_PointToAngle calls use the same values anyway
2018-10-27 19:31:24 +01:00
09eecd36b4
Hack to make sure even (extra)subsectors without planepolys have segs adjusted
...
this fixes a crash in (old) GFZ2 at the ramp as a result of creating pv1/pv2. This probably means before pv1/pv2 there could have been some silly typecasting from vertex_t to polyvertex_t to get fixed vertex coords and such...
2018-10-27 19:29:45 +01:00
90cfa5ef16
Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore
...
Yes I know they're void * in r_defs.h's seg_t definition, it's quicker than trying to figure out if including hardware/hw_glob.h is a good idea or not
2018-10-27 19:29:31 +01:00
1cf2ce63c0
More optimising and otherwise fixing bizarre formatting in hw_trick.c
2018-10-27 18:58:05 +01:00
2107aab666
Moved my added slope checks in hw_trick.c to isCeilingFloating/isFloorFloating
...
I also optimised those two functions while I was there (why keep a "floating" variable when setting it to false guarantees the functions return false?)
2018-10-27 18:57:28 +01:00
787d5b598d
gr_correcttricks fix: don't check if top/bottom textures are missing for sloped sectors, just ignore and cancel the hack
...
This fixes GFZ2's mysterious flying flats at the ramp to the big room
2018-10-27 18:56:38 +01:00
67a2922558
Ensure file is closed whenever MD2 reading errors happen
2018-10-27 18:53:38 +01:00
b150e842fc
Add MD2_INDENT and MD2_VERSION so we can cleanly check that it's a valid MD2 from magic number/version
2018-10-27 18:53:18 +01:00
b5c4b476a6
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
61a29bed85
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
d3da4cb527
Merge branch 'fof-slope-skew-backport'
2018-10-10 14:53:01 +01:00
291ebf302c
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/lua_script.c
# src/p_user.c
# src/sdl/i_system.c
# src/v_video.c
# src/w_wad.c
2018-10-10 14:51:34 +01:00
b1e02467bf
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
2018-10-07 15:00:58 +01:00
872e2f82c1
Redo OpenGL skewing support, so that it now itself supports the lower unpegged effect for FOFs in OpenGL!
2018-09-28 17:02:02 +01:00
17cf310b84
nodigimusic nomusic nosound refactor other targets
...
(cherry picked from commit 86f151db65
2018-09-14 10:35:56 -04:00
62b6950e33
Use lightlist.extra_colormap double pointers in OpenGL
2018-09-12 16:28:55 -04:00
1af8d3ac02
Merge branch 'master' into hud-n-menu-tidbits
...
# Conflicts:
# src/m_menu.c
# src/screen.c
# src/st_stuff.c
2018-08-28 20:51:46 +01:00
b5ec286667
Merge branch 'master' into hardcoding-time-again
2018-08-02 16:04:54 +01:00
be5d0406bd
Merge branch 'public_next'
...
# Conflicts:
# src/hardware/hw_md2.c
2018-07-31 19:41:54 +01:00
ad187c26f0
Repositionning chat & bugfixes
2018-07-31 15:57:19 +02:00
ac7c249fd2
SRB2chat test rework
2018-07-31 11:10:02 +02:00
c88bbda028
fix visual studio complaining about negating an unsigned var
2018-07-25 22:19:07 +01:00
8e19611033
Merge branch 'opengl-fof-lowerunpegged' into 'master'
...
OpenGL: FOF walls + Lower unpegged
See merge request STJr/SRB2!258
2018-07-11 16:36:26 -04:00
c127ea3ceb
Merge branch 'opengl-projectsprite-fix' into 'master'
...
OpenGL HWR_ProjectSprite fix
See merge request STJr/SRB2!255
2018-07-11 16:15:42 -04:00
f1bba60373
Merge branch 'md2-fopen-error' into 'master'
...
More helpful error messages
See merge request STJr/SRB2!243
2018-07-06 14:38:59 -04:00
Alam Arias