mazmazz
963f3d167a
Add ML_DONPTEGTOP flag to Nights LE
...
* Nightserize: Run only if player is already NiGHTS
* DeNightserize: Run only if >0 players are NiGHTS
2018-04-07 07:33:07 -04:00
mazmazz
6f55212e0f
Merge branch 'master' into nightsplus-le
2018-04-07 07:09:41 -04:00
mazmazz
94bea03ae5
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
acb4322f1d
checkpoint
2018-04-07 05:52:01 -04:00
mazmazz
ef733de678
Refactor flag handling toggles
2018-04-06 23:14:48 -04:00
mazmazz
91fbffe73d
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
8917b741c5
Merge branch 'le-fadefof' into le-fadefof-remove-storedthinker
2018-04-06 22:22:42 -04:00
mazmazz
efec4cf7a6
Merge branch 'master' into le-fadefof
2018-04-06 22:22:23 -04:00
mazmazz
2138706d38
Slight fixes for NiGHTS LE Trigger logic
2018-04-02 08:13:53 -04:00
mazmazz
630843d76e
Split NiGHTS LE trigger logic into P_CheckNightsTriggerLine
...
This makes P_RunTriggerLinedef more readable because the logic is too different from the other triggers.
Also replace BOOL with boolean
2018-04-02 08:11:28 -04:00
mazmazz
4d95019db5
Implement logic branching for NiGHTS LE triggers and add Bonus Time trigger
2018-04-01 08:23:59 -04:00
mazmazz
6e10b27f38
Initial checkpoint for NiGHTS LE triggers
2018-03-31 10:11:27 -04:00
mazmazz
c9b6c2e026
Remove fader thinkers by stored pointers in fadingdata
2018-03-31 01:15:24 -04:00
mazmazz
88be5fe27c
Better fading comments
2018-03-31 00:10:46 -04:00
mazmazz
f0504c0edd
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 8f149075a6
2018-03-30 23:42:14 -04:00
mazmazz
38bc2f074d
Merge branch 'le-fadefof' into le-fadefof-fflags
...
# Conflicts:
# src/p_spec.c
2018-03-30 23:03:06 -04:00
mazmazz
4675062cca
Remove log comments for Fade FOF
2018-03-30 22:59:33 -04:00
mazmazz
8f149075a6
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
1df029ccad
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
Marco Z
1f2a15889f
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
Marco Z
0c63e44cea
fade_t fields
2018-03-30 16:19:19 -04:00
Marco Z
3332298f9e
Define fader thinker names
2018-03-30 15:33:03 -04:00
mazmazz
e28d30e1ee
Nights LE checkpoint
2018-03-30 14:22:59 -04:00
toasterbabe
117017b0a0
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
Monster Iestyn
ac09048248
created W_IsLumpWad as a shortcut for the "is the lump a WAD" checking in the code getting map data lumps
2018-01-10 16:51:23 +00:00
Monster Iestyn
a1212827d3
Hack up support for pk3s in Custom FOF setup, fix stray ! preventing blockmap from loading
2018-01-09 22:22:10 +00:00
Monster Iestyn
728d27f2d5
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
# src/win32/win_vid.c
2018-01-02 17:32:24 +00:00
toasterbabe
edf7483a4c
Fix airbob sectors fucking up when below 0 z-height.
2017-12-20 21:13:24 +00:00
Alam Ed Arias
7f4424b4a0
whitespace cleanup
2017-11-02 23:13:34 -04:00
toasterbabe
efc4d2f81d
* Make multiple ANIMDEFS lumps get loaded.
...
* Refactor the multiple TEXTURES lump code.
2017-10-28 17:12:08 +01:00
toasterbabe
50d6208913
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement
2017-10-21 14:28:44 +01:00
wolfy852
b298c7a541
Fix p_spec.c and r_things.h, get the compiler to shut up
...
This compiles with no errors or warnings, but hasn't been tested yet. Please review/test when you can.
2017-10-07 17:18:25 -05:00
wolfy852
93584f6811
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement
2017-10-07 14:52:40 -05:00
Monster Iestyn
302d0425e0
Incinerated WinCE
2017-09-29 23:25:34 +01:00
Alam Ed Arias
f1a347e55f
Merge branch 'public_next' into master
2017-09-28 11:01:20 -04:00
Alam Ed Arias
ec125628ab
Merge branch 'master' into next
2017-09-28 10:16:35 -04:00
Alam Ed Arias
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
Nevur
77d7b1495c
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement
2017-09-24 14:52:41 +02:00
toaster
3cc14e3985
Merge branch 'directionchar' into 'master'
...
Autobrake & decoupling player sprite angle from camera angle
See merge request !69
2017-09-19 07:56:22 -04:00
toasterbabe
f90d595332
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist.
...
* cv_useranalog is now hidden from the menu.
* Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum.
* Tailsbot is now slightly more capable of keeping up with Sonic.
* pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL.
* [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-16 20:25:14 +01:00
Monster Iestyn
030c437186
Merge branch 'master' into mi-misc-whatever
2017-08-18 17:00:05 +01:00
toasterbabe
8175e0836e
Remove all trace of harddefs, considering we use an ANIMDEFS lump in srb2.srb now.
2017-08-09 22:09:06 +01:00
toasterbabe
a3767fedac
Clean out code/update comments relating to TEXTUREn, TEXTURE (SOC), PNAMES, and ANIMATED.
2017-08-08 22:03:37 +01:00
Nevur
8b64a6eef3
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement
2017-08-08 10:41:33 +02:00
Monster Iestyn
a0204c6722
Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special
2017-08-06 22:10:29 +01:00
Monster Iestyn
c10c3d0441
Merge branch 'alignment_v2' into 'master'
...
Consistent flat alignment
Does what it says on the tin. Consistent between the three different plane drawers:
* Software flat (previously the only one working as intended)
* Software sloped (took a lot of work)
* OpenGL flat and sloped (worked reasonably well but used different signs for some reason)
Check out root/!LatestSRB2Files/srb2win_branch_flat2.exe, root/toaster/flatalignment.wad and any in-dev DSZ1 to test it all out.
See merge request !78
2017-08-05 16:04:41 -04:00
Monster Iestyn
cfbe180312
Merge branch 'public_next'
2017-07-25 17:17:22 +01:00
Monster Iestyn
821692fbf7
This was my fault, whoops
2017-07-24 17:53:18 +01:00
Monster Iestyn
0eaebb16fc
Check if existing animdefs have the same type as the animdef we're parsing
2017-06-25 18:17:05 +01:00
Nevur
d5e38c087d
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement
...
# Conflicts:
# src/p_setup.c
2017-06-25 14:51:37 +02:00
