lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6254 commits 1 branch 29 tags 122 MiB
Commit graph

693 commits

Author SHA1 Message Date
mazmazz 93626c2293 Merge remote-tracking branch 'public-gl/next' into public-musicplus-core 2019-03-13 19:45:07 -04:00
Jimita the Cat 0186f6784b a 2019-03-06 21:40:38 -03:00
Monster Iestyn 7a0d8b408e Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/m_menu.h
 2019-02-27 22:36:01 +00:00
Monster Iestyn a25f4b8194 Make sure that B_CheckRespawn can be called even if Tails is dead 2019-02-26 21:14:22 +00:00
Monster Iestyn 8f667906eb Fix compiler warnings 2019-02-13 18:06:56 +00:00
mazmazz b3f7b169b2 Merge errors for compile 2019-01-07 17:05:20 -05:00
mazmazz 075f28b7c8 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz b7bb570f97 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
Monster Iestyn 01588ea967 Fix bot players using the respawning code meant only for real players to use 2018-12-24 17:59:12 +00:00
Digiku 9525de2d83 Merge branch 'camera-backport' into 'next' 
Suggestion: 2.2 camera changes backport

See merge request STJr/SRB2!393
 2018-12-20 16:57:23 -05:00
Jimita 362fb491f7
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-17 15:40:20 -02:00
TehRealSalt e763eab6cd 2.2 camera changes backport 
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.

These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
 2018-12-16 18:18:59 -05:00
Jimita 966afb6017
Update p_user.c 2018-12-12 13:09:47 -02:00
MPC c68875ad93 Fix remote viewpoint cameras for real 
I'm so sorry
 2018-12-11 20:48:45 -03:00
Monster Iestyn 582c5332f4 Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens 2018-12-11 18:39:58 +00:00
Monster Iestyn 1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
mazmazz 6a3b41ea6f Let skins jump their regular strength variances in NiGHTS 2018-11-21 21:24:44 -05:00
mazmazz 40eda0e749 Nerf jumping 2018-11-21 21:13:15 -05:00
Digiku c6bd1111e5 Merge branch 'nights-dronebox' into 'master' 
NiGHTS: Drone hitbox improvements and player position correction on Nightserize

See merge request STJr/SRB2Internal!158
 2018-11-21 20:19:39 -05:00
