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

3751 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz bd6276a39e Allow immediate alpha setting when speed = 0; refactoring 
* Separate fade logic into P_FindFakeFloorsDoAlpha, P_DoFakeFloorAlpha
* Change INT32 destvalue and speed to INT16
 2018-04-07 07:09:04 -04:00
mazmazz 27ca70d069 checkpoint 2018-04-07 05:52:01 -04:00
mazmazz afa0aae131 Refactor flag handling toggles 2018-04-06 23:14:48 -04:00
mazmazz 73e4cab1e4 Little adjustments 
* Swap MF_NOCLIMB and MF_EFFECT1
* Implement if Front Y Offset < 1 (== 0), then set alpha immediately
 2018-04-06 22:34:45 -04:00
mazmazz 8d3c9d91f1 Merge branch 'le-fadefof' into le-fadefof-remove-storedthinker 2018-04-06 22:22:42 -04:00
mazmazz 3427c304f4 Merge branch 'master' into le-fadefof 2018-04-06 22:22:23 -04:00
Digiku e1cd6357cc Merge branch 'op-nightsbumper' into 'master' 
NiGHTS Objectplace: Preserve MT_NIGHTSBUMPER vertical angle upon WRITETHINGS

See merge request STJr/SRB2Internal!137
 2018-04-06 20:21:25 -04:00
toaster d315072e3f Merge branch 'texture-fixes' into 'master' 
Texture fixes

See merge request STJr/SRB2Internal!135
 2018-04-06 17:44:17 -04:00
toaster 8c33cb9134 Merge branch '100-make-slopes-static-by-default-and-require-flag-to-turn-them-dynamic' into 'master' 
Resolve "Make slopes static by default, and require flag to turn them dynamic."

Closes #100

See merge request STJr/SRB2Internal!140
 2018-04-06 17:43:47 -04:00
toaster 66733d96c2 Merge branch 'pretty_stuff' into 'master' 
Pretty stuff

See merge request STJr/SRB2Internal!131
 2018-04-06 17:40:52 -04:00
toasterbabe 4f3c9b5fad Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 
# Conflicts:
#	src/hardware/hw_draw.c
 2018-04-06 19:38:19 +01:00
Monster Iestyn a3b86a737e Merge branch 'public_next' 
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
#	src/sdl12/hwsym_sdl.c
#	src/sdl12/i_video.c
 2018-04-06 18:42:07 +01:00
toasterbabe 3f427d0161 * Improve devmode text. 
* Make sure showfps never covers anything relevant to the base game.
* Tweak spectator text for raising/lowering.
* Minor code-smell squishes.
 2018-04-06 18:40:08 +01:00
toasterbabe 15903c6271 * Correct V_PERPLAYER's screen-centered (no snapto flags on a given axis) behaviour. 
* Fix that one comment Digiku mentioned. ;P
* Make extra lives/100 ring rewards consistent between lives being relevant and lives being infinite/not present, which was a problem this branch made evident when Race ended up getting the infinite lives symbol!
 2018-04-06 14:42:49 +01:00
toasterbabe 3c74952522 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 2018-04-06 12:54:39 +01:00
Wolfy ca8e14d5e9 Revert "THZ Hardcoding" 
This reverts commit 8bd91bd2f2.

Note to self: read through the fucking merge requests
 2018-04-05 12:49:39 -05:00
Wolfy 1d63f53aeb Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal 2018-04-05 03:55:03 -05:00
Wolfy 8bd91bd2f2 THZ Hardcoding 
Feel free to reorganize as necessary.
 2018-04-05 03:23:27 -05:00
Alam Ed Arias 59f5b46ad3 Merge branch 'public_next' into master 2018-04-03 16:09:11 -04:00
Alam Ed Arias cf6a30a8ef Merge branch 'master' into next 2018-04-03 15:48:06 -04:00
toaster 7848e9f42b Merge branch 'openglquickfixes' into 'master' 
Opengl Quick Fixes

See merge request STJr/SRB2!237
 2018-04-03 15:34:24 -04:00
mazmazz cd7573550b Remove fader thinkers by stored pointers in fadingdata 2018-03-31 01:15:24 -04:00
mazmazz 3e8d264a2d Add fadingdata to sector_t 2018-03-31 00:41:20 -04:00
mazmazz c1c6b4746f Better fading comments 2018-03-31 00:10:46 -04:00
mazmazz c13f561b50 Fix fade_t handleflags to UINT32 2018-03-31 00:02:37 -04:00
mazmazz bf0f24b16e Bring back FF_TRANSLUCENT processing for fade FOF 
The rules for accompanying flags are:
* If FF_TRANSLUCENT, deflag FF_CUTLEVEL and flag FF_EXTRA | FF_CUTEXTRA.
* If not FF_TRANSLUCENT, flag FF_CUTLEVEL and deflag FF_EXTRA | FF_CUTEXTRA
* If FF_SOLID, deflag FF_CUTSPRITES
* If not FF_SOLID, flag FF_CUTSPRITES

This reverts commit 73c7df6f5b.
 2018-03-30 23:42:14 -04:00
