Commit graph

665 commits

Author SHA1 Message Date
MascaraSnake d591554a5d Merge branch 'radiomode' into 'master'
Radio mode

See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05: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 4e6513b583 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-11 14:05:03 -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 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
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
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 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