Commit graph

22279 commits

Author SHA1 Message Date
toasterbabe
1ac48b08d0 Mace optimisation!
* Handle all chain objects as a hnext/hprev chain.
* When removing mobjs with hnext/hprev, "repair the chain" (make the h links meet).
* Fix hidden slings, which I accidentially broke when I revamped maces the first time.
* Kill MF2_MACEROTATE. Not needed for anything anymore.
* P_MaceRotate now available to Lua to make up for it.
* Related: Made modifying hnext/hprev using Lua safer, so it keeps the reference counts in play.
2018-04-01 20:54:19 +01:00
mazmazz
4d95019db5 Implement logic branching for NiGHTS LE triggers and add Bonus Time trigger 2018-04-01 08:23:59 -04:00
TehRealSalt
69b26f227c Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-31 16:18:28 -04:00
TehRealSalt
bec43b3129 Race lap linedef executor
Set up similar to NiGHTS Mare linedef executors. Give a sector the "Race
Lap" sector type, tag it, then set the frontside x-offset on the trigger
line to the lap it should activate on minus 1. There are a few flags you
can check on the trigger line to modify its behavior.
- Normally the executor will only trigger if its exactly on the lap
specified. Check Not Climbable to make it execute on laps equal to or
greater than, or check Block Enemies to make it execute on laps equal to
or less than.
- By default, the executor will check current lap with the person in
last's lap. Check E4 to instead find the current lap from the player who
triggered it. This flag is better for triggering events ahead of the
players, while the default effect is better for triggering events behind
the players.
2018-03-31 14:48:49 -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
TehRealSalt
333677ae5a Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-31 00:44:47 -04:00
TehRealSalt
9ba13c8ea4 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_baselib.c
#	src/p_inter.c
#	src/p_spec.c
2018-03-31 00:44:03 -04:00
mazmazz
378fdf0177 Add fadingdata to sector_t 2018-03-31 00:41:20 -04:00
TehRealSalt
0159d5ce92 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-31 00:33:20 -04:00
TehRealSalt
6ef83798f5 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-31 00:27:35 -04:00
TehRealSalt
7e19186491 I'm a huge idiot 2018-03-31 00:12:26 -04:00
TehRealSalt
552519faf1 reset randmapbuffer in G_DeferedInitNew 2018-03-31 00:11:03 -04:00
mazmazz
88be5fe27c Better fading comments 2018-03-31 00:10:46 -04:00
mazmazz
7d5b40a306 Fix fade_t handleflags to UINT32 2018-03-31 00:02:37 -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
mazmazz
02d525ae15 Add player_t marelap and marebonuslap, with logic 2018-03-30 20:28:27 -04:00
Sryder
347651ffb1 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
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
toasterbabe
a1da5a2723 Make special stage tallies do the token noise if you cash in a token! 2018-03-30 22:03:14 +01:00
toasterbabe
3004b143a6 * 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
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
5a7e009eab Merge branch 'nightsplus-laplogic' into nightsplus-le
# Conflicts:
#	src/p_map.c
2018-03-30 14:39:00 -04:00
mazmazz
224eb980bb Add player_t marelap and marebonuslap, with logic 2018-03-30 14:38:28 -04:00
mazmazz
e28d30e1ee Nights LE checkpoint 2018-03-30 14:22:59 -04:00
TehRealSalt
8ea5aaea37 I just realized that SRB2's credits are listed in alphabetical order of last name
(I had to research the Polish alphabet to figure out where Fooruman's
name should've been, hah)
2018-03-30 14:14:08 -04:00
Sryder
8757f6b933 Warnings must die 2018-03-30 18:53:23 +01:00
TehRealSalt
74537b5119 oop 2018-03-30 13:33:01 -04:00
Sryder
5981fb5efc Start with lightnum on sector lightlevel 2018-03-30 18:13:52 +01:00
Sryder
7d1b45e390 Merge branch 'master' into openglquickfixes 2018-03-30 18:09:41 +01:00
TehRealSalt
fa50c1cdf4 Actually, I messed this up 2018-03-30 12:17:48 -04:00
TehRealSalt
d438e3bc41 Doing one more step to totally ensure that matchesplayed is unlocking stuff 2018-03-30 12:16:15 -04:00
toasterbabe
371bbf48aa * 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
TehRealSalt
ff96cfab11 zzzzz 2018-03-30 00:53:32 -04:00
TehRealSalt
6298f4e6ee MK rules for Battle scoring
and quick fix for karma items
2018-03-30 00:53:25 -04:00
TehRealSalt
1b1f29bd2b Unsuck start boosts 2018-03-29 21:43:02 -04:00
Sryder
d27b10d5eb 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
TehRealSalt
89f2f8ebaf Zigs & better scroll 2018-03-29 18:11:06 -04:00
TehRealSalt
c078b70806 Oh boy another real name 2018-03-29 14:48:45 -04:00
Nevur
0e5a389d01 asdf
Signed-off-by: Nevur <apophycens@gmail.com>
2018-03-29 20:12:19 +02:00
TehRealSalt
5958930c24 Add the accent 2018-03-29 13:35:40 -04:00
TehRealSalt
1541c6e88b Real naaaames 2018-03-29 12:57:41 -04:00
TehRealSalt
1fa99865d5 Forgot to remove some debug stuff 2018-03-29 12:01:04 -04:00
TehRealSalt
aa6b39b21a Finished checklist 2018-03-29 11:43:56 -04:00
TehRealSalt
4f7ebd1607 More full names, and more names 2018-03-29 01:34:31 -04:00