toasterbabe
cfd47d33e9
Got rid of redundant writes.
2017-04-30 18:15:46 +01:00
toasterbabe
bb764a7b30
Stacked force shield icons instead of the full-flashing dichotomy.
...
https://cdn.discordapp.com/attachments/293238104096112641/308275437782433792/srb20025.gif
THIS IS THE LAST THING I PROMISE
2017-04-30 17:25:18 +01:00
toasterbabe
588ef776da
Stop the s3k shields spawning in ultimate. Whoops! (I considered it okay to modify in this branch because box spawning was already tweaked here.)
2017-04-30 15:41:03 +01:00
toasterbabe
1e051a8893
Improve captions code clarity, and also make music captions flash before they disappear.
2017-04-30 11:16:31 +01:00
toasterbabe
9affcd98cb
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into Deez_NewUserXperiences
2017-04-30 10:46:53 +01:00
toasterbabe
52b19da009
Add a little header to the colour cube menu so you see the state of ALL of the colours, not just the three that fit on screen at once.
...
https://cdn.discordapp.com/attachments/293238104096112641/307998638246723597/srb20016.png
2017-04-29 23:00:40 +01:00
toasterbabe
3523d6ab8a
Final modifications to the control menu.
...
* Completely hides instead of greying stuff out.
* "Modifications" has been renamed to "Add-ons", since that's a more direct term.
2017-04-29 22:42:16 +01:00
toasterbabe
fb6045dd7d
Last few improvements for normal menus.
2017-04-29 22:01:14 +01:00
toasterbabe
2f435dd85a
Make closedcaptioning's onchange give an indicator of success.
2017-04-29 18:51:21 +01:00
toasterbabe
82cbb3d282
Some final name updates for now.
2017-04-29 18:24:37 +01:00
toasterbabe
22f5b67af6
Fixing a race condition forcing speed shoes captions to disappear almost instantly.
2017-04-29 18:10:09 +01:00
toasterbabe
b1d5bc3190
Reset captions where appropriate (including in S_StopSounds(), as it should have been doing all along).
2017-04-29 17:53:24 +01:00
toasterbabe
e0d7b1ae24
Music symbol for music. (requires patch.dta)
2017-04-29 17:18:19 +01:00
toasterbabe
a625c4f725
Katana dot in hudnames, as desired.
2017-04-29 17:04:13 +01:00
toasterbabe
0af9de2ba6
Bugfix: When you stop hearing the music, allow the caption to expire sooner rather than later.
2017-04-29 16:40:31 +01:00
toasterbabe
73f1550242
There are now captions for specific types of music! (Currently signified with an M, but I'll change that in a bit...) A whole lotta things needed to be modified for this, though.
...
* Serious refactor of - and internal exposure of - what has become S_StartCaption().
* Renaming of a few existing captions.
* The prevention of access to - or writing over - sfx_None's stuff in SOC or Lua.
* The new Lua wrapper function S_StartMusicCaption(string, tics, optional player), which essentially allows custom music captions to be created. (This is best used for stuff like final lap music in SRB2 Kart or bonus time in a thokker-like game, not a comprehensive Now Playing expy. That'd be a different kettle of fish.)
Also, updated all the lock-on stuff to use P_IsLocalPlayer instead of rolling my own.
2017-04-29 16:27:52 +01:00
toasterbabe
94add11fab
Updated captions to:
...
* be more efficient
* fade away early if they stop playing
* make their current max stick-around time longer
* make the fade time/etc easier to modify
2017-04-29 12:58:40 +01:00
toasterbabe
bdaa0aea9b
More coherent sound selection to prevent confusion of token and score boxes.
2017-04-28 22:55:54 +01:00
toasterbabe
deba4dcf0d
Made updating the captions a part of S_UpdateSound(), not SCR_ClosedCaptions() (which really should have been render-only all along).
2017-04-28 22:46:21 +01:00
toasterbabe
2d9c37d800
MONITORS IS UNFUCKED
...
A less memetic message: On permission of Mystic, rejiggered a few things such that Race uses cv_competitionboxes, allowing the menu to be nicer.
Also:
* disabled the doomednum for ? boxes
* made A_MixUp play sfx_lose if you're in a gametype that can't use it
* Removed the all-teleporters option from cv_competitionboxes. It could just be done by tweaking the random monitor toggles, anyways.
2017-04-28 22:45:17 +01:00
Monster Iestyn
21950687ed
Make sure noreload levels don't do anything weird with the skybox mobj pointers, especially if Lua was involved
...
We can assume skyboxviewpnts/skyboxcenterpnts sort themselves out from reloading all the Things at least I guess?
2017-04-26 21:34:22 +01:00
Monster Iestyn
bdb3c2ea0e
extrainfo now determines "skybox ID", a number between 0 and 16 to identify the viewpoint or centerpoint
...
also I made that change skybox linedef exec special I guess (linedef type 448)
2017-04-26 18:16:01 +01:00
Monster Iestyn
6c619af9ce
Use the skybox mobj's actual z position, rather than using the spawnpoint angle!
...
This means setting the skybox view angle is no longer stupid, objectplace no longer breaks skyboxes, and Lua-defined skybox mobjs can actually set a Z position more easily now.
2017-04-26 17:12:57 +01:00
Monster Iestyn
5608c4b4e7
Merge branch 'public_next'
2017-04-26 16:17:29 +01:00
Monster Iestyn
058ad4df88
Merge branch 'master' into next
2017-04-26 16:15:40 +01:00
Monster Iestyn
d4c330678a
level header's "forcecharacter" parameter doesn't take skin numbers anymore, so this isn't needed!
2017-04-25 20:39:32 +01:00
toasterbabe
8ae91de9db
Per Inu's request, semi-broken (both game mechanically and engineering wise) directional information has been removed from the Captions. It's now "in-level" (dot) and "sourceless" (no dot) only.
2017-04-25 16:03:51 +01:00
Monster Iestyn
c16ae57f91
Merge branch 'addfile-directories-fix' into 'next'
...
Addfile directories fix
This is a fix for this bug: https://mb.srb2.org/showthread.php?t=42279
See merge request !166
2017-04-24 20:46:38 -04:00
Monster Iestyn
e03577d957
Merge branch 'falling-rocks-fix' into 'next'
...
Falling rocks fix
This fixes the rock spawners' rocks not being removed if they rolled down to the ground from a slope rather than bouncing (see https://mb.srb2.org/showthread.php?t=41963 )
See merge request !162
2017-04-24 20:41:32 -04:00
toasterbabe
c7c908eed3
Emerald tokens being used as actual game tokens on the end-of-act screen!
...
https://gfycat.com/PlumpShowyBream https://gfycat.com/AlarmingLoathsomeBelugawhale
2017-04-24 21:56:17 +01:00
Monster Iestyn
f099782c91
Spinning/swinging maces/chains and Particle generators can now use P_FindSpecialLineFromTag!
2017-04-24 21:05:28 +01:00
Monster Iestyn
13cb656f0b
Whoops forgot this
2017-04-24 20:43:58 +01:00
toasterbabe
922603fbca
Fix V_DrawCroppedPatch's handling of topdeltas.
2017-04-24 20:39:32 +01:00
Monster Iestyn
4e96f624e7
Split off part of P_SpawnSpecials into a new function called P_InitSpecials
...
This allows tag lists, gravity, weather, and the "CheckFor" vars to be initialised before running P_LoadThings or P_ResetDynamicSlopes, in case they could affect mobj spawning or cause a netgame desync somehow by carrying over the previous level's values
2017-04-24 20:33:39 +01:00
Monster Iestyn
7f7c7c58ab
Use less-than, not less-than-or-equals, since deststop is off-screen
2017-04-24 17:41:50 +01:00
toasterbabe
9c58d1def8
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into Deez_NewUserXperiences
2017-04-24 15:50:20 +01:00
toasterbabe
18ad6a3a0d
Minor tweak to the balance of GFZ3.
2017-04-24 15:38:22 +01:00
toasterbabe
60b7649141
Complete the secrets checklist.
2017-04-23 18:45:54 +01:00
toasterbabe
8d477aefd5
Minor improvements here and there.
2017-04-23 01:12:00 +01:00
toasterbabe
aed8b0b9fd
#moreclues (except instead of clues they're sound name fixes)
2017-04-23 00:49:57 +01:00
toasterbabe
785213827b
Made the code easier to maintain, and added support for more UC's.
2017-04-23 00:39:20 +01:00
toasterbabe
bcf0df7cb6
Ended up being stressed and not getting any real work done, so figured I'd finish up the checklist system.
2017-04-23 00:16:09 +01:00
toasterbabe
9a8ae7cd64
Okay, I lied. Here's a little bit of cleanup.
2017-04-22 12:53:57 +01:00
toasterbabe
c1bd4f570c
The start of an unlockable checklist revamp. Require more UC_ constant acknowledgement and the ability to scroll, but I can't work on this for a while so.
2017-04-22 12:14:15 +01:00
toasterbabe
f8c09d7475
More better sound names. (I'll push something good at some point, I promise!)
2017-04-21 23:41:31 +01:00
toasterbabe
7556b407b2
Fix crash on loading level without a header.
2017-04-21 23:37:14 +01:00
toasterbabe
37fc95ca08
Added modifying sound captions to Lua infolib.
...
Also, replaced ridiculously ambiguous "impossible error" with more descriptive alternative.
2017-04-21 21:54:56 +01:00
toasterbabe
3cce495675
Made PCX use cv_screenshot_colorprofile.
...
Also, optimised gif headwrite's palette writing.
2017-04-21 20:29:06 +01:00
Monster Iestyn
ed9dfaa617
Merge branch 'master' into polyobject-checksight-fix
2017-04-21 16:32:38 +01:00
Monster Iestyn
f77e107c1a
Merge branch 'no-doubling-texture-heights-plz' into 'master'
...
No doubling texture heights plz
If you didn't know, apparently SRB2 was hardcoded to double the height of 64x64 textures created using TX_START/TX_END. This has frustrated some a lot. This branch removes this hack at last (there doesn't appear to be any visual issues resulting from removing it, anyway).
srb2win-nodoubletexheight.exe can be found in my FTP folder.
See merge request !85
2017-04-20 21:00:48 -04:00
Monster Iestyn
839dc6bcc1
Merge branch 'hud-drown-numbers-fix' into 'master'
...
First person HUD drown numbers fix
This branch fixes the following issues with the first person HUD when drowning:
* "0" turning into Sonic's drown sprite, since both sprites happen to be named DRWNA0
* SF_MACHINE's special drowning numbers from 3rd person not being used
See merge request !80
2017-04-20 16:20:00 -04:00
toasterbabe
aa475c9d26
Realised color profile disabling for screenshots didn't work in GL, so updated the menu to show that.
...
Also, made other minor menu tweaks.
2017-04-20 20:16:10 +01:00
toasterbabe
4f59fa35b3
Add headings to Video Options menu.
2017-04-20 19:27:19 +01:00
toasterbabe
8b46ee76ff
Disable colour profile influence on screenshots and gifs if you want.
2017-04-20 18:59:27 +01:00
toasterbabe
9d46ba281f
Screenshots now contain the palette you're actively looking at, as opposed to the palette the game/map has! This makes sense for colorblind users being able to store their precious memories, and it matches up with how gifs palettise.
2017-04-20 13:17:11 +01:00
toasterbabe
29d5af61c1
Correcting gamma to match base SRB2.
2017-04-20 13:15:32 +01:00
toasterbabe
bef9520556
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into Deez_NewUserXperiences
2017-04-19 23:03:47 +01:00
toasterbabe
c3840ba01d
Colour Cube Calibration Menu! (called "Advanced Color Settings" because No Fun Allowed...)
...
https://cdn.discordapp.com/attachments/237798387070664724/304343382073933824/aa.png
Also, a "Reset all" button for the Monitor toggle menu, a ton of new cvars to match up with the colour cube calibration, and a bunch of variable renames related to colour cube operations.
2017-04-19 22:24:28 +01:00
Monster Iestyn
3edbf0a085
Fixed P_CheckSight not considering polyobject top and bottom at all
...
This was actually kind of easier to do than I expected, though I can't tell if there's anything else I need to do or not
2017-04-19 22:19:46 +01:00
Monster Iestyn
f0256c41be
Be gone ye old texture hack
2017-04-19 20:00:19 +01:00
toasterbabe
9b13caccae
greem
2017-04-18 23:40:57 +01:00
toasterbabe
c2edd6224d
Figured out what was up. I didn't quite understand my original array!
2017-04-18 23:38:38 +01:00
toasterbabe
83e16da83b
Introducing the Colour Cube! https://cdn.discordapp.com/attachments/293238104096112641/304015171385294850/aa.png
...
Basically in preperation of supporting colourblindness modes I implemented the following link when loading palettes.
http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter24.html
This basically means I can do whatever the hell I want to the colour profile of incoming paletties, and nobody can stop me. Muahahahaha etc.
Also, I added a saturation feature to show off its full potential, converted gamma from a table to a factor of the calculation, tweaked some menus and made the default value of cvars show up on sliders. Because that's how I roll.
2017-04-18 23:21:10 +01:00
Monster Iestyn
0f2c9c40a2
Hardcoded the big gargoyle
2017-04-18 20:38:13 +01:00
Monster Iestyn
941ab72204
Hardcode new/updated xmas scenery object type/state info
2017-04-18 18:32:52 +01:00
toasterbabe
e34e8f85e2
Including a statement about performance on the resolution menu.
2017-04-18 17:45:43 +01:00
toasterbabe
6d7355e9af
Add score on Emerald Token pickup (and make the all-emerald bonus a continue in SP) as requested.
2017-04-18 17:45:23 +01:00
Monster Iestyn
0e358b3d9f
Add new Pity shield orb state info, remove unused Pity states
2017-04-18 17:36:04 +01:00
toasterbabe
8e3a3e792e
Moved the Race HUD down a little bit, and improved the sound selection.
2017-04-18 16:42:42 +01:00
toasterbabe
39fa4fea4a
* Update some sound names.
...
* Make the continue and the flag capture use different sound numbers.
* Make the fancy new race countdown go beep.
2017-04-18 15:57:52 +01:00
toasterbabe
8aa3928458
A consistency error I should've caught earlier, considering this sound is used for DSZ3's missiles as well as GFZ3's laser.
2017-04-18 12:53:16 +01:00
toasterbabe
cf82ef1f79
As requested by Mystic in That Topic, made the end-of-act time bonus for 30 seconds halved and removed the 45 seconds bonus option.
2017-04-18 12:33:19 +01:00
toasterbabe
e93e5176c0
Consistency in firing sound naming.
2017-04-18 12:32:30 +01:00
toasterbabe
528132ad6d
Sound always happens on SoundOptions menu now. It was weird not having those.
2017-04-18 12:32:06 +01:00
toasterbabe
fbdc8d3d9e
MP pause menu text for Player setup loses the 1 if you're not in splitscreen
2017-04-17 22:41:23 +01:00
toasterbabe
c8186644e7
Improved splitscreen offsets.
2017-04-17 22:34:38 +01:00
toasterbabe
314870bdc2
Support captions for player 2 in 2-player. (You can't tell which screen the sounds are coming from without visual cues normally, so there isn't two seperate caption lists.)
2017-04-17 22:21:16 +01:00
toasterbabe
dd566b77b9
More improved sound names.
2017-04-17 19:52:44 +01:00
Monster Iestyn
93efb3084e
Merge branch 'mi-a-bit-of-cleanup' into 'master'
...
MI's unimportant code cleanup
Just removing a bunch of unused variables/function prototypes from the source code and similarly minor stuff, nothing here should change gameplay much (if at all).
See merge request !71
2017-04-17 14:43:50 -04:00
Monster Iestyn
798628eef1
Merge branch 'mi-minor-refactoring' into 'master'
...
MI minor refactoring
Just moving the locations of some consvar externs from d_netcmd.h to other header files in which I think they should REALLY belong. Ultimately this should not affect gameplay whatsoever, it's just code cleanup.
See merge request !81
2017-04-17 13:40:51 -04:00
toasterbabe
08e7a7cb4d
Clean up captions code to allow for different numbers defined at compile time.
2017-04-17 18:15:42 +01:00
toasterbabe
bec7a184f1
Bweh heh heh.
2017-04-17 17:16:21 +01:00
toasterbabe
c95fcab831
Slight table update.
2017-04-17 15:55:07 +01:00
toasterbabe
74169529fb
Correcting a ridiculous crash-causing oversight.
2017-04-17 15:53:54 +01:00
toasterbabe
ff97b3aed4
Alter offsets of HUD numbers a little bit to satisfy OCD (have discussed with Mystic, he offered a solution similar but not identical to what I am committing)
2017-04-17 15:42:01 +01:00
toasterbabe
3551509ed8
* Remaster the sound stacking methodology such that the same sound effect updates its previous position rather than heading to the bottom.
...
* Put brackets around the sound names on the reccomendation of a friend who works with disability in gaming.
* Update a bunch of sound names to better match what they actually do in SRB2.
2017-04-17 14:38:56 +01:00
toasterbabe
db282caefe
* Fix a bug with sounds overlapping.
...
* Make sounds with identical names (as opposed to just identical sfx's) stack together.
* Corrected a few names.
2017-04-17 02:03:44 +01:00
toasterbabe
3e29ee3f01
Closed captioning!
...
* Provides a helpful description for the hearing impaired, whether permanent, temporary or situational.
* Consvar "closedcaptioning", with on/off values available.
* Only works if sounds are on. This is frustrating. I will see what I can do to allow it to work with sounds off in future, but for now it's dependent in order to properly accept or decline sounds.
* Thanks to MI for making that wiki page a lot more comprehensive a few days ago.
* Weapon ring is now a seperate sfx_wepfir instead of doubling up on sfx_thok.
* Also, made V_StringWidth work with V_NOSCALESTART.
2017-04-17 01:09:47 +01:00
toasterbabe
7c07978277
Disable irrelevant/dangerous-to-tweak options on the server menu under cetain conditions.
2017-04-16 15:00:58 +01:00
toasterbabe
dff95bc30a
Further tweak to server options menu, returning resynchattempts to the menu alongside taking Master Server out of data options because that doesn't make sense at all
2017-04-16 14:20:38 +01:00
toasterbabe
24192f54d1
Revamp statistics screen to put everything on the same page. http://imgur.com/a/kZrfm
...
* Also, inverted the direction of PGUP and PGDN.
2017-04-16 00:12:37 +01:00
toasterbabe
b0ebb40913
Headers for the controls menu.
2017-04-15 21:40:30 +01:00
toasterbabe
f35cac3b55
Rejigger Server menu a smidgen to encourage scrolling down, clean up, and reinstitute hidetime.
2017-04-15 20:25:53 +01:00
Monster Iestyn
7629a0710e
Make sure quakes are scaled for skyboxes
...
While I was at it I also refactored most of the skybox view scaling code so it isn't needlessly duplicated
2017-04-15 20:21:54 +01:00
toasterbabe
68f5460387
* Added little arrows to the statistics pages.
...
* Made it possible to switch statistics pages using left and right arrows. Their previous functionality has been given to Page Up and Page Down.
* Swap over header style to the new version for everything.
* Move Master Server into Data Options, since it needs to be exposed somewhere.
2017-04-15 16:41:27 +01:00
toasterbabe
2a40804ea2
Offset tweak so "General" on the netgame settings menu doesn't go only SLIGHTLY off the screen and stop appearing when you scroll down.
2017-04-15 15:42:25 +01:00
toasterbabe
fd5c72d4c0
* Revamp sounds menu to show you the current status of the different kinds of sounds and musics, and basically behave like a cvar without being a cvar.
...
* Show resolution on main Video page.
* Optimise by using V_RightAlignedString instead of V_DrawString with V_StringWidth.
* Revamp sliders. (Requires a new patch.dta I'll upload in a little bit in order to be perfect, but does pretty well w/o replacement graphics too.)
2017-04-15 15:36:19 +01:00
toasterbabe
47bcc2747c
* Fixed highlighting text on scrollable menus.
...
* Revamped base video menu and moved all the relevant stuff from the Game Options Menu onto it. Still mulling on where to put the Master Server reference.
2017-04-15 14:05:51 +01:00
toasterbabe
e2b063b2a8
Scrolling menu option now available!
...
* Revamped Netgame Options Menu to scroll and also be less suck.
* Renamed a few other options here and there.
2017-04-15 13:36:40 +01:00
toasterbabe
cafb54cc37
* Tweak pre-key control menu. Not exactly as desired, but exposes flipcam and is functional enough for now.
...
* Change names of axes.
* Seriously defuck joystick selection for the default number of joysticks available.
* Renames a few other options.
2017-04-15 01:08:26 +01:00
