lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
10559 commits 1 branch 29 tags 122 MiB
Commit graph

960 commits

Author SHA1 Message Date
Jaime Passos 228b29e23b HWR_AllowModel 2019-12-12 22:53:19 -03:00
Jaime Passos ca83bafae8 Initialise the variable, obviously 2019-12-12 22:32:19 -03:00
Jaime Passos a138a3ab5f Merge remote-tracking branch 'origin/dashmode-shader' into opengl-is-a-bad-renderer 2019-12-12 22:31:34 -03:00
Jaime Passos 08794559f0 Fix TC_ blending 2019-12-12 22:26:28 -03:00
Jaime Passos 01399c7076 Update hw_main.c 2019-12-12 21:52:59 -03:00
Jaime Passos ff348fb60a Add missing prototype, ugh 2019-12-12 21:43:19 -03:00
Jaime Passos af3cf93683 grafik designe is m passion 2019-12-12 21:41:13 -03:00
Jaime Passos d80bfb4e94 PU_HWRCACHE_UNLOCKED bmomento bróder 2019-12-12 21:23:55 -03:00
Jaime Passos 08d4a36f63 Texture blending port 
Co-authored-by: TehRealSalt <tehrealsalt@gmail.com>
 2019-12-12 21:22:36 -03:00
Jaime Passos 6c3111d809 Stop crashing with models because someone keeps freeing those tags 2019-12-12 19:54:47 -03:00
Jaime Passos 3bebfb279e Fix gr_anisotropicmode 2019-12-12 18:28:05 -03:00
Jaime Passos 58a08504c8 Make gr_spritebillboarding on by default sorry not sorry Azeon 2019-12-12 17:48:43 -03:00
Jaime Passos a4b0195430 Model lighting 2019-12-12 17:48:29 -03:00
Jaime Passos f077d17301 Save filtering mode and anisotropic mode cvars to config 2019-12-12 17:37:55 -03:00
Jaime Passos db61d1a705 Remove HWR_AddEngineCommands 2019-12-12 17:35:41 -03:00
Jaime Passos bf520b9e33 Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!! 2019-12-12 17:30:19 -03:00
Jaime Passos 08e3caf9bb Remove unused cvars 2019-12-12 16:53:31 -03:00
Jaime Passos 792750ee48 Add HWD_SET_MODEL_LIGHTING state 2019-12-12 16:48:37 -03:00
Jaime Passos 0652ffd67f Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
lachwright 8a70759e0a Add TC_DASHMODE color shader 2019-12-12 01:27:41 +08:00
Jaime Passos 9248f12d55 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Jaime Passos 4d83db5bb2 Die, Apple! 2019-12-08 22:31:59 -03:00
Jaime Passos 5c02bc59db Speed up level loading 
Don't flush every texture just because the palette MAY have changed
 2019-12-08 22:28:13 -03:00
Jaime Passos c6769e7220 Die 2019-12-08 22:12:56 -03:00
Jaime Passos 7f58002e12 Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer 2019-12-08 21:10:48 -03:00
Jaime Passos 25464c867a Translate the French 2019-12-08 21:10:14 -03:00
Alam Ed Arias e91a689478 Merge branch 'master' into opengl-is-a-bad-renderer 2019-12-08 12:50:45 -05:00
Alam Ed Arias 623629b04a OpenGL: note that the Buffer API is OpenGL 1.5, so we can be used in STATIC_OPENGL 2019-12-08 12:33:11 -05:00
Alam Ed Arias 35168ddeae OpenGL: yflip is used to hold more then true/false 2019-12-08 12:32:23 -05:00
Jaime Passos d8a804febc LMFAOOOOOOOOOOOOOOOOOOOOOOOO 2019-12-08 04:15:25 -03:00
Jaime Passos cc12496e9c Optimize mipmaps 2019-12-08 03:23:37 -03:00
Jaime Passos ce61b17117 Update hw_main.c 2019-12-08 02:27:51 -03:00
Jaime Passos 964978a337 Delete md2_transform 2019-12-08 02:25:53 -03:00
Jaime Passos bc60a0a887 Make some things clearer here. 2019-12-08 01:54:03 -03:00
Jaime Passos 40b862967d Just in case? 2019-12-07 23:55:28 -03:00
Jaime Passos e9e0683d5e Cleanup FreeMipmapColormap 2019-12-07 23:46:05 -03:00
MascaraSnake a3549cc8f2 Merge branch 'datestuff' into 'master' 
Date stuff

