mazmazz
0f3351d6a3
Merge branch 'musicplus-core' into musicplus-fade-sdltimer
2018-08-18 09:34:49 -04:00
mazmazz
0c7e4a05aa
HAVE_LUA_MUSICPLUS for testing
2018-08-18 09:33:37 -04:00
mazmazz
3488501b03
Add "finalize" flag to Type 453 Stop Fade
2018-08-18 06:04:11 -04:00
mazmazz
de559a4e30
Merge branch 'le-fadefof' of https://git.magicalgirl.moe/STJr/SRB2Internal into le-fadefof
2018-08-18 05:35:55 -04:00
mazmazz
95a6299ff6
P_ResetFakeFloorFader: Unclamp rover->alpha from software levels
2018-08-18 05:31:41 -04:00
mazmazz
1307508314
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
ccf5a0a810
Add alpha clamping so OpenGL conforms to Software's translucent levels
2018-08-17 17:07:07 -04:00
mazmazz
81d7039f8e
Cleanup fade fake floor code
2018-08-17 15:59:34 -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
9b88c25fda
Revised and re-organized P_DoFakeFloorAlpha fading procedure
...
* dosolid routine now refers to spawnflags
2018-08-17 14:49:33 -04:00
Digiku
20bb759ff6
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
9b0e9a58fe
Revert "Checkpoint (unfinished): player->totalsphere"
...
This reverts commit 4aade072ef
2018-08-17 09:09:10 -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
c56dc6d0c7
Checkpoint: Move fadingdata to line_t (or ffloor_t?)
2018-08-17 00:32:20 -04:00
mazmazz
d92fca91d1
Merge branch 'le-fadefof-remove-storedthinker' into le-fadefof
2018-08-16 23:38:03 -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
6dd64bccbc
Place backwards Bumpers with the correct Thing angle
2018-08-16 22:07:53 -04:00
Monster Iestyn
004fd77b41
Merge branch 'master' into next
2018-08-16 22:04:00 +01:00
Monster Iestyn
0792e78254
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
6797976531
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
5fdece424a
Adjust vertical angle and forwards/backwards of NiGHTS bumper in objectplace
2018-08-16 16:51:48 -04:00
mazmazz
4aade072ef
Checkpoint (unfinished): player->totalsphere
2018-08-16 13:11:32 -04:00
mazmazz
32939a11f1
Change SETRINGS to support player->spheres in NiGHTS
2018-08-16 12:13:57 -04:00
mazmazz
ed9e74c15a
Line from revert
2018-08-16 11:35:35 -04:00
mazmazz
4b8fd01bc0
Revert "SETSPHERES console command for debugging/cheating"
...
This reverts commit 9e8784a376
2018-08-16 11:34:57 -04:00
mazmazz
2fcb94d408
Make Ideya Anchor use parameter # instead of angle for Ideya ID
2018-08-16 11:25:35 -04:00
toaster
95c11ef732
Realised I'd forgotten to stop the item explosion from being encoremapped.
2018-08-16 15:29:34 +01:00
mazmazz
675ed7ecf0
Don't apply autobrake on NiGHTS bumpers
2018-08-15 23:40:42 -04:00
mazmazz
c7b914c2ce
Force non-nights player into rolling animation when destructing capsule
2018-08-15 23:11:32 -04:00
mazmazz
2b5dd97446
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
baa4c30e99
Also center non-NiGHTS players on NiGHTS bumpers
2018-08-15 19:09:54 -04:00
mazmazz
6010822c84
Use more efficient position setting. For Z, also adjust for bumper mobj scale.
2018-08-15 18:50:28 -04:00
mazmazz
1381ffc3e6
Fix NiGHTS Bumper player positioning
2018-08-15 18:42:20 -04:00
mazmazz
22e95a58da
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
8a348794a3
Fix issue where capsule immediately re-triggers if player gains rings during destruct
2018-08-15 13:49:03 -04:00
mazmazz
c072b15e4f
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
3288b73ad0
Make camera further if on-foot and destroying the Egg Capsule
2018-08-15 12:29:06 -04:00
mazmazz
513a0a54ec
Counter fix
2018-08-15 12:22:46 -04:00
mazmazz
79ebbdc360
Merge branch 'nights-onfootcapsulefix' into nights-fastercapsule
2018-08-15 12:09:46 -04:00
mazmazz
10f8337347
Checkpoint: Basic functions
2018-08-15 12:07:08 -04:00
toaster
b637ae3d73
Additional oversight corrected.
2018-08-15 16:59:28 +01:00
toaster
2b9068378f
Correct minor issue with random map name selection.
2018-08-15 16:56:26 +01:00
toaster
0b772c2477
Merge branch 'sonicitems' into encore
2018-08-15 16:12:42 +01:00
toaster
42e63fc32e
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 16:12:36 +01:00
toaster
3e63209d68
Make some minor tweaks to the two server setup menus (splitscreen and not-splitscreen).
...
I wouldn't have done this, but I was already in the code to fix the bugs, so I hit something that was bugging me[/sonic adventure voice] as well
2018-08-15 15:22:50 +01:00
toaster
6596d18ada
Add some more safety checks to the item system.
...
While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
2018-08-15 14:40:06 +01:00
toaster
d7f6016e93
Fix alignment of rocket sneaker bar.
2018-08-15 14:05:13 +01:00
mazmazz
49c392334e
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
da5fd51feb
Fix merge errors
2018-08-15 02:42:50 -04:00
