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
4228 commits 172 branches 41 tags 280 MiB
Commit graph

4228 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
6a88a65b94 Add quick macro for drawing the 1st person timer icons with timer string, add comments to ST_drawPowerupHUD 2018-08-23 22:00:37 +01:00
Monster Iestyn
0948b12eae ST_drawNiGHTSHUD tweaks: Split NiGHTS link drawing into its own function, remove "minlink" hack and just do things properly 2018-08-23 21:13:45 +01:00
Monster Iestyn
d2a4408610 Make switch case for stplyr->textvar in ST_drawNightsRecords 2018-08-23 20:27:40 +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
Monster Iestyn
32bcf11cda Merge branch 'cez-bramble-hardcode' into 'master' 
CEZ Bramble Hardcode

See merge request STJr/SRB2Internal!169
 2018-08-22 14:47:04 -04:00
Monster Iestyn
f8c4c6dbc4 Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125 2018-08-22 17:16:11 +01:00
Monster Iestyn
87e37e21df Merge branch 'public_next' 
# Conflicts:
#	src/sdl12/i_cdmus.c
#	src/win32ce/win_cd.c
 2018-08-21 15:40:54 +01:00
Monster Iestyn
2daaf637d9 Merge branch 'master' into next 2018-08-21 15:36:36 +01:00
Monster Iestyn
9d3aad9036 Merge branch 'XPMupdate' into 'master' 
update XPM icon

See merge request STJr/SRB2!267
 2018-08-21 10:31:25 -04:00
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
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
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
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
Alam Ed Arias
01a023206f Merge branch 'master' into XPMupdate 2018-08-11 21:59:39 -04:00
Alam Ed Arias
7d3e4f729f TravisCI: also remove gcc-6 2018-08-11 21:59:08 -04:00
Alam Ed Arias
b5cc11f7d8 TravisCI: gcc-4.9 is also gone 2018-08-11 21:44:07 -04:00
Alam Ed Arias
bb94d9fa3a Merge branch 'master' into XPMupdate 2018-08-11 20:37:34 -04:00
Alam Ed Arias
6603f26772 Merge branch 'xpm_fix' into 'XPMupdate' 
Fix white being treated as transparent.

See merge request STJr/SRB2!266
 2018-08-11 20:36:57 -04:00
Steel Titanium
d9c7334dea Fix white being treated as transparent. 2018-08-10 19:02:03 -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