stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
4203 commits 172 branches 41 tags 280 MiB
Commit graph

4203 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
dcf843e485 Merge branch 'defaultsoundvol' into 'master' 
Change default sound volume

See merge request STJr/SRB2!238
 2018-08-20 09:41:04 -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
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
61c84be704 Fix bonus time quirk where lines are run if player->marebonuslap is 0 
* Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.
 2018-08-14 16:08:21 -04:00
mazmazz
c3703cfc24 Comments 2018-08-14 14:57:58 -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
1cb68a615e Make LE Ring triggers accept spheres for NiGHTS levels 2018-08-14 11:10: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
841c31a6ba Attach fade_t thinker to proper control sector upon savegame load 2018-08-13 22:17:58 -04:00
mazmazz
004cbe6a3d Whitespace 2018-08-13 22:10:16 -04:00
mazmazz
ca84e7265e Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof 2018-08-13 14:47:57 -04:00
mazmazz
d8c565407c MaxBonusLives level header option for # of lives in score tally 2018-08-13 14:17:38 -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
5938a57970 totalmarelap and totalmarebonuslap player variables 2018-08-12 19:57:33 -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
02d5e4e902 MT_FLICKY_CENTER flag adjustments 2018-08-12 12:49:23 -04:00
mazmazz
2f6c0d7e4e Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1 2018-08-12 09:23:50 -04:00
Nev3r
f19b7bfacf Merge branch 'horizon-line-hom-fix' into 'master' 
Horizon line HOM fix

See merge request STJr/SRB2Internal!152
 2018-08-12 03:48:20 -04:00
mazmazz
f4a813891f Decouple Flicky Thing logic from spawnpoint variables; use mobj variables 2018-08-12 02:34:37 -04:00