Commit graph

4599 commits

Author SHA1 Message Date
mazmazz
0b365d0d08 Initial polyobj fade skeleton 2018-09-07 15:27:18 -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
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
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
Monster Iestyn
6ae78da47e Merge branch 'master' into next 2018-09-02 13:00:56 +01:00
Monster Iestyn
4b5ebef6c2 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
54fec7fa5c Merge branch 'master' into addfile-verify-fix 2018-09-01 19:33:59 -04:00
Monster Iestyn
322da62b3c Fix HOM removal not working properly for non-green resolutions 2018-08-31 17:14:44 +01:00
Steel Titanium
0f5d685d1f Only do this if the admin player isn't the server host also. 2018-08-30 18:32:26 -04:00
Digiku
6ab0eb53f9 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
fed72c344a Dummy out NiGHTS item faster attract 2018-08-30 10:50:03 -04:00
Digiku
baa6ba6899 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
dae37e2749 Drill mash penalty fix 2018-08-30 09:09:19 -04:00
mazmazz
a44be49535 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
28bbe71c57 Merge branch 'hud-cleaning' into 'master'
Hud cleaning

See merge request STJr/SRB2Internal!170
2018-08-29 16:22:48 -04:00
Monster Iestyn
523a02aa54 Merge branch 'master' into hud-cleaning 2018-08-29 20:46:35 +01:00
Monster Iestyn
1c5080151d Fix typo introduced by changes to the setrings command 2018-08-29 20:46:08 +01:00
Monster Iestyn
a48326383c Merge branch 'master' into hud-cleaning
# Conflicts:
#	src/y_inter.c
2018-08-29 16:39:02 +01:00
mazmazz
6d97a10273 Merge remote-tracking branch 'origin/master' into nightsplus-le 2018-08-29 11:06:00 -04:00
Digiku
900cbf72c8 Merge branch 'nightsplus-laplogic' into 'master'
NiGHTS: Track player mare lap variables

See merge request STJr/SRB2Internal!143
2018-08-29 10:58:05 -04:00
mazmazz
dc86fe9b5f Merge remote-tracking branch 'origin/master' into nightsplus-laplogic 2018-08-29 10:16:49 -04:00
Digiku
e0601616fe Merge branch 'nights-bumper-fix' into 'master'
NiGHTS: Fix player positioning when touching Bumper

See merge request STJr/SRB2Internal!165
2018-08-29 06:02:24 -04:00
Digiku
a28cc10861 Merge branch 'op-nights-bumper' into 'master'
Objectplace: Place NiGHTS Bumpers with the player's fly angle

See merge request STJr/SRB2Internal!166
2018-08-29 06:01:27 -04:00
Digiku
f8332f6765 Merge branch 'nights-nightserizeangle' into 'master'
NiGHTS: Reset player another/flyangle on De/Nightserize

See merge request STJr/SRB2Internal!139
2018-08-29 04:27:02 -04:00
Digiku
4882b7c3f8 Merge branch 'intermission-bonuslivesmax' into 'master'
Intermission: MaxBonusLives level header option for # of lives in score tally

See merge request STJr/SRB2Internal!162
2018-08-29 04:25:03 -04:00
Digiku
9746442a93 Merge branch 'le-ringspheres' into 'master'
Line Execs: Make Ring triggers accept spheres in NiGHTS levels

See merge request STJr/SRB2Internal!163
2018-08-29 04:24:47 -04:00