mazmazz
35e58d3c8c
420: A parenthesis
2018-09-12 21:49:03 -04:00
mazmazz
3b7f7cf305
Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased
2018-09-12 21:35:46 -04:00
mazmazz
ef7de5f543
420: Allow Back Y Offset for timing parameter
2018-09-12 21:32:12 -04:00
Monster Iestyn
bab4a67516
Merge branch 'master' into change-colormap-ldef
2018-09-11 16:43:01 +01:00
Monster Iestyn
78130e830e
Merge branch 'public_next'
...
# Conflicts:
# src/p_setup.c
# src/r_data.c
2018-09-11 16:41:27 +01:00
Monster Iestyn
d8f73b0d97
Merge branch 'master' into next
2018-09-11 16:34:16 +01:00
mazmazz
b13103603f
Use percentage calc instead of interval decrement for tic-based timing
2018-09-11 10:05:25 -04:00
mazmazz
fe4938a1c2
Move tic-based to EFFECT4
2018-09-10 12:00:44 -04:00
Monster Iestyn
22b799a655
Remove commented out stuff, now I've confirmed everything works fine without them
2018-09-10 15:49:21 +01:00
mazmazz
473d902696
Remove bottommap and topmap from savegame because unused
2018-09-10 09:03:58 -04:00
mazmazz
8a4bb895af
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 09:01:09 -04:00
mazmazz
8efe62e4de
Replace firsttic with decrement timer
2018-09-09 20:18:43 -04:00
Monster Iestyn
a5ba47cb3a
R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
...
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
mazmazz
cbf692fc52
Revert "Snap light level to software values (32 levels)"
...
This reverts commit 8ec3e23ed5
2018-09-09 13:43:00 -04:00
mazmazz
96d8723238
Flag re-organization
...
* Change alternate param flag from BLOCKMONSTERS to DONTPEGBOTTOM
* Change tic-based flag from NOCLIMB to EFFECT5
2018-09-09 09:34:36 -04:00
mazmazz
47cf5ebdd7
Merge branch 'master' into change-colormap-ldef
2018-09-09 08:40:38 -04:00
mazmazz
8ec3e23ed5
Snap light level to software values (32 levels)
...
* New properties `exactlightlevel` and `lightlevel` in `lightlevel_t`
2018-09-08 23:01:35 -04:00
mazmazz
53568d3808
Split P_FadeLight into P_FadeLightBySector
2018-09-08 22:14:49 -04:00
mazmazz
07c6705bdb
Implemented tic-based light fading
...
* ML_BLOCKMONSTERS specifies destvalue and speed by texture offsets
* ML_NOCLIMB toggles tic-based logic
* Added props `duration`, `interval`, and `firsttic` to `lightlevel_t`
2018-09-08 22:10:51 -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
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
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
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
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
mazmazz
dcca56bc04
Dummy out NiGHTS item faster attract
2018-08-30 10:50:03 -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