Digiku f3e4cf1f9d 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 597877773b 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 74da082c75 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-20 23:19:36 -05:00
mazmazz 7ec4a42d9f Force chasecam for tutorialmode 2018-11-12 20:37:55 -05:00
mazmazz 118da60615 Freeze camera values in tutorialmode with proper defaults 2018-11-12 18:08:24 -05:00
mazmazz a58461c29e Merge branch 'tutorial-time' into tutorial-time-camera 2018-11-12 17:41:49 -05:00
Monster Iestyn 268bde3fdf 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 ffed9f4d20 Force camera defaults during tutorialmode (doesn't work in all cases) 2018-11-10 01:31:30 -05:00
Monster Iestyn 4b8232d777 Merge branch 'master' into next 2018-11-09 23:18:14 +00:00
MPC 1cc8619c9e Minor remote viewpoint bugfixes. 2018-11-05 20:40:51 -02:00
Monster Iestyn fe2af34ee5 Merge branch 'master' into next 2018-10-14 20:49:35 +01:00
Monster Iestyn 9c464742b7 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 291ebf302c 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 800b3bb240 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 1dd47e850b 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 d542c2440d musicplus-feature-endoflevel 2.2 -> 2.1 backport 2018-09-18 15:50:12 -04:00
mazmazz c5ea6b5efe MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
mazmazz 7a3eb31b57 A number 2018-09-09 20:51:08 -04:00
mazmazz bc2f48a018 Merge branch 'master' into nights-dronebox 2018-09-07 09:06:32 -04:00
mazmazz c0ffbdafce Revert "Ideya fixes when a player has more than one Ideya" 
This reverts commit e3facccb9d.
 2018-09-07 08:56:53 -04:00
mazmazz 4fe1b2652d Merge branch 'master' into nights-fastercapsule 2018-09-07 08:56:02 -04:00
mazmazz 49b27fc124 Deduct marescore immediately on instakill 
* Deduct player->spheres too, missed that one
 2018-09-07 08:19:22 -04:00
mazmazz c50a0d60f5 Merge branch 'master' into nights-keeppoints 2018-09-07 08:13:57 -04:00
Digiku 01314b6674 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 fed72c344a Dummy out NiGHTS item faster attract 2018-08-30 10:50:03 -04:00
mazmazz dae37e2749 Drill mash penalty fix 2018-08-30 09:09:19 -04:00
mazmazz a44be49535 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn 5eddb1f455 Merge branch 'master' into hud-n-menu-tidbits 2018-08-29 21:28:11 +01:00
Monster Iestyn a48326383c Merge branch 'master' into hud-cleaning 
# Conflicts:
#	src/y_inter.c
 2018-08-29 16:39:02 +01:00
mazmazz 6d97a10273 Merge remote-tracking branch 'origin/master' into nightsplus-le 2018-08-29 11:06:00 -04:00
mazmazz dc86fe9b5f Merge remote-tracking branch 'origin/master' into nightsplus-laplogic 2018-08-29 10:16:49 -04:00
Digiku e0601616fe 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 f8332f6765 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 1af8d3ac02 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 aa863e481e Add INFLIVES macro, to make it easier to find infinite lives-related code 2018-08-23 20:09:39 +01: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 1107571744 Checkpoint: Force Egg Capsule time at 60 tics 2018-08-15 00:59:29 -04:00
mazmazz 7cdce4324b Attempt 1: Guesstimate sphere pop rate and use that as the Capsule handling duration 2018-08-15 00:32:48 -04:00
mazmazz 56d8f47aaa Nights capsule faster attract timing 2018-08-14 19:48:18 -04:00
mazmazz 9faace9e5d capsule->extravalue2 tic timer 2018-08-14 19:21:32 -04:00
mazmazz 0862aece9f Ideya fixes when a player has more than one Ideya 
# Conflicts:
#	src/p_inter.c
 2018-08-14 17:21:49 -04:00
mazmazz e3facccb9d Ideya fixes when a player has more than one Ideya 2018-08-14 17:13:23 -04:00
mazmazz efdf684770 Fix Capsule Entrance exec firing repeatedly 2018-08-14 12:48:00 -04:00
mazmazz 3f312ce114 Make Bonus Time Start executor into a general Egg Capsule Touch executor 
* Entrance/exit flags
* Enough/not-enough-rings flags (with "doesn't matter" line option)
 2018-08-14 12:00:37 -04:00
mazmazz 8c57218027 Alternate take on pre-blowup: Do it on first touching tic, instead of first ring pop 
* Use MT_EGGCAPSULE extravalue2 for tic timer
 2018-08-14 11:41:10 -04:00
mazmazz 62a6fe845d Add ML_BOUNCY flag to Bonus Time executor to execute BEFORE the capsule is destroyed and player has enough spheres 2018-08-14 10:48:50 -04:00
mazmazz f1fc205b31 Deduct marescore when player hits ground 
* ~~For speedrunning~~: Land on the Drone, keep your points!
 2018-08-13 11:12:53 -04:00
mazmazz c3e0267029 Fix attraction bug on non-NiGHTS and Nightopian Helper 
* Switch from mo->movecount to mo->movefactor for type compat
* Adjust timings for regular and paraloop attraction
 2018-08-12 23:03:12 -04:00
mazmazz 296d527993 Merge nightsplus-laplogic 2018-08-12 21:20:14 -04:00
mazmazz 0c8e2ffd78 Totalmarescore typo 2018-08-12 19:59:41 -04:00
mazmazz ec8d264029 totalmarescore player variable for NiGHTS scoring 
# Conflicts:
#	src/p_setup.c
 2018-08-12 19:59:34 -04:00
mazmazz 4e02171c23 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
mazmazz c99258b2e2 Make Drone hitbox height and player Z alignment configurable 
* Default hitbox height is 80
* Drone Thing parameter sets height to multiples of 32
* Player aligns by default to bottom+24 of hitbox (offsetted)
* `MTF_OBJECTSPECIAL` aligns player to hitbox top
* `MTF_EXTRA` aligns to hitbox center
* `MTF_OBJECTSPECIAL|MTF_EXTRA` aligns to real bottom of hitbox
* Goalpost and sparkle Z alignment is changed to reflect configurableness
 2018-08-11 15:52:42 -04:00
mazmazz d1a8e0baa0 Scale player to Drone's scale on Nightserize, and reset scale on De-Nightserize 
* Also correct player's position to Z center of Drone hitbox on Nightserize
 2018-08-11 02:02:56 -04:00
mazmazz 32c17b1454 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 c72e724122 Merge branch 'nightsplus-laplogic' into nightsplus-le 
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
 2018-08-10 17:24:12 -04:00
mazmazz 872761e258 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-10 17:12:26 -04:00
mazmazz 18b5b70822 Add lastmarelap and lastmarebonuslap player variables 2018-08-10 16:30:49 -04:00
mazmazz d58445fdf3 Set player->finishedrings upon new mare 
(Forgot this line from the player->spheres merge, so let's straggle here)
 2018-08-10 16:17:28 -04:00
mazmazz f69f102531 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le 
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
 2018-08-10 15:51:20 -04:00
mazmazz 1b922b8ba5 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 d405bdfd9b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nights-inufixes 2018-08-10 15:00:41 -04:00
mazmazz d97c25f6dd Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le 
# Conflicts:
#	src/p_setup.c
#	src/p_user.c
 2018-08-10 13:44:47 -04:00
mazmazz 487c62fe31 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 bd8316f49b 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
mazmazz b05960431d Reset player->rings on denightserize and on new mare 2018-08-10 04:01:33 -04:00
mazmazz 62e288a664 Correct player->spheres deduction upon losing spheres 
player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level.

Therefore, just deduct player->spheres.
 2018-08-10 02:18:34 -04:00
mazmazz b28183129f NiGHTS drill meter penalty when mashing jump button 
Thanks Inuyasha (KS) for code
 2018-08-09 22:15:13 -04:00
mazmazz bf74b81842 Snappier NiGHTS pickup attraction 
* Old attraction is still used for non-NiGHTS players due to a momentum bug. The old way is good enough to sidestep the bug.
* Thanks Inuyasha (KS) for original code 🐶
 2018-08-09 21:24:01 -04:00