See merge request STJr/SRB2Internal!618
 2019-12-06 16:10:36 -05:00
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
Alam Ed Arias f576e61753 OpenGL cast to float, not store in double 2019-12-06 13:45:11 -05:00
Alam Ed Arias 3120c99eeb Fix compiling for MSVC 2019-12-05 12:38:50 -05:00
Jaime Passos 81cfca29d8 Fix FreeMipmapColormap yet again 2019-12-04 15:50:17 -03:00
Alam Ed Arias b5738620c1 Fixup compiling errors 2019-12-02 12:12:26 -05:00
Jaime Passos c9ff8ec26b Fix FreeMipmapColormap crash 2019-11-24 17:37:11 -03:00
toaster 95ed442d55 Prevent Knuckles latching onto horizon special linedefs. 
Also, update all references to the horizon special to use a #defined constant instead of a magic number.
 2019-11-23 14:20:41 +00:00
MascaraSnake 6545284eaf Merge branch 'gfz-debris' into 'master' 
VAdaPEGA's GFZ debris

See merge request STJr/SRB2Internal!505
 2019-11-22 15:27:11 -05:00
lachwright c5d085d333 Add missing GFZD spriteset 2019-11-21 01:14:24 +08:00
Jaime Passos e0a9b3d695 Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes 2019-11-19 21:49:45 -03:00
MascaraSnake 2418e33a00 Merge branch 'cobalt-ai' into 'master' 
CobaltBW's Tails AI

See merge request STJr/SRB2Internal!358
 2019-11-18 17:26:28 -05:00
Jaime Passos 1e4060af8c remove unused levelwipes 2019-11-18 19:22:46 -03:00
MascaraSnake 3df0afb7db Merge branch 'f_wipes' into 'master' 
Colormapped fades

See merge request STJr/SRB2Internal!469
 2019-11-18 17:21:09 -05:00
MascaraSnake 7dc3484e5d Merge branch 'dragonbomber' into 'master' 
Dragonbomber

See merge request STJr/SRB2Internal!489
 2019-11-18 17:10:30 -05:00
Jaime Passos 8a05afa1aa Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
toaster 1fdcc270d8 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai 
# Conflicts:
#	src/p_map.c
 2019-11-18 21:33:51 +00:00
Jaime Passos aa659836ee Merge remote-tracking branch 'origin/master' into titlecards 2019-11-18 17:55:47 -03:00
Jaime Passos 6c98dde736 stuff 2019-11-18 11:39:54 -03:00
lachwright bb67b24143 Add flight indicator 2019-11-18 15:17:27 +08:00
toaster 4cc1b2b327 Disable the GL sprite shadows behind a #define. 
Reasoning:
* They're horribly broken (they completely ignore slopes).
* A similar final demo GL-only feature (coronas) has been completely disabled.
* Nobody's going to bugfix them before release because not even the devteam's resident GL users use them.
* They look ugly.
 2019-11-17 22:18:46 +00:00
lachwright b721c035f8 Add Dragonbomber enemy 2019-11-18 05:23:59 +08:00
Jaime Passos 12e8c11382 Update hw_main.c 2019-11-15 19:40:58 -03:00
Jaime Passos 55c42d9cb7 Small mistake 2019-11-15 19:36:25 -03:00
Jaime Passos 5b0730839b Move scope of wipelumpname 2019-11-15 19:09:02 -03:00
Jaime Passos 41835e07ea I don't get it 2019-11-15 19:04:40 -03:00
Jaime Passos 7ba7620059 Shadowed declaration and unused parameters 2019-11-15 18:58:45 -03:00
Jaime Passos c15ee65015 LEVELWIPES 2019-11-15 18:21:12 -03:00
Jaime Passos d95a93b537 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -03:00
Jaime Passos 10d1b63ff2 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-14 12:49:03 -03:00
Jaime Passos a9183b474b rename rollaxis to rotaxis 2019-11-13 12:47:30 -03:00
Jaime Passos b54f6181c3 Rotation axis (will rename internally later) 2019-11-13 12:36:44 -03:00
MascaraSnake d591554a5d Merge branch 'radiomode' into 'master' 
Radio mode

