stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 19:20:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
9691 commits 172 branches 41 tags 285 MiB
Commit graph

884 commits

Author SHA1 Message Date
fickleheart
8bc58807aa Software FOV ported from kart 
also fixes high software FOVs having buggy walls
 2019-12-31 11:22:05 -06:00
James R
fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
Sally Cochenour
74d7f256a7 More blend image updates 
- Allow the translations that don't make use a blend image to work without requiring a blend image to be present
- Fix TC_RAINBOW not working properly
- TC_METALSONIC now remaps the _blend image to SKINCOLOR_COBALT, then inverts all of the blue, replicating how it works in Software
 2019-12-29 16:36:53 -05:00
Nev3r
389b9e35c4 Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
Jaime Passos
f997866b4d Fix broken dynlight list because of a SPR_NON2 that doesn't exist 2019-12-28 22:57:37 -03:00
Sally Cochenour
a66fb15ff2 Merge branch 'next' into oglshaderport 2019-12-28 13:58:41 -05:00
Jaime Passos
96609e45ae OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos
56fd29a42a stuff 2019-12-26 21:27:30 -03:00
Jaime Passos
c0390f5186 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
Sally Cochenour
4c6664292e Increase precision of smooth contrast 2019-12-25 22:50:41 -05:00
Sally Cochenour
3eb6570123 Fake contrast 2019-12-25 20:09:31 -05:00
Sally Cochenour
439474882a Update blend textures to smooth out colors that have duplicate indices 2019-12-25 18:46:30 -05:00
Sally Cochenour
da3d5a0184 Merge next 2019-12-25 14:41:31 -05:00
Sally Cochenour
7851bef929 Port of Jimita's shader stuff + my lighting shader 
Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>
 2019-12-25 14:22:01 -05:00
Jaime Passos
03a3b02301 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
James R
3f339384c8 Merge branch 'hwrtexfix' into 'master' 
Fix model texture blending

See merge request STJr/SRB2!546
 2019-12-24 14:44:19 -05:00
Jaime Passos
1b81232d32 sike 2019-12-18 11:47:26 -03:00
Jaime Passos
e359f802fd Update comments 2019-12-17 16:14:26 -03:00
Jaime Passos
cc54163210 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Jaime Passos
141d0376a5 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-17 15:05:16 -03:00
Jaime Passos
e3ab21c85f opengl 2019-12-17 13:48:48 -03:00
Jaime Passos
c6f36fc470 un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Jaime Passos
369563ad92 allow models to change colors more than once. 2019-12-17 12:50:41 -03:00
Jaime Passos
4e814cd424 FINALLY, COLORCUBIUM 2019-12-12 23:18:39 -03:00
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