mazmazz
7833612c9e
HAVE_LUA_MUSICPLUS for testing
2018-08-18 09:33:37 -04:00
mazmazz
4b07246565
Add "finalize" flag to Type 453 Stop Fade
2018-08-18 06:04:11 -04:00
mazmazz
02c0635765
Merge branch 'le-fadefof' of https://git.magicalgirl.moe/STJr/SRB2Internal into le-fadefof
2018-08-18 05:35:55 -04:00
mazmazz
773d8bdb8d
P_ResetFakeFloorFader: Unclamp rover->alpha from software levels
2018-08-18 05:31:41 -04:00
mazmazz
251c767e35
Merge branch 'le-fadefof-ffloorthinker' into le-fadefof
...
# Conflicts:
# src/p_saveg.c
# src/p_spec.c
2018-08-17 17:12:49 -04:00
mazmazz
d94608fa10
Add alpha clamping so OpenGL conforms to Software's translucent levels
2018-08-17 17:07:07 -04:00
mazmazz
bf5efe6457
Cleanup fade fake floor code
2018-08-17 15:59:34 -04:00
mazmazz
45ae6efbad
Refactor function and variable names; change defaults for fake floor fader line flags
2018-08-17 15:25:25 -04:00
mazmazz
020b18b84b
Revised and re-organized P_DoFakeFloorAlpha fading procedure
...
* dosolid routine now refers to spawnflags
2018-08-17 14:49:33 -04:00
Digiku
e943259057
Remove unnecessary totalring deduction condition
...
Because it would be triggered by !(maptol & TOL_NIGHTS) in the old code anyway
2018-08-17 09:11:59 -04:00
Digiku
792360ea97
Revert "Checkpoint (unfinished): player->totalsphere"
...
This reverts commit 6a0175147f
2018-08-17 09:09:10 -04:00
mazmazz
677f19ede6
Move fading thinker to ffloor_t.fadingdata
2018-08-17 02:28:52 -04:00
mazmazz
2e252cb905
Move fadingdata (fade_t thinker) to line_t
2018-08-17 01:11:04 -04:00
mazmazz
52f5dbd52f
Checkpoint: Move fadingdata to line_t (or ffloor_t?)
2018-08-17 00:32:20 -04:00
mazmazz
cf853e3982
Merge branch 'le-fadefof-remove-storedthinker' into le-fadefof
2018-08-16 23:38:03 -04:00
mazmazz
931297e2d7
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
e8c221f691
Place backwards Bumpers with the correct Thing angle
2018-08-16 22:07:53 -04:00
Monster Iestyn
b63290211a
Merge branch 'master' into next
2018-08-16 22:04:00 +01:00
Monster Iestyn
a4cfa9e82a
Merge branch 'lua-sector-names-fix' into 'next'
...
Lua sector names fix
See merge request STJr/SRB2!263
2018-08-16 16:57:41 -04:00
Monster Iestyn
364339e1ce
Merge branch 'sdl_mixer_fixes' into 'master'
...
SDL Mixer fixes
Closes #31
See merge request STJr/SRB2!260
2018-08-16 16:57:14 -04:00
mazmazz
18b6b53722
Adjust vertical angle and forwards/backwards of NiGHTS bumper in objectplace
2018-08-16 16:51:48 -04:00
mazmazz
6a0175147f
Checkpoint (unfinished): player->totalsphere
2018-08-16 13:11:32 -04:00
mazmazz
7474e073f8
Change SETRINGS to support player->spheres in NiGHTS
2018-08-16 12:13:57 -04:00
mazmazz
03c4a626c3
Line from revert
2018-08-16 11:35:35 -04:00
mazmazz
365a59f186
Revert "SETSPHERES console command for debugging/cheating"
...
This reverts commit 4cb7036f51
2018-08-16 11:34:57 -04:00
mazmazz
d01ca9fe95
Make Ideya Anchor use parameter # instead of angle for Ideya ID
2018-08-16 11:25:35 -04:00
mazmazz
08f35c0792
Don't apply autobrake on NiGHTS bumpers
2018-08-15 23:40:42 -04:00
mazmazz
81dade0cc4
Force non-nights player into rolling animation when destructing capsule
2018-08-15 23:11:32 -04:00
mazmazz
c3cb08d712
Reconcile spheres at end of destruct if you somehow gained or lost an unexpected # after timing calculations
2018-08-15 22:35:09 -04:00
mazmazz
432c1ab862
Also center non-NiGHTS players on NiGHTS bumpers
2018-08-15 19:09:54 -04:00
mazmazz
67da64a064
Use more efficient position setting. For Z, also adjust for bumper mobj scale.
2018-08-15 18:50:28 -04:00
mazmazz
55d2da2201
Fix NiGHTS Bumper player positioning
2018-08-15 18:42:20 -04:00
mazmazz
45612f9add
Recalc capsule timing when leaving the capsule during destruct sequence (somehow)
...
* Would be nice to have more sophisticated behavior, e.g., resume the old timing; or drop out the capsule entirely. But how often is this case really going to happen?
2018-08-15 13:59:27 -04:00
mazmazz
ae0b7c9be8
Fix issue where capsule immediately re-triggers if player gains rings during destruct
2018-08-15 13:49:03 -04:00
mazmazz
2e8c4b5545
Fixed capsule timing logic
...
* Force a total time, stretch out sphere deduction within that time
* Make it more readable
2018-08-15 13:38:15 -04:00
mazmazz
59f71e4c48
Make camera further if on-foot and destroying the Egg Capsule
2018-08-15 12:29:06 -04:00
mazmazz
52e451aad5
Counter fix
2018-08-15 12:22:46 -04:00
mazmazz
02aed5b019
Merge branch 'nights-onfootcapsulefix' into nights-fastercapsule
2018-08-15 12:09:46 -04:00
mazmazz
8452ec5c7c
Checkpoint: Basic functions
2018-08-15 12:07:08 -04:00
mazmazz
d93ca34859
Hide MusicPlus lua behind an #ifdef HAVE_LUA_MUSICPLUS
...
# Conflicts:
# src/lua_hook.h
# src/lua_hooklib.c
# src/p_user.c
2018-08-15 03:37:11 -04:00
mazmazz
0254f4f368
Fix merge errors
2018-08-15 02:42:50 -04:00
mazmazz
878ea36559
Lua: Make P_RestoreMusic follow the non-local player nil output convention
2018-08-15 02:29:26 -04:00
mazmazz
8fe4c369bf
Lua: Fix music functions not returning proper values
...
# Conflicts:
# src/lua_baselib.c
2018-08-15 02:29:04 -04:00
mazmazz
6bde90f887
Lua: Make S_SpeedMusic and S_ChangeMusic return nil for invalid players
2018-08-15 02:23:18 -04:00
mazmazz
c71719ac6b
Music lua: Return nil for invalid players and non-nil for valid players
...
# Conflicts:
# src/lua_baselib.c
2018-08-15 02:22:52 -04:00
mazmazz
9dbc807528
Make S_StopMusic return nil for invalid player, true otherwise
2018-08-15 02:21:18 -04:00
mazmazz
8d0044c5f1
Lua S_GetMusicPosition: Remove erroneous position input line
...
# Conflicts:
# src/lua_baselib.c
2018-08-15 02:20:56 -04:00
mazmazz
3fb4559480
Lua: Make S_GetMusicPosition and S_SetMusicPosition return nil when non-local player is passed
2018-08-15 02:19:12 -04:00
mazmazz
9a5800d2bb
Lua: Added player_t input to S_DigitalPlaying, S_MidiPlaying, S_MusicPlaying, S_MusicPaused, S_MusicName
2018-08-15 02:19:06 -04:00
mazmazz
95e4d0d423
Add player parameter to S_GetMusicPosition lua
...
# Conflicts:
# src/lua_baselib.c
2018-08-15 02:18:46 -04:00
