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
|
08f35c0792
|
Don't apply autobrake on NiGHTS bumpers
|
2018-08-15 23:40:42 -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
|
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 |
|
mazmazz
|
e0ab8c1ed0
|
Fix #6 #7 SDL looping and counter bugs when looping=false
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 02:15:05 -04:00 |
|
mazmazz
|
11c6148d4b
|
SDL: Fix looping bug when looping=false; reset bytes counter when non-looping
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 02:11:17 -04:00 |
|
mazmazz
|
a9776f7b25
|
Undoing malloc for S_MusicName, pass music_name instead.
I don't think there's a reason for copying to a new var.
|
2018-08-15 02:11:01 -04:00 |
|
mazmazz
|
44c7410a41
|
Add S_DigitalPlaying
|
2018-08-15 02:10:53 -04:00 |
|
mazmazz
|
47423a69ed
|
Refactor to SetMusicPosition, GetMusicPosition
# Conflicts:
# src/lua_baselib.c
# src/nds/i_sound.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
|
2018-08-15 02:10:46 -04:00 |
|
mazmazz
|
0ea40321ca
|
S_MusicName copy music_name to new buffer (is this ok?)
|
2018-08-15 02:07:51 -04:00 |
|
mazmazz
|
34ea90600a
|
Support mflags and looping in MusicChange hook
# Conflicts:
# src/lua_hook.h
|
2018-08-15 02:07:33 -04:00 |
|
mazmazz
|
d14eedd700
|
Implemented MusicChange lua hook
# Conflicts:
# src/lua_hook.h
# src/lua_hooklib.c
|
2018-08-15 02:06:43 -04:00 |
|
mazmazz
|
79531b9683
|
Another loop fix to resolve music_bytes not resetting on non-looppoint tracks
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 02:03:04 -04:00 |
|
mazmazz
|
2e9dba352a
|
SDL mixer: Fix no looping bug when changing song position
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 02:02:33 -04:00 |
|
mazmazz
|
662c366830
|
S_MusicName, S_MusicExists, S_PauseMusic lua, S_ResumeMusic lua
# Conflicts:
# src/lua_baselib.c
|
2018-08-15 02:01:34 -04:00 |
|
mazmazz
|
eb52a14433
|
Implement I_MIDIPlaying, I_MusicPlaying, I_MusicPaused in other targets
# Conflicts:
# src/nds/i_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
|
2018-08-15 01:59:01 -04:00 |
|
mazmazz
|
d39f804662
|
Use Mix_PausedMusic instead of our own music_paused flag in SDL2/SDL1.2 I_MusicPaused
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 01:55:49 -04:00 |
|