Jaime Passos
49425d4016
Attempt to fix sky dome
2019-11-04 14:36:12 -03:00
Jaime Passos
f655865200
add gr_modelinterpolation
2019-11-04 12:21:53 -03:00
toaster
31524531a9
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
7cd2fc7ac3
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
d47cf3d1c8
Fix sky dome
2019-11-02 17:33:36 -03:00
toaster
2a16cf539a
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
8f14902e36
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
a23e1946c4
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
34f1dc20b1
Fix warnings when NOPNG=1
2019-10-28 23:46:33 -03:00
Jaime Passos
76a5b60e39
Merge remote-tracking branch 'origin/master' into f_wipes
2019-10-28 23:14:00 -03:00
Jaime Passos
1c46be78af
add r_patch.c
2019-10-28 15:28:42 -03:00
Jaime Passos
116fb2639e
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
MascaraSnake
9574f8ac78
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
2004577314
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
0842d1f328
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
ac36d13420
Use long double suffix
2019-10-22 21:48:15 -07:00
lachwright
3e584e5ad9
Add green flame sprites, state, and object
2019-10-21 16:22:20 +08:00
lachwright
53835bcb1a
Add new ATZ gargoyle sprites
2019-10-21 13:43:02 +08:00
toaster
8649b1e353
Fix hw_light.c list (not gonna make an exe for this)
2019-10-19 15:50:16 +01:00
toaster
4a7ed2d9ec
MD2 crash fix.
2019-10-13 11:59:38 +01:00
MascaraSnake
7e27bcb915
Merge branch 'openglskydome2' into 'master'
...
OpenGL sky dome
See merge request STJr/SRB2Internal!350
2019-10-12 11:06:47 -04:00
MascaraSnake
4f7026d169
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
ced4a91eba
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
acb34f6290
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
86a77b4886
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
ed304a5b19
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
09c9714daf
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
toaster
7f085863e2
* 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
9b795e56c4
Implemented lava splish. Feel free to suggest a different "splish" sound.
2019-10-05 10:00:59 +02:00
toaster
7ade43f685
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
61f29c9dd6
Giant mistake
2019-09-29 14:12:53 -03:00
Jaime Passos
dfe05a650c
hehee
2019-09-29 12:13:51 -03:00
lachwright
949ef287b7
Resolve merge conflicts
2019-09-29 20:29:49 +08:00
lachwright
f67ef441b3
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
c4f1085f02
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 10:39:09 +02:00
Jaime Passos
c02c7fb28b
JIMITA DO THE SOC
2019-09-28 19:13:51 -03:00
Jaime Passos
e2ce3988fb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-28 12:14:55 -03:00
Jaime Passos
e95bd8add3
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -03:00
Jaime Passos
fa9cef1cc0
Merge remote-tracking branch 'origin/master' into openglskydome2
2019-09-27 22:47:10 -03:00
toaster
74efc0e1f4
Merge branch 'bossprovements' into 'master'
...
ACZ3 intro
Closes #217
See merge request STJr/SRB2Internal!346
2019-09-27 08:55:19 -04:00
lachwright
7563e7be6f
P_SetTarget fixes, added SPR_SHCK to hw_light.c
2019-09-27 02:13:02 +08:00
toaster
85f50ef54b
* 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
de82d338bd
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
8e50a7214c
Restore code that somehow got reverted???
...
How did this even happen??
2019-09-22 20:30:07 -04:00
Alam Arias
296409d93e
platersprite_t is not the same as unsigned
2019-09-19 21:42:59 -04:00
Jaime Passos
5e1ebad9d3
sky barreling
2019-09-17 23:38:04 -03:00
Jaime Passos
f5b7c9951f
compile fix
2019-09-17 22:29:53 -03:00
Alam Ed Arias
aab58a4613
Revert "Merge branch 'gl_skydome' into 'master'"
...
This reverts merge request !326
2019-09-17 20:20:09 +00:00
Alam Ed Arias
e969ef8930
PNG support: use png_const_bytep, so we do not drop const type
2019-09-17 16:18:54 -04:00
Jaime Passos
0d11dd516a
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-09-15 16:24:24 -03:00