See merge request STJr/SRB2Internal!443
 2019-11-13 04:16:38 -05:00
Jaime Passos 245881ec55 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
Jaime Passos 3354169769 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
Jaime Passos c6253bb6f9 Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
Jaime Passos 05e5fa1637 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-11-12 18:26:51 -03:00
MascaraSnake 66123b8165 Merge branch 'internal-md3-vanilla-c' into 'master' 
Internal MD3 merge 2 good riddance glBegin

See merge request STJr/SRB2Internal!362
 2019-11-12 15:44:20 -05:00
MascaraSnake 17c302e4a3 Merge branch 'texture-flats-optimization' into 'master' 
Texture flat optimization

Closes #257

See merge request STJr/SRB2Internal!405
 2019-11-12 15:42:04 -05:00
MascaraSnake 6b567bfb5c Merge branch 'dashmodecut' into 'master' 
Dashmode polish

Closes #266

See merge request STJr/SRB2Internal!418
 2019-11-12 15:40:46 -05:00
Jaime Passos 91a01be891 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-11 14:41:55 -03:00
Jaime Passos 408288255f Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-11-11 14:10:37 -03:00
Jaime Passos 4e6513b583 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-11 14:05:03 -03:00
Jaime Passos 61164ea310 Trying to make sense of chroma keying 2019-11-09 14:09:20 -03:00
Jaime Passos a9e3e0c00e Support OpenGL 2019-11-09 13:28:56 -03:00
Jaime Passos 249cf5c8ad fix invisible planes, fix flat animation 2019-11-08 23:42:15 -03:00
Jaime Passos ae838d4879 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-08 23:01:29 -03:00
Jaime Passos 809f79c951 make hwrender compile 2019-11-08 22:58:41 -03:00
James R 99cd5161be Also allocate mipmap for MD2 2019-11-07 18:04:53 -08:00
James R d2a7a87c7f Fix nonpacked to packed cast for OpenGL 2019-11-07 16:30:29 -08:00
James R b157c21a35 There's some whitespace... 2019-11-07 14:56:42 -08:00
toaster 5f8671b100 Sound test is cool now! 
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif

* Port MUSICDEFs from Kart.
    * Safe to modify without modifying game, so we can put it in music.dta eventually.
    * "Title", "AltTitle", "Authors" fields are self-evident.
    * "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
    * "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
    * Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
    * Now called "V_DrawStretchyFixedPatch".
    * "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
    * Available to Lua under v.drawStretched!
    * Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.

Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
 2019-11-05 16:23:46 +00:00
Jaime Passos 044d3fd325 Update hw_main.c 2019-11-05 12:31:50 -03:00
Jaime Passos 00d76bd9ef fix fades for real 2019-11-05 12:10:42 -03:00
Jaime Passos 4ff769704a function renaming 2019-11-05 10:28:19 -03:00
Jaime Passos 55c6c4f5fe Attempt to fix sky dome 2019-11-04 14:36:12 -03:00
Jaime Passos 8ac49d8855 add gr_modelinterpolation 2019-11-04 12:21:53 -03:00
toaster ef886e4b80 Fix TC_DASHMODE and associated not being applied in GL. (Won't conflict with md3 branch because these lines weren't modified there!) 2019-11-04 13:11:04 +00:00
toaster e7e3c6ccbb Slightly unrelated to the express purpose of the branch, but since I was here, and I noticed it was a problem when ~~playing~~ testing with md3s in ACZ: Don't draw the midtextures for horizon lines. 2019-11-03 10:23:21 +00:00
Jaime Passos 751d398321 Fix sky dome 2019-11-02 17:33:36 -03:00
toaster 915e50a1e4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c 
Merge seems fine, but won't compile for some reason.
 2019-11-02 18:34:12 +00:00
