Digiku
cddb743fe1
Merge branch 'op-nightshoop' into 'master'
...
NiGHTS objectplace: Place new hoop 1713 instead of 1705
See merge request STJr/SRB2Internal!136
2018-08-25 13:23:51 -04:00
toaster
91eb248e46
Fix up them there ghosts!
...
* Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know?
* Make ghosts spawn properly on slopes.
2018-08-25 17:11:49 +01:00
toaster
973b3c3f5e
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
6ddee877c5
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
aee7dce891
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
011459790f
Add INFLIVES as a constant that Lua/SOC can use
2018-08-23 22:18:52 +01:00
Monster Iestyn
e2c280504b
Make switch case for cv_seenames.value in ST_Drawer
2018-08-23 22:09:48 +01:00
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
e37f6585fa
Merge branch 'master' into tutorial-time
2018-08-22 21:30:29 +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
e88ebb6f75
Merge branch 'master' into tutorial-time
2018-08-21 15:41:35 +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
Latapostrophe
40b4d63620
Fix capslock being wonky.
2018-08-19 11:25:20 +02:00
Latapostrophe
b09019dc4a
Fix old chat detection.
2018-08-19 11:12:21 +02:00
Latapostrophe
8747a8529d
Changed chat position,
...
Added chat back tint
Fixed word wrapping glitches
2018-08-19 10:58:29 +02:00
Monster Iestyn
febefd41ba
Fix glitches with flats visible when looking up/down in 1st person
2018-08-18 23:31:20 +01: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
d01ca9fe95
Make Ideya Anchor use parameter # instead of angle for Ideya ID
2018-08-16 11:25:35 -04: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
