Digiku
5101d6ef36
Merge branch 'nights-fastercapsule' into 'master'
...
NiGHTS: Faster Egg Capsule destruct sequence
See merge request STJr/SRB2Internal!164
2018-11-21 16:30:01 -05:00
Digiku
180a6b3dc2
Merge branch 'nights-onfootcapsulefix' into 'master'
...
NiGHTS: Allow player to destroy capsule on-foot before transforming into NiGHTS
See merge request STJr/SRB2Internal!185
2018-11-21 16:29:37 -05:00
mazmazz
3bb75690c4
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
mazmazz
99b24d6bcf
Force chasecam for tutorialmode
2018-11-12 20:37:55 -05:00
mazmazz
c9f56017d2
Freeze camera values in tutorialmode with proper defaults
2018-11-12 18:08:24 -05:00
mazmazz
e956536bb8
Merge branch 'tutorial-time' into tutorial-time-camera
2018-11-12 17:41:49 -05:00
Monster Iestyn
7989e9a482
Merge branch 'public_next'
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
2018-11-10 15:41:57 +00:00
mazmazz
722929a661
Force camera defaults during tutorialmode (doesn't work in all cases)
2018-11-10 01:31:30 -05:00
Monster Iestyn
5532882303
Merge branch 'master' into next
2018-11-09 23:18:14 +00:00
MPC
eef8119123
Minor remote viewpoint bugfixes.
2018-11-05 20:40:51 -02:00
Monster Iestyn
37f32fa251
Merge branch 'master' into next
2018-10-14 20:49:35 +01:00
Monster Iestyn
34728b3031
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
Monster Iestyn
89d7c55878
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/lua_script.c
# src/p_user.c
# src/sdl/i_system.c
# src/v_video.c
# src/w_wad.c
2018-10-10 14:51:34 +01:00
Monster Iestyn
f3ebe6585e
Move player + player mobj existence checks to top of P_MoveChaseCamera. This is the only place it makes sense to even check them tbh.
...
While I'm at it, let's also use the "mo" variable instead of player->mo throughout the function (to be consistent)
2018-09-30 22:18:48 +01:00
mazmazz
b4ba440c1b
MP Jingle: Fix underwater music not restoring on air bubble or shield
2018-09-21 15:44:52 -04:00
mazmazz
9d4ef0397c
MP Jingle: Remove P_RestoreMusic from space countdown (no reason to have it)
2018-09-20 19:05:05 -04:00
mazmazz
e0feed7210
EndOfLevel: Check player->exiting > 0 && <= TICRATE, fixes start-of-level fading in 2.1
...
Braces in y_inter.c
2018-09-18 23:27:00 -04:00
mazmazz
54d02e1d9a
musicplus-feature-endoflevel 2.2 -> 2.1 backport
2018-09-18 15:50:12 -04:00
mazmazz
77381cd984
musicplus-jingle 2.2 -> 2.1 backport
2018-09-18 15:10:00 -04:00
mazmazz
32c48af258
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
mazmazz
5f3512546b
A number
2018-09-09 20:51:08 -04:00
mazmazz
56d9522a62
Merge branch 'master' into nights-dronebox
2018-09-07 09:06:32 -04:00
mazmazz
520ee1e189
Revert "Ideya fixes when a player has more than one Ideya"
...
This reverts commit fe37d1e3e0
2018-09-07 08:56:53 -04:00
mazmazz
6b97930889
Merge branch 'master' into nights-fastercapsule
2018-09-07 08:56:02 -04:00
mazmazz
3f971ee921
Deduct marescore immediately on instakill
...
* Deduct player->spheres too, missed that one
2018-09-07 08:19:22 -04:00
mazmazz
54084b8aa4
Merge branch 'master' into nights-keeppoints
2018-09-07 08:13:57 -04: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
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
Monster Iestyn
d60ade9f95
Merge branch 'master' into hud-n-menu-tidbits
2018-08-29 21:28:11 +01:00
Monster Iestyn
3c65251bb6
Merge branch 'master' into hud-cleaning
...
# Conflicts:
# src/y_inter.c
2018-08-29 16:39:02 +01:00
mazmazz
c43c15ff10
Merge remote-tracking branch 'origin/master' into nightsplus-le
2018-08-29 11:06:00 -04:00
mazmazz
2ee3228ee4
Merge remote-tracking branch 'origin/master' into nightsplus-laplogic
2018-08-29 10:16:49 -04:00
Digiku
ce1127e5c9
Merge branch 'nights-bumper-fix' into 'master'
...
NiGHTS: Fix player positioning when touching Bumper
See merge request STJr/SRB2Internal!165
2018-08-29 06:02:24 -04:00
Digiku
8389cb9f03
Merge branch 'nights-nightserizeangle' into 'master'
...
NiGHTS: Reset player another/flyangle on De/Nightserize
See merge request STJr/SRB2Internal!139
2018-08-29 04:27:02 -04:00
Monster Iestyn
6c85af79f6
Merge branch 'master' into hud-n-menu-tidbits
...
# Conflicts:
# src/m_menu.c
# src/screen.c
# src/st_stuff.c
2018-08-28 20:51:46 +01:00
Monster Iestyn
dc6b52a449
Add INFLIVES macro, to make it easier to find infinite lives-related code
2018-08-23 20:09:39 +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