mazmazz 0ac96b5a93 Merge branch 'le-fadefof' into le-fadefof-fflags 
# Conflicts:
#	src/p_spec.c
 2018-03-30 23:03:06 -04:00
mazmazz 047fffb6da Remove log comments for Fade FOF 2018-03-30 22:59:33 -04:00
mazmazz 73c7df6f5b Maybe let's not handle FF_TRANSLUCENT for fade FOF. 
Why: FF_TRANSLUCENT is often packaged with flags FF_EXTRA, FF_CUTEXTRA; for intangibles, FF_CUTSPIRTES; in some cases (?), FF_CUTLEVEL. I *think* the rules are consistent amongst predefined FOFs, but maybe there are exceptions?

There's too much that can go wrong with assuming too many flags for an FOF. Just make it the modder's responsibility to tag this special to the proper translucent FOF.
 2018-03-30 22:56:43 -04:00
mazmazz d449aae76d Add predefined behaviors for fading FOF flags 
* ML_BLOCKMONSTERS: Handle FF_EXISTS
* ML_NOCLIMB: Handle FF_SOLID
* ML_EFFECT1: Don't handle FF_TRANSLUCENT
 2018-03-30 22:43:13 -04:00
Sryder 6f2de824fb Uncomment HWR_CorrectSWTricks but set gr_correcttricks to be off by default 
I wasn't aware of the cvar, this should do for now since I don't believe any maps use these software tricks, probably an old leftover from DOOM.
 2018-03-30 23:12:44 +01:00
Marco Z e617753d00 Initial logic attempt 
* Front X offset: ffloor alpha target (1-256)
* Front Y offset: Speed, alpha per tic (1+)
* MF_BLOCKMONSTERS: Do not handle FF_EXISTS
 2018-03-30 17:45:48 -04:00
toasterbabe 0fbebcaa08 Make special stage tallies do the token noise if you cash in a token! 2018-03-30 22:03:14 +01:00
toasterbabe d9b5155e6e * Make Tokens appear in competition. 
* Tweak thrown ring colours.
* Make Armageddon shield loop properly.
* Tweak drowning numbers to be consistent between third and first person.
 2018-03-30 21:49:15 +01:00
Marco Z 44b25be69a fade_t fields 2018-03-30 16:19:19 -04:00
Marco Z 0fedd2e566 Define fader thinker names 2018-03-30 15:33:03 -04:00
Sryder 0aaae501d3 Warnings must die 2018-03-30 18:53:23 +01:00
Sryder f3aa02e26d Start with lightnum on sector lightlevel 2018-03-30 18:13:52 +01:00
Sryder 66f220d6ad Merge branch 'master' into openglquickfixes 2018-03-30 18:09:41 +01:00
toasterbabe de8f1fa407 * Incorporate (almost) all of Mystic's feedback. 
* Prevent ANY input when blindfolded.
* Make CECHOs always perplayer'd. (A little hacky; quads will need work here.)
* Make NiGHTS link timer bounces not a mess, and only when the colour changes.
 2018-03-30 16:39:59 +01:00
Sryder 65c893da86 static tempsec for R_FakeFlat 
I don't fully understand this, but it's what software does and it fixes the issue of the lighting in DSZ3. Also don't need the extra call to R_Prep3DFloors.
 2018-03-29 23:28:54 +01:00
Nevur fc3e863fd3 asdf 
Signed-off-by: Nevur <apophycens@gmail.com>
 2018-03-29 20:12:19 +02:00
toasterbabe 98601dc757 A lot! 
* cv_powerupdisplay. Never, First-person only (default), Always.
* New monitor stuff.
* Fixed hitmessages.
* Some CTF stuff.
* Aaaaugh it's a lot I hate myself I need to work on my coursework.
* I'll figure out what I did here in the merge request when that's done.
 2018-03-26 23:53:09 +01:00
mazmazz d85f108997 P_SpawnMapThing: Ignore MTF_ flags if MT_NIGHTSBUMPER 2018-03-25 19:42:46 -04:00
mazmazz dc9fd6f02e MT_NIGHTSBUMPER Spawn: Don't reset mthing->options 2018-03-25 19:07:21 -04:00
toasterbabe 33afd94252 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 
# Conflicts:
#	src/d_main.c
#	src/st_stuff.c
 2018-03-24 17:17:01 +00:00
Sryder f62cb3a30a I've commented out the call to HWR_CorrectSWTricks. 
I don't think it does anything for us anymore, and might even break things with slopes.
Someone let me know if I'm wrong and am breaking things horribly here.
 2018-03-23 22:27:29 +00:00
Sryder fab4b7f5ea Stop squashing the screen vertically in non-green resolutions 2018-03-22 01:10:53 +00:00
Sryder 839ee0ab85 OpenGL Sprite Splitting 2018-03-22 00:52:14 +00:00
Sryder 0885d27171 Transform sprites in world space rather than screen space 
Transformation based on screen space would make sense if we didn't want anything in the world to effect the sprites.
This should allow sprite splitting and sorting of sprites with level geometry easier.
stransform is no longer needed.
 2018-03-21 19:45:37 +00:00