toaster 8909598baf Instead of checking for mod being nonzero, pretend it's 1 - after all, there's no good behaviour in that circumstance otherwise. 2019-11-02 18:25:56 +00:00
toaster 417f17ebdd Do a bunch of stuff to the MD2/3 sprite2 support to get it back to feature parity with before, without going back to being hacky as fuck. 
* Store the number of frames per sprite2 run in the spr2frames struct.
* Reintroduce P_GetModelSprite2, to allow for the sprite2 defaulting system to be used to full advantage even in GL.
* Instead of splitting the SUPER and normal SPR2 stuff within the same cell of the struct, have them exist in different cells just like in the "normal" sprite2 structs.
* Allow for just providing spr2 frames in order without specifying which "normal" sprite2 frame it's supposed to replace.

Also:
* Fix FF_VERTICALFLIP-ignoring regression.
* Fix whitespace adjustment in win_dll.c
* Remove bracket in P_GetSkinSprite2 because I realised it was extraneous while making sure P_GetModelSprite2 worked with it.
 2019-11-02 17:52:54 +00:00
Jaime Passos 0a49340ae1 Fix warnings when NOPNG=1 2019-10-28 23:46:33 -03:00
Jaime Passos 94ab276508 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
Jaime Passos a22af36305 add r_patch.c 2019-10-28 15:28:42 -03:00
Jaime Passos 79e99dc471 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03:00
MascaraSnake 4d022046fa Merge branch 'object_tweaks' into 'master' 
Object tweaks (object_tweaks division 3)

See merge request STJr/SRB2Internal!394
 2019-10-25 17:45:48 -04:00
MascaraSnake 2a8e5b7bff Merge branch 'james-kart' into 'master' 
My changes to Kart

See merge request STJr/SRB2Internal!406
 2019-10-25 15:36:40 -04:00
toaster f2596ab0bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks 
# Conflicts:
#	extras/conf/SRB2-22.cfg
 2019-10-25 20:32:15 +01:00
James R 0b314a82bb Use long double suffix 2019-10-22 21:48:15 -07:00
lachwright 3a3122e255 Add green flame sprites, state, and object 2019-10-21 16:22:20 +08:00
lachwright d6411b9549 Add new ATZ gargoyle sprites 2019-10-21 13:43:02 +08:00
toaster dfd6c5b9d2 Fix hw_light.c list (not gonna make an exe for this) 2019-10-19 15:50:16 +01:00
toaster 5502242e8b MD2 crash fix. 2019-10-13 11:59:38 +01:00
MascaraSnake a03ecac921 Merge branch 'openglskydome2' into 'master' 
OpenGL sky dome

See merge request STJr/SRB2Internal!350
 2019-10-12 11:06:47 -04:00
MascaraSnake 6fab3d28b2 Merge branch 'OGL_regressions' into 'master' 
Correct minor OGL regressions

See merge request STJr/SRB2Internal!361
 2019-10-12 09:53:20 -04:00
MascaraSnake d735e1b9c2 Merge branch 'rvz-hardcode' into 'master' 
RVZ hardcode

Closes #178

See merge request STJr/SRB2Internal!357
 2019-10-12 09:37:23 -04:00
MascaraSnake 68a82c3849 Merge branch 'amycameo' into 'master' 
Amy for Frozen Hillside (full pitch in description)

See merge request STJr/SRB2Internal!356
 2019-10-12 07:16:26 -04:00
MascaraSnake 68599ccc63 Only apply NiGHTS draw distance to hoops, because it turns out they're pretty much the sole cause of NiGHTS lag 2019-10-11 21:02:11 +02:00
toaster 1155a7c3a0 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode 
# Conflicts:
#	src/p_mobj.c
 2019-10-08 19:43:43 +01:00
Jaime Passos 7746767735 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-10-06 17:40:41 -03:00
toaster 9b94fd3752 * Add rudimentary support for MF2_LINKDRAW in GL. 
* Allow MF_ENEMY objects to flash, just as they do in Software.
 2019-10-06 16:31:13 +01:00
