mazmazz
3858a93cfa
Initialize invisible FOF alpha to 1 on first fade
2018-09-08 09:31:23 -04:00
mazmazz
fa0918c2f1
Handle rendering flags for invisible FOFs
2018-09-08 09:08:32 -04:00
mazmazz
fcc7180d5c
Enable FF_CUTSOLIDS handling and updating by sector->moved
2018-09-08 08:59:17 -04:00
mazmazz
47c9bf2ebc
Disable FadeFakeFloor for laser block
2018-09-08 01:33:12 -04:00
mazmazz
dc964738eb
Never handle FF_EXISTS if FF_BUSTUP
2018-09-08 01:23:15 -04:00
mazmazz
66dc84509a
Fix Mario block triggering during ghost fade
2018-09-08 01:12:34 -04:00
mazmazz
b629104197
Also check for FF_SOLID
2018-09-08 01:07:08 -04:00
mazmazz
cc11459054
Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists
2018-09-08 00:37:04 -04:00
mazmazz
7e3d5cd373
Comment out tmfloorrover and tmceilingrover because unused
2018-09-08 00:36:43 -04:00
mazmazz
76d7a54b2b
Fix player Z snap to floor on moving platform ~FF_EXISTS
...
* Track player's old floorz by mo->floor_sectornum and floor_ffloornum
* Track tmfloorz by tmfloorrover, tmfloor_sectornum, tmfloor_rovernum
* Ceiling variants of the above
2018-09-08 00:34:56 -04:00
mazmazz
f52f72256b
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-07 18:14:52 -04:00
Monster Iestyn
316c08bbbb
Merge branch 'netcode-nitpicking' into 'next'
...
Netcode nitpicking
See merge request STJr/SRB2!274
2018-09-07 15:59:49 -04:00
mazmazz
0b365d0d08
Initial polyobj fade skeleton
2018-09-07 15:27:18 -04:00
mazmazz
bc2f48a018
Merge branch 'master' into nights-dronebox
2018-09-07 09:06:32 -04:00
mazmazz
3b39895e4f
Stray nights-onfootfix line
2018-09-07 09:01:38 -04:00
mazmazz
c0ffbdafce
Revert "Ideya fixes when a player has more than one Ideya"
...
This reverts commit e3facccb9d
2018-09-07 08:56:53 -04:00
mazmazz
4fe1b2652d
Merge branch 'master' into nights-fastercapsule
2018-09-07 08:56:02 -04:00
mazmazz
49b27fc124
Deduct marescore immediately on instakill
...
* Deduct player->spheres too, missed that one
2018-09-07 08:19:22 -04:00
mazmazz
c50a0d60f5
Merge branch 'master' into nights-keeppoints
2018-09-07 08:13:57 -04:00
mazmazz
4147773d0c
Merge branch 'master' into le-fadefof
2018-09-06 18:12:24 -04:00
Digiku
ffde71c656
Merge branch 'flicky-things' into 'master'
...
Flicky Thing Types
See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
mazmazz
9e5b9ac50e
Flicky colors indexing fix
2018-09-06 13:20:55 -04:00
mazmazz
956d48b5e0
Compiler errors
2018-09-06 13:16:50 -04:00
mazmazz
bd6bc368a3
Stray comments
2018-09-06 12:13:03 -04:00
mazmazz
1c273cdcc8
Make default flicky home radius 384
2018-09-06 11:59:55 -04:00
mazmazz
e75213b14d
Limit random fish color to SRB2's defaults
2018-09-06 11:56:55 -04:00
mazmazz
f15bb2dfba
Change default radius to 448
...
* Put default radius back in FLICKY_CENTER states
2018-09-06 11:54:06 -04:00
mazmazz
0c2340b0bc
Impose home radius on aimless flickies; improve randomness of flickyhitwall angle
2018-09-06 11:17:08 -04:00
mazmazz
f8d260b044
Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE)
2018-09-06 10:32:26 -04:00
mazmazz
7d834ff894
Erase default home radius from states and impose default on home check
2018-09-06 10:20:01 -04:00
mazmazz
2cfd941778
Re-organize flags for FLICKY_CENTER
...
* Flickies can be in-place with just one flag (MF_GRENADEBOUNCE)
* Flickies can now hop whether orbiting, aimless, or in-place
* Removed ability to customize movedir for orbit; will always be random
* Removed ability to customize gravity sink for aimless flying flickies
* Misc: Use P_SetTarget to set actor->tracer for flicky center
2018-09-06 10:17:41 -04:00
mazmazz
fe2d1e9020
Merge branch 'master' into flicky-things
2018-09-06 08:09:02 -04:00
mazmazz
f000a68150
Impose default radius for orbiting flickies
2018-09-06 08:08:53 -04:00
mazmazz
21a55a4702
Make default behavior: aimless flying flickies stay at Z height
2018-09-06 08:07:13 -04:00
mazmazz
956b83729b
Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine
2018-09-06 07:55:15 -04:00
mazmazz
e5dd74eb45
Change flicky thing #s to 2200s
2018-09-06 07:24:46 -04:00
Monster Iestyn
16c7c264a5
Wrap the text and snap to bottom
2018-09-04 19:52:50 +01:00
Monster Iestyn
bffaafd61e
Add V_DrawTutorialBack for drawing a console-like background box, add Lorem ipsum as filler test
2018-09-04 19:21:58 +01:00
Monster Iestyn
df51997022
Merge branch 'master' into tutorial-time
2018-09-04 17:06:50 +01:00
Monster Iestyn
2b0ce807c7
Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround
2018-09-04 17:04:24 +01:00
Monster Iestyn
aba9bd13bb
Add "tutorialmode" var to help the game know when we're in a tutorial or not, add placeholder for tutorial HUD to test it works
2018-09-04 16:58:49 +01:00
Monster Iestyn
bcc9e58d0e
Merge branch 'master' into tutorial-time
2018-09-04 15:54:50 +01:00
Monster Iestyn
2ac50cd2b7
Merge branch 'public_next'
...
# Conflicts:
# src/r_main.c
2018-09-04 15:53:07 +01:00
Monster Iestyn
38ac999d77
Merge branch 'addfile-verify-fix' into 'next'
...
Addfile command verify fix.
See merge request STJr/SRB2!272
2018-09-03 17:17:46 -04:00
Monster Iestyn
ea06e8a62b
SOCK_Send: Split the actual sending data parts into a new function, SOCK_SendToAddr, to make everything look a bit neater in general
2018-09-03 20:53:40 +01:00
Monster Iestyn
7b083f07cd
UDP_Socket: I doubt client addresses are meant to be included in the total for broadcast addresses
2018-09-03 15:56:02 +01:00
Monster Iestyn
846bddfdcf
SOCK_Send: Fix what appears to be a mistaken use of i instead of j
2018-09-03 15:52:22 +01:00
Monster Iestyn
24aafa6dac
UDP_Socket: Add missing limit checks for s, for client and broadcast addresses
2018-09-03 15:43:36 +01:00
Digiku
01314b6674
Merge branch 'nightsplus-le' into 'master'
...
NiGHTS Linedef Executor Triggers
Closes #102
See merge request STJr/SRB2Internal!142
2018-09-02 18:10:50 -04:00
mazmazz
cea76fe41f
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-09-02 08:16:40 -04:00
