mazmazz
61960937b0
Fix Mario block triggering during ghost fade
2018-09-08 01:12:34 -04:00
mazmazz
9c1fc17233
Also check for FF_SOLID
2018-09-08 01:07:08 -04:00
mazmazz
f7731d7a41
Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists
2018-09-08 00:37:04 -04:00
mazmazz
bc63a44330
Comment out tmfloorrover and tmceilingrover because unused
2018-09-08 00:36:43 -04:00
mazmazz
05ac0bb337
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
969741717d
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-07 18:14:52 -04:00
Monster Iestyn
ae6085ef1a
Merge branch 'netcode-nitpicking' into 'next'
...
Netcode nitpicking
See merge request STJr/SRB2!274
2018-09-07 15:59:49 -04:00
mazmazz
9055c58783
Initial polyobj fade skeleton
2018-09-07 15:27:18 -04:00
mazmazz
3f971ee921
Deduct marescore immediately on instakill
...
* Deduct player->spheres too, missed that one
2018-09-07 08:19:22 -04:00
mazmazz
54084b8aa4
Merge branch 'master' into nights-keeppoints
2018-09-07 08:13:57 -04:00
mazmazz
71b1a78f76
Merge branch 'master' into le-fadefof
2018-09-06 18:12:24 -04:00
Digiku
8d015bd7cc
Merge branch 'flicky-things' into 'master'
...
Flicky Thing Types
See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
mazmazz
fbd6b2c826
Flicky colors indexing fix
2018-09-06 13:20:55 -04:00
mazmazz
a430d133b4
Compiler errors
2018-09-06 13:16:50 -04:00
mazmazz
4dcf3835e3
Stray comments
2018-09-06 12:13:03 -04:00
mazmazz
7f404345f0
Make default flicky home radius 384
2018-09-06 11:59:55 -04:00
mazmazz
fd037fe763
Limit random fish color to SRB2's defaults
2018-09-06 11:56:55 -04:00
mazmazz
2b93a38f8e
Change default radius to 448
...
* Put default radius back in FLICKY_CENTER states
2018-09-06 11:54:06 -04:00
mazmazz
7b3c4aee33
Impose home radius on aimless flickies; improve randomness of flickyhitwall angle
2018-09-06 11:17:08 -04:00
mazmazz
04a59aacc4
Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE)
2018-09-06 10:32:26 -04:00
mazmazz
c61cbcdf22
Erase default home radius from states and impose default on home check
2018-09-06 10:20:01 -04:00
mazmazz
fe508088b2
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
2d86dddb00
Merge branch 'master' into flicky-things
2018-09-06 08:09:02 -04:00
mazmazz
0ff48976b1
Impose default radius for orbiting flickies
2018-09-06 08:08:53 -04:00
mazmazz
9ef7c09d89
Make default behavior: aimless flying flickies stay at Z height
2018-09-06 08:07:13 -04:00
mazmazz
6426d88141
Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine
2018-09-06 07:55:15 -04:00
mazmazz
a095b47980
Change flicky thing #s to 2200s
2018-09-06 07:24:46 -04:00
Monster Iestyn
9066f82842
Wrap the text and snap to bottom
2018-09-04 19:52:50 +01:00
Monster Iestyn
83f2951f93
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
d91d1886fa
Merge branch 'master' into tutorial-time
2018-09-04 17:06:50 +01:00
Monster Iestyn
cd8a46b3a1
Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround
2018-09-04 17:04:24 +01:00
Monster Iestyn
dbff92ea30
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
cc20eed183
Merge branch 'master' into tutorial-time
2018-09-04 15:54:50 +01:00
Monster Iestyn
82e46d101c
Merge branch 'public_next'
...
# Conflicts:
# src/r_main.c
2018-09-04 15:53:07 +01:00
Monster Iestyn
6774933263
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
d68585a9d0
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
339ffe8d08
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
f5b88ee37d
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
4bb12fb79f
UDP_Socket: Add missing limit checks for s, for client and broadcast addresses
2018-09-03 15:43:36 +01:00
Digiku
816a81b396
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
Monster Iestyn
4bd725e7b8
Merge branch 'master' into next
2018-09-02 13:00:56 +01:00
Monster Iestyn
44c4534231
Merge branch 'homremoval-nongreenfix' into 'master'
...
Fix for HOM removal in non-green resolutions
See merge request STJr/SRB2!273
2018-09-01 20:53:49 -04:00
Steel Titanium
4b690b20d3
Merge branch 'master' into addfile-verify-fix
2018-09-01 19:33:59 -04:00
Monster Iestyn
7fc4d864a8
Fix HOM removal not working properly for non-green resolutions
2018-08-31 17:14:44 +01:00
Steel Titanium
277bec55c2
Only do this if the admin player isn't the server host also.
2018-08-30 18:32:26 -04:00
Digiku
b24a04989e
Merge branch 'nights-nofastattract' into 'master'
...
NiGHTS: Dummy out faster item attract
See merge request STJr/SRB2Internal!183
2018-08-30 17:26:42 -04:00
mazmazz
dcca56bc04
Dummy out NiGHTS item faster attract
2018-08-30 10:50:03 -04:00
Digiku
2b18908fe4
Merge branch 'nights-inufixes' into 'master'
...
NiGHTS Minor Fixes: Snappier paraloop attract; drill mash penalty; configurable link timer
See merge request STJr/SRB2Internal!156
2018-08-30 09:12:55 -04:00
mazmazz
f8588739b8
Drill mash penalty fix
2018-08-30 09:09:19 -04:00
mazmazz
631a053e92
Merge remote-tracking branch 'origin/master' into nights-inufixes
2018-08-30 08:13:34 -04:00
