toaster
6bd034e3dc
Continuing my recent streak of making random lighting/colormap-related fixes to long-standing bugs:
...
* Fix that thing where ALL transparent FOF planes were continuously fullbright unless encased in a fog which disables sprite fullbrightness, which was long-hated by many people in the community!
* For backwards compatibility, setting flag 1 in that fog field (which is probably the most common "in-the-wild" usage of this feature) will continue to make objects un-fullbright.
* For situations where you desperately want the behaviour to be enabled, you can apply fog flag 2.
* Change the fadestart and fadeend range in which colormaps are generated.
* The problem HERE was that the darkest light level reached by generated colormaps was actually slightly brighter than the darkest level reached by normal colormaps.
* The typo I fixed does have SOME basis in fact - standard colormap lumps are 34 (33 in 0-indexing) long rather than 32 (31), but whoever wrote this didn't realise that the code for generating them didn't do it DooM style, just bright-to-dark with no extras on the end...
2018-08-25 16:46:45 +01:00
wolfy852
8134098558
Expose NEWTICRATE and NEWTICRATERATIO to Lua
...
This should keep 70FPS-compatible scripts from throwing nil value errors.
2018-08-25 03:40:43 -05:00
Monster Iestyn
c22102b465
Rewrite seenames HUD code even more; use text color flags rather than the special text color chars
2018-08-23 23:00:15 +01:00
Monster Iestyn
f97ea7db39
Add INFLIVES as a constant that Lua/SOC can use
2018-08-23 22:18:52 +01:00
Monster Iestyn
62caadbf19
Make switch case for cv_seenames.value in ST_Drawer
2018-08-23 22:09:48 +01:00
Monster Iestyn
e37a6c767c
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
bf5d0385d8
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
2a307f4524
Make switch case for stplyr->textvar in ST_drawNightsRecords
2018-08-23 20:27:40 +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
Monster Iestyn
dbec486af1
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
fa637475ae
Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125
2018-08-22 17:16:11 +01:00
Monster Iestyn
3cce0b8a33
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
36080cc49a
Merge branch 'master' into next
2018-08-21 15:36:36 +01:00
Monster Iestyn
eb5b5300ab
Merge branch 'XPMupdate' into 'master'
...
update XPM icon
See merge request STJr/SRB2!267
2018-08-21 10:31:25 -04:00
Monster Iestyn
9639c510a4
Merge branch 'defaultsoundvol' into 'master'
...
Change default sound volume
See merge request STJr/SRB2!238
2018-08-20 09:41:04 -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
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
675ed7ecf0
Don't apply autobrake on NiGHTS bumpers
2018-08-15 23:40:42 -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
a49aa9babe
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
6ba6454056
Comments
2018-08-14 14:57:58 -04:00
mazmazz
9452c02ca1
Fix Capsule Entrance exec firing repeatedly
2018-08-14 12:48:00 -04:00
mazmazz
b1368078c6
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
35bcf200be
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
3a3976bd71
Make LE Ring triggers accept spheres for NiGHTS levels
2018-08-14 11:10:10 -04:00
mazmazz
e399d08d76
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
53303174c1
MaxBonusLives level header option for # of lives in score tally
2018-08-13 14:17:38 -04:00
mazmazz
c89e48e23c
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
5b61de544c
Merge nightsplus-laplogic
2018-08-12 21:20:14 -04:00
mazmazz
921b50550a
Totalmarescore typo
2018-08-12 19:59:41 -04:00
mazmazz
d24de8bc2f
totalmarescore player variable for NiGHTS scoring
...
# Conflicts:
# src/p_setup.c
2018-08-12 19:59:34 -04:00
mazmazz
9a9a2d94cc
totalmarelap and totalmarebonuslap player variables
2018-08-12 19:57:33 -04:00
mazmazz
269c1a70ba
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
123eb4bc3e
MT_FLICKY_CENTER flag adjustments
2018-08-12 12:49:23 -04:00
mazmazz
200a5fccd0
Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1
2018-08-12 09:23:50 -04:00
Nev3r
effd0ebe97
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
e203edb450
Decouple Flicky Thing logic from spawnpoint variables; use mobj variables
2018-08-12 02:34:37 -04:00
Alam Ed Arias
e7eaba0118
Merge branch 'master' into XPMupdate
2018-08-11 21:59:39 -04:00
Alam Ed Arias
ca8de769a8
TravisCI: also remove gcc-6
2018-08-11 21:59:08 -04:00
