Commit graph

665 commits

Author SHA1 Message Date
Monster Iestyn 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
Monster Iestyn 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
toaster 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
toaster 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
Steel Titanium ec8f64100e Hardcode brick debris 2019-07-06 00:36:02 -04:00
toaster 4ad1703ae3 Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'""
This reverts commit c04b560e92.
2019-07-03 00:58:02 +01:00
MascaraSnake c04b560e92 Revert "Merge branch 'metalfixes' into 'toast_cleanup'"
This reverts merge request !239
2019-07-02 23:49:10 +00:00
MascaraSnake e9978b2955 Merge branch 'master' into thinkerlists
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
2019-07-02 23:08:37 +02:00
mazmazz dc0a92ea62 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla 2019-06-29 17:51:30 -04:00
mazmazz 521d8fd8c1 Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-06-29 15:02:07 -04:00
toaster 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
toaster 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
Jaime Passos 28566008b4 Merge remote-tracking branch 'upstream/master' into flats-png 2019-06-25 16:02:35 -03:00
toaster 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
toaster 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
toaster 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
toaster 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
MascaraSnake 95a0b3fc86 Merge branch 'master' into new-acz-minecarts 2019-06-17 20:43:21 +02:00
MascaraSnake ba9c7d9310 More incomplete minecart hardcoding 2019-06-13 21:45:30 +02:00
MascaraSnake fafabaae2b Hardcoded the saloon door 2019-06-12 21:20:14 +02:00
MascaraSnake 068e07974d Hardcoded the new Snapper behavior 2019-06-10 20:32:50 +02:00
Nev3r ae6997621d Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2 2019-06-10 18:14:03 +02:00
MascaraSnake 0e80d2ec5d Hardcoded the new Minus behavior 2019-06-10 17:42:37 +02:00
MascaraSnake 98ea229680 Hardcoded the Canarivore 2019-06-10 13:58:16 +02:00
Monster Iestyn 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
MascaraSnake 3a16a7d7d4 Hardcoded train dust and steam spawner 2019-06-09 17:16:07 +02:00
MascaraSnake 6df14492a5 Hardcoded train cameo 2019-06-09 13:48:07 +02:00
MascaraSnake ca4ab06abf Hardcoded wood debris 2019-06-09 12:27:09 +02:00
MascaraSnake 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
MascaraSnake 546af19c82 Hardcoded oil lamp 2019-06-08 15:50:01 +02:00
MascaraSnake 1aaccfcd5c Hardcoded dust devil 2019-06-08 09:51:46 +02:00
Nev3r 0795c7811a Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2 2019-06-07 13:11:51 +02:00
Nev3r 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
Jaime Passos 39857a846a PNG support 2019-05-26 23:37:23 -03:00
Jaime Passos 0bcf89679e Hardware renderer: Fix polyobjects 2019-05-26 18:16:13 -03:00
Jaime Passos a4a529bdb5 Hardware renderer: Disable Glide-specific texture handling 2019-05-26 17:41:10 -03:00
Jaime Passos 93f60267c1 Minor fixes 2019-05-26 16:22:33 -03:00
Steel Titanium dc273d3f23 Merge branch 'next' into jimita-flashpals-on-screenshots 2019-05-25 19:37:17 -04:00
Monster Iestyn 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
Monster Iestyn 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
Jaime Passos 869f1e4e8d Fix warnings 2019-05-21 11:03:53 -03:00
Jaime Passos 35d6da159d HOLD UP 2019-05-21 09:50:39 -03:00
Jaime Passos 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
Monster Iestyn 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
Monster Iestyn 572328a4fa Merge branch 'public_flatsprite' 2019-05-16 16:00:24 +01:00
Monster Iestyn 66bc287688 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Steel Titanium b34aa86403 Hardcode some ACZ things 2019-05-11 22:56:23 -04:00
mazmazz f30d91ee75 Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla 2019-05-08 17:59:49 -04:00
mazmazz 6d803decb6 Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-05-08 17:56:05 -04: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
Steel Titanium 6aac014608 Generic model terminology 2019-05-02 22:55:45 -04:00
mazmazz 05b576dde8 Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla 2019-05-02 17:56:49 -04:00
Jaime Passos 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
mazmazz 0bbdfa8bef Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla 2019-05-02 17:50:38 -04:00
Jaime Passos 79fed1e954 Unbind VBO from model during mid-frame 2019-05-02 17:49:10 -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
Nev3r 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
Nev3r 696ccbd943 Fix mobj list iteration oversights.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 12:58:22 +02:00
Nev3r 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
Monster Iestyn 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
Monster Iestyn 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
Monster Iestyn d2c6b995d3 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 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
Monster Iestyn ff2ebf20fb blockmodulo and bpp do not need to be args of HWR_DrawPatchInCache 2019-02-13 17:27:20 +00:00
Monster Iestyn efa042a995 whoops, removed some variables I shouldn't have, so I've added them back 2019-02-13 16:52:51 +00:00
Monster Iestyn 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
Digiku d05caf5963 Update hw_md2.c -- add comment about anglef player->frameangle from Kart 2019-01-08 11:26:39 -05:00
mazmazz 66e6a6f940 Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-01-07 04:06:45 -05:00
mazmazz 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
mazmazz 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
Jimita the Cat 892e650712 dumb 2019-01-02 01:01:57 -03:00
Jimita the Cat e765b9400c Add support for flashpals in screenshots 2019-01-02 00:41:52 -03:00
mazmazz 1a4f1e54f3 Merge branch 'timedemo-revise' into md3-vanilla 2018-12-29 12:09:32 -05:00
Digiku 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
mazmazz 1d9b8d357b Add framecount increment to HWR_RenderPlayerView
Analogue to R_RenderPlayerView; used for timedemo FPS reading
2018-12-27 23:05:06 -05:00
mazmazz 34915f0508 Compile fix -- remove (void)alpha from DoScreenWipe 2018-12-27 22:29:12 -05:00
Arthur 4f1f315563 Eliminate some old GL functions so we don't slide back into bad habits! 2018-12-27 22:10:10 -05:00
Arthur b83790260f Fix screen transitions 2018-12-27 22:09:00 -05:00
mazmazz f7a01c60a4 Buildbot fixes 2018-12-27 01:00:09 -05:00
mazmazz f6e8b26af1 Compile fixes -- specify GLubyte for pglColor4ubv 2018-12-27 00:50:43 -05:00
Arthur 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
Arthur a812acc3d4 Removed unused PF_Md2 flag
More OpenGL performance increase by making assumptions about client state
2018-12-27 00:30:07 -05:00
Arthur 0978732ecd boolean fix for VS
add GL_NORMALIZE
2018-12-27 00:24:21 -05:00
mazmazz 8c3e6642a7 Ignored fread fix 2018-12-27 00:01:51 -05:00
mazmazz 5ec40cf906 More mixed d&c fixes 2018-12-26 23:50:35 -05:00
mazmazz 52f668e9b0 byte -> char 2018-12-26 23:40:29 -05:00
mazmazz 036e44aa21 Mixed D&C fixes 2018-12-26 23:39:34 -05:00
mazmazz b175629748 Fix floating point comparisons 2018-12-26 23:15:28 -05:00
mazmazz 74d6921f47 Merge tag 'SRB2_release_2.1.23' into md3-vanilla-ssn 2018-12-26 22:55:25 -05:00
Arthur 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
Latapostrophe 1b61e15b1b Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
Alam Ed Arias 102fd11cb4 More work to cleanup the ARM builds 2018-12-22 19:50:32 -05:00
Alam Arias 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
mazmazz 06ff171e19 Adjust vid.width floating point comparson for CHAT 2018-12-21 11:37:22 -05:00
Digiku 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
mazmazz 6c5bb7f541 Small Mixed D&C fix 2018-12-19 20:56:58 -05:00
AJ Freda 4728ad97eb Fixed a few unnoticable mistakes [vanilla] 2018-12-19 20:52:47 -05:00
Digiku 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
mazmazz 59826860ab Ifdef nextFrame handling under USE_MODEL_NEXTFRAME 2018-12-19 10:33:13 -05:00
mazmazz 90bd80d17a Interpolation fix attempt?
* Fix pglNormal3bv pointer because typo
2018-12-19 01:57:54 -05:00
mazmazz c4f5bdc347 Adapt re-enabled DrawMD2 code block for meshes 2018-12-19 00:38:00 -05:00
mazmazz 98d18509e6 Hide/add Kart FTransform mirror and anglez behind ifdef 2018-12-19 00:17:51 -05:00
mazmazz 45f0f725cd More hw_md2 merge errors; re-enable interpolation code block 2018-12-18 23:44:38 -05:00
mazmazz 65543545c6 hw_md2 merge errors 2018-12-18 22:50:00 -05:00
mazmazz 3a45b169eb Ignore fread return value (buildbot error) 2018-12-18 20:48:55 -05:00
mazmazz 6b2f4b5858 Buildbot fixes (changed byte types to char; mixed d&c) 2018-12-18 20:23:08 -05:00
mazmazz 3dbda54d3c GCC compile fixes 2018-12-18 19:17:33 -05:00
Arthur 4276758491 Remove CONS_Printf message that isn't even doing what it says it is! 2018-12-18 17:52:53 -05:00
Arthur 4713200fb5 push test 2018-12-18 17:52:50 -05:00
Arthur 76dabd5e9d Support for 'tinyframes', and lots more optimization 2018-12-18 17:52:47 -05:00
Arthur 3ed0edbcfe Common model format, with MD2/MD3 loading 2018-12-18 17:52:45 -05:00
mazmazz 96cad09db6 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00
Azeonus 67cd6dcdd2 dispoffset OGL fix [by Azeonus] 2018-12-18 16:50:03 -05:00
Jimita 1d40676f3a
Merge branch 'master' into automap_fix 2018-12-17 17:46:29 -02:00
Alam Ed Arias 11aef0b3f1 Merge branch 'master' into float_equal 2018-12-16 13:52:45 -05:00
Latapostrophe 25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
Alam Ed Arias 15d0673685 fix compiling for clang 2018-12-14 21:31:37 -05:00
Alam Ed Arias 78634679f1 fix compiling for MSVC 2018-12-14 20:42:37 -05:00
Alam Ed Arias 6fd66bdb49 Clear float equal warnings 2018-12-14 20:34:06 -05:00
Monster Iestyn e0079ea1a2 remove NearVertice (which was unused anyway), clean up maz's changes 2018-12-14 23:28:07 +00:00
mazmazz abae63a64b SameVertice floating point match; fixes 64-bit OGL holes 2018-12-14 16:47:24 -05:00
Monster Iestyn c1e0041a0b copy doom legacy's replacement for the den == 0.0 calc in fracdivline 2018-12-14 21:22:13 +00:00
Monster Iestyn 623d1574ce minor cleanup 2018-12-14 21:00:53 +00:00
Monster Iestyn b42c306ef3 remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway 2018-12-14 18:14:08 +00:00
Monster Iestyn 52fd3dcbed split loading status code into a separate function 2018-12-14 18:11:30 +00:00
Monster Iestyn 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
Monster Iestyn 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
Monster Iestyn 3a125dbbd5 compare with actual doubles, not ints 2018-12-14 17:14:03 +00:00
MPC 6b22dc183b Fix the automap 2018-12-12 18:01:52 -03:00
Monster Iestyn 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
Monster Iestyn 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
mazmazz 930835f1a2 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Monster Iestyn 0a0336a674 Merge branch 'master' into fof-slope-skew-backport
# Conflicts:
#	src/r_segs.c
2018-11-23 22:40:28 +00:00
Alam Arias 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
Digiku 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
mazmazz 74da082c75 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-20 23:19:36 -05:00
Marco Z c0df7b47c5 Merge branch 'c88bbda028a21a51058488ee0214ce925625f0a0' into nov20-build-fixes
# Conflicts:
#	src/hardware/hw_main.c
2018-11-20 22:42:20 -05:00
Marco Z ddd357d27c VC build fixes 2018-11-20 21:54:20 -05:00
Monster Iestyn 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
Monster Iestyn 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
Alam Ed Arias f73ea4f984 Clean up warnings 2018-11-14 10:52:16 -05:00
Monster Iestyn 0d38061db8 Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode 2018-11-13 18:13:51 +00:00
mazmazz 6c69dd1f78 Merge branch 'master' into text-prompts 2018-11-13 11:12:44 -05:00
mazmazz a362407886 Merge branch 'control-selector' into text-prompts 2018-11-12 21:11:53 -05:00
MPC eb4a72440a Render the skies correctly on splitscreen in OpenGL mode 2018-11-10 16:19:41 -03:00
Monster Iestyn 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
Monster Iestyn 323c89dbaf fix using abs() on unsigned 2018-11-10 17:40:09 +00:00