MascaraSnake cabc4e0294 Implemented lava splish. Feel free to suggest a different "splish" sound. 2019-10-05 10:00:59 +02:00
toaster f224e03e1d Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there... 2019-10-01 18:19:37 +01:00
Jaime Passos 318fde6ae7 Giant mistake 2019-09-29 14:12:53 -03:00
Jaime Passos c268743220 hehee 2019-09-29 12:13:51 -03:00
lachwright 71603006dc Resolve merge conflicts 2019-09-29 20:29:49 +08:00
lachwright 8abb6129c1 Hardcode pumice ball 
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
 2019-09-29 20:18:40 +08:00
MascaraSnake 598047ae8b Hardcoded the Pterabyte (without the grabbing mechanic) 2019-09-29 10:39:09 +02:00
Jaime Passos 73e4e67595 JIMITA DO THE SOC 2019-09-28 19:13:51 -03:00
Jaime Passos 5118f8589d Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-28 12:14:55 -03:00
Jaime Passos fe60902df5 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
Jaime Passos 0aba0aa4b9 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
toaster 55a2f1ee1f Merge branch 'bossprovements' into 'master' 
ACZ3 intro

Closes #217

See merge request STJr/SRB2Internal!346
 2019-09-27 08:55:19 -04:00
lachwright 264c60fb70 P_SetTarget fixes, added SPR_SHCK to hw_light.c 2019-09-27 02:13:02 +08:00
toaster ec1712064c * Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) 
* https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif
* Add fadeout instead of slapstick for Fang Clone Fighter death.
* Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
 2019-09-26 17:06:29 +01:00
toaster 2a452ddcf5 Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? 
If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update.

To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif
* He's digging through Eggman's trash.
* Clearly doesn't expect to see you!
* Ready for a fight all the same.
* You can attack him during the mini cutscene if you're impatient.
* Skipped if you give him MTF_AMBUSH.
* Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first.

Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
 2019-09-25 14:36:20 +01:00
Steel Titanium 73146a8338
Restore code that somehow got reverted??? 
How did this even happen??
 2019-09-22 20:30:07 -04:00
Alam Arias 530b5784b8 platersprite_t is not the same as unsigned 2019-09-19 21:42:59 -04:00
Jaime Passos 5f6c702ed6 sky barreling 2019-09-17 23:38:04 -03:00
Jaime Passos a6831aff9c compile fix 2019-09-17 22:29:53 -03:00
Alam Ed Arias 35e3d9acab Revert "Merge branch 'gl_skydome' into 'master'" 
This reverts merge request !326
 2019-09-17 20:20:09 +00:00
Alam Ed Arias 2a33ffb7d7 PNG support: use png_const_bytep, so we do not drop const type 2019-09-17 16:18:54 -04:00
Jaime Passos db979845e0 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-09-15 16:24:24 -03:00
Jaime Passos a86e2332da Fix MD2 loading 2019-09-15 16:24:17 -03:00
Jaime Passos 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
Steel Titanium 2ced626518 Merge branch 'gl_skydome' into 'master' 
OpenGL sky dome

See merge request STJr/SRB2Internal!326
 2019-09-11 11:58:05 -04:00
Steel Titanium 1bafec9f55 Merge branch 'ast_newstyles' into 'master' 
Patch translucency styles

See merge request STJr/SRB2Internal!324
 2019-09-11 11:57:45 -04:00
Jaime Passos fec579db8c Merge remote-tracking branch 'origin/master' into gl_skydome 2019-09-10 19:20:20 -03:00
Jaime Passos 8057eeaaca Merge remote-tracking branch 'jimita/renderswitch' into renderswitch 2019-09-10 18:12:01 -03:00
Jaime Passos f0788598c9 Better fades 2019-09-09 23:31:48 -03:00
Jaime Passos 0a973af5b8 Comments 2019-09-09 19:27:08 -03:00
Jaime Passos da93e0f1f5 I am the CEO of renderers 2019-09-09 16:20:17 -03:00
Nev3r 043bb86acd Revert "Merge branch 'flats-png_port' into 'master'" 
This reverts merge request !322
 2019-09-09 18:40:21 +00:00
Jaime Passos 0a69190848 Missing arguments 2019-09-09 15:39:10 -03:00
Jaime Passos 6553d816ea Merge remote-tracking branch 'origin/master' into flats-png_port 2019-09-09 14:12:28 -03:00
Jaime Passos 725d0b4c44 still making things better 2019-09-08 21:37:24 -03:00
toaster 8c035ecb86 Merge branch 'lightning_polys' into 'master' 
Lightning Polys

See merge request STJr/SRB2Internal!294
 2019-09-08 19:04:56 -04:00
Jaime Passos 19e50062cc more stuff. i hope i didnt mess this up. 2019-09-08 18:59:49 -03:00
Jaime Passos c7e01a558e initial stuff 2019-09-08 18:44:40 -03:00
Jaime Passos 2863ede7bf initial stuff 2019-09-08 18:27:35 -03:00
Jaime Passos ff1fa3f92b Implement all the other alpha blend styles 2019-09-08 13:21:00 -03:00
Jaime Passos 4adff34402 opengl patch translucency 2019-09-07 22:43:29 -03:00
Jaime Passos f461b76bb0 fix translucency 2019-09-07 16:54:26 -03:00
Jaime Passos d38ba4d88c define stuff idk 2019-09-06 19:41:29 -03:00
Jaime Passos 2a85ed0bdd test 2019-09-06 19:26:05 -03:00
Jaime Passos 0cc553be5f Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
Jaime Passos 6aedca899f 2.2 skies aren't flipped 2019-09-05 17:42:36 -03:00
Jaime Passos c6f3e4d53d Make sky dome look a bit better 2019-09-04 13:59:09 -03:00
Jaime Passos f0b4a609a8 Very tiny fix 2019-09-03 23:44:04 -03:00
Jaime Passos 53ddf19f94 Interpolation flag support 2019-09-03 22:57:54 -03:00
Jaime Passos 4760ff0963 Crash prevention 2019-09-03 21:31:32 -03:00
Jaime Passos 916bdeb880 3 digits frame number 2019-09-03 18:31:59 -03:00
Jaime Passos 1dca3338fd Sprite2 support but I'm not a dumbass 2019-09-03 18:27:22 -03:00
Jaime Passos f6d2b5109b PRBoom sky dome 2019-09-03 02:12:17 -03:00
Jaime Passos c21d83e8af Sprite2 support! 2019-09-02 23:29:16 -03:00
Jaime Passos d99026df3b Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-09-02 20:27:50 -03:00
toaster 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
MascaraSnake 806b106905 Hardcoded the Pyre Fly 2019-08-30 08:17:25 +02:00
MascaraSnake 50e51c137e Hardcoded the lavafall 2019-08-25 23:05:38 +02:00
MascaraSnake 2a5c576c1c Hardcoded the RVZ scenery 2019-08-25 12:40:32 +02:00
toaster 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
Jaime Passos f68652aa66 I 2019-08-18 14:16:48 -03:00
Alam Ed Arias a6fe6ebcd3 Fix signed vs unsigned comapre 2019-08-07 12:41:22 -04:00
mazmazz e1e2572357 More post-merge fixes 2019-08-04 21:49:31 -04:00
mazmazz 84c9633579 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-08-04 21:33:13 -04:00
mazmazz b1f402538f Post-merge fixes (todo: spr2) 2019-08-04 21:32:41 -04:00
toaster a87e1b8aa6 Fix inadvertent fallthrough and associated whitespace. 2019-08-04 10:27:36 +01:00
toaster 48e09d56bf Fix HWR_DrawConsoleFill. 2019-08-04 10:27:09 +01:00
mazmazz 5b284c8170 gcc7 compile fixes (Fall through; spr2 var comparison) 2019-08-03 23:01:10 -04:00
toaster 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
toaster 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
toaster b3e953c8c3 Correct some extant fuckups. 2019-07-14 14:21:32 +01:00
toaster 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
toaster 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
Jonas Sauer 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
Monster Iestyn f62087ef30 Fix MascaraSnake's issues with sign-compare (hopefully) 2019-07-09 21:43:38 +01:00
toaster 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
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