Nevur
afba4b2abd
Started to work towards PK3 support.
...
-Tweaked compression conditional to a switch-case format, looking towards adding several comrpession algorithms; haven't removed the previous "compressed" boolean yet.
-Added dynamically allocated name strings for lumps; haven't removed the previous name field.
-Added rudimentary PK3 central directory recognition; nothing is actually loaded in the end.
2017-04-30 14:49:33 +02: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
72d52547fa
Merge branch 'next' into public_next
2017-04-26 16:16:57 +01:00
Monster Iestyn
058ad4df88
Merge branch 'master' into next
2017-04-26 16:15:40 +01:00
Monster Iestyn
1462c638cb
Added the "lua_lumploading" variable for restricting certain Lua functions to lump load time only
2017-04-25 21:45:53 +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
yellowtd
068c9d6294
titlemap - skipintro bugfix
...
game crash with -skipintro enabled, hopefully fixes it and causes no issues anywhere else
2017-04-24 12:52:51 -04:00
Monster Iestyn
7658469c23
Merge branch 'drawfill-fix-2' into 'master'
...
DrawFill made not stupid
made it more consistent with other drawing functions; doesn't draw off of the sides, and doesn't ignore snapping or widths for reasons that don't make sense
(for instance: the green bar in MI's test script showed *above* the blue one in non-green resolutions in 2.1.17)
See merge request !173
2017-04-24 12:43:10 -04: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
