mazmazz
c1d1f08ea6
extracolormap_t refinement and netsyncing
...
* Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor)
* Crunched some UINT16/32 into UINT8
* Calculate mask values in R_CreateLightTable
* ifdef out EXTRACOLORMAPLUMPS
2018-09-10 20:36:34 -04:00
mazmazz
78f984e362
Remove bottommap and topmap from savegame because unused
2018-09-10 16:50:35 -04:00
mazmazz
27a8309ea4
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 16:50:27 -04: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
93fa4d2f3a
Savegame floorrover fixes
2018-09-10 00:07:22 -04:00
mazmazz
1c878ccce1
Store sectornum/ffloornum as UINT32, not INT32
2018-09-09 23:52:36 -04:00
mazmazz
45228f823c
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-09 23:48:42 -04:00
mazmazz
5402e8a9a3
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-09 23:12:37 -04:00
mazmazz
4a6ddbd496
Replace firsttic with timer increment
2018-09-09 21:01:00 -04:00
mazmazz
ecfc2e66f1
Replace firsttic with timer increment
2018-09-09 20:45:12 -04:00
mazmazz
97bc852b80
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-09 20:18:57 -04:00
mazmazz
8efe62e4de
Replace firsttic with decrement timer
2018-09-09 20:18:43 -04:00
mazmazz
f77957ddf0
Added tic-based logic to FOF fade (ML_EFFECT5)
2018-09-09 19:31:32 -04:00
mazmazz
44ba282d5f
Finalize light level on fade finish (not forced stop)
...
* Added destlightlevel property to fade_t
* Fixed dotranslucent, dolighting, docollision order weirdness in function calls
2018-09-09 17:20:35 -04:00
mazmazz
18c6f560e4
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-09 13:44:30 -04: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
b0fca6b7b4
Polyobject Fade logic
2018-09-09 08:08:48 -04:00
mazmazz
8571b407c6
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-08 23:03:18 -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
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
mazmazz
47dce92d8b
Add dolighting flag to FadeFakeFloor thinker
2018-09-08 20:41:45 -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
9055c58783
Initial polyobj fade skeleton
2018-09-07 15:27:18 -04:00
mazmazz
56d9522a62
Merge branch 'master' into nights-dronebox
2018-09-07 09:06:32 -04:00
mazmazz
71b1a78f76
Merge branch 'master' into le-fadefof
2018-09-06 18:12:24 -04:00
mazmazz
ccf5a0a810
Add alpha clamping so OpenGL conforms to Software's translucent levels
2018-08-17 17:07:07 -04:00
mazmazz
5a3499f833
Refactor function and variable names; change defaults for fake floor fader line flags
2018-08-17 15:25:25 -04:00
mazmazz
1f51c8e076
Move fading thinker to ffloor_t.fadingdata
2018-08-17 02:28:52 -04:00
mazmazz
52f7b009f0
Move fadingdata (fade_t thinker) to line_t
2018-08-17 01:11:04 -04:00
mazmazz
9f9bf86d2b
Rename dofadeinonly to doghostfade
...
* Ghost fading: when transitioning to/from alpha=0, don't set solid/tangibility until fade is finished
2018-08-16 22:27:26 -04:00
mazmazz
4f5ca26ce5
Attach fade_t thinker to proper control sector upon savegame load
2018-08-13 22:17:58 -04:00
mazmazz
d24de8bc2f
totalmarescore player variable for NiGHTS scoring
...
# Conflicts:
# src/p_setup.c
2018-08-12 19:59:34 -04:00
mazmazz
9a9a2d94cc
totalmarelap and totalmarebonuslap player variables
2018-08-12 19:57:33 -04:00
mazmazz
269c1a70ba
Add lapbegunat and lapstartedtime player variables
...
There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
2018-08-12 14:21:26 -04:00
toaster
0b65b7a009
Fixed Encore remappings not being loaded when joining mid-netgame.
2018-08-12 11:20:53 +01:00
mazmazz
c5d6dd55d5
player->oldscale var for pre-Nightserize scale
2018-08-11 00:49:28 -04:00
mazmazz
60f6792ad0
Basic implementation for player position correction to Drone center
...
* player->drone mobj variable
* P_MoveNiGHTSToDrone, will change later
2018-08-10 19:25:49 -04:00
mazmazz
2f5186d014
Add lastmarelap and lastmarebonuslap player variables
2018-08-10 16:30:49 -04:00
mazmazz
79d5c553c3
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic
...
# Conflicts:
# src/p_map.c
# src/p_setup.c
2018-08-10 15:10:26 -04:00
mazmazz
5e5ec4a71a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof-remove-storedthinker
2018-08-10 15:03:07 -04:00
mazmazz
052bd347bb
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic
...
# Conflicts:
# src/p_setup.c
2018-08-10 13:35:59 -04:00
mazmazz
f8a3343500
Track player's previous mare rings with player->finishedrings.
...
There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.
2018-08-10 04:05:20 -04:00
toaster
d582a9dd97
Encore mode - a fresh take on mirror mode!
...
* Palette remaps.
* Branding.
TODO:
* Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but...
* Transmaps are broken in Encore for some reason.
* I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 23:50:41 +01:00
TehRealSalt
08066c1cf4
Map reset timer
2018-07-21 15:54:05 -04:00
Sryder
a7ea4db50d
Merge branch 'master' into sonicitems
2018-07-06 23:33:54 +01:00
toaster
3d5ee263e0
Fix a crashy oversight in the archiving!
2018-07-06 23:18:18 +01:00
toaster
da7407b6ad
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems
2018-07-06 20:40:47 +01:00
Sryder
47230e69c5
Always send gamestate to joiners.
...
It's cut down already outside of levels, needed to stop Lua sending mobj references during intermission though.
This is needed because in the past there was a separate way to send player information to joiners that has since been removed. Meaning player information is always desynched for joiners during anything but levels.
2018-07-06 20:25:13 +01:00
TehRealSalt
cbcd2cbb07
WANTED recalculates on hit, tons of spectator changes
2018-07-03 21:12:25 -04:00
