Sally Coolatta
40558a6824
Merge lua_hudlib.c
2020-08-05 14:07:26 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Latapostrophe
28baaa53a6
Add lua toggle for check hud
2020-04-28 17:24:33 +02:00
Louis-Antoine
70d03c9c6f
Restore old entry searching functions and add alternate versions for long names
2020-04-26 00:39:52 +02:00
James R
fd1cb69a87
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 12:45:23 -07:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
lachwright
f0c98697dc
Add camera pitching when driving on downhill slopes
2020-03-10 05:18:05 +08:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
4331b13952
Merge branch 'thin-fixed' into 'next'
...
Add more strings (and respective functions) for v.drawString().
See merge request STJr/SRB2!770
2020-02-20 19:27:01 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
James R
9117060cee
Merge branch 'lua-hud-get-rotsprites' into 'next'
...
Get rotated sprites with v.getSprite(2)Patch
See merge request STJr/SRB2!773
2020-02-16 23:51:49 -05:00
James R
0ca3a4eca3
Merge branch 'patch-valid' into 'next'
...
Don't error when checking patch.valid on invalid patches
See merge request STJr/SRB2!780
2020-02-12 21:19:19 -05:00
colette
b2e040404e
comment
2020-02-12 08:54:20 -05:00
fickleheart
48e3b8d3fc
Don't error when checking patch.valid on invalid patches
2020-02-11 23:25:01 -06:00
fickleheart
862f21d1b2
Get rotated sprites with v.getSprite(2)Patch
...
NOTE: since rotated sprites are offset upward by 4px from non-rotated
sprites, these functions will now return a third boolean (true) if a
rotated sprite was returned, so that scripters can offset accordingly.
2020-02-10 01:02:06 -06:00
colette
20aa089c25
Fix title/card hud hooks grabbing the wrong functions
2020-02-03 23:09:18 -05:00
GoldenTails
c25e4bb1d8
Make V_DrawCenteredSmallThinString() a less precise wrapper for V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-center" option in v.drawString()
2020-02-01 11:01:39 -06:00
GoldenTails
7a00a08a52
Make V_DrawRightAlignedSmallThinString() a less precise wrapper for V_DrawRightAlignedSmallThinStringAtFixed() for new "small-thin-right" option in v.drawString()
2020-02-01 11:01:22 -06:00
GoldenTails
8dbdb75abc
Create V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-fixed-center" option in v.drawString()
...
Thankfully "center" is just "right" but with the X offset divided by 2.
2020-02-01 11:01:03 -06:00
GoldenTails
f526cf2b4c
Create V_DrawRightAlignedSmallThinStringAtFixed() for new "small-thin-fixed-right" option in v.drawString()
...
You guys have no idea how long this took to code.
2020-02-01 11:00:45 -06:00
GoldenTails
5d1b1b7e2b
Create V_DrawSmallThinStringAtFixed() for new "small-thin-fixed" option in v.drawString()
...
I removed the limitation present in "small-thin" by converting all relevant variables to fixed_t's and using FixedMul() and FixedDiv() when necessary. Who'da thunk it would actually work?
2020-02-01 11:00:02 -06:00
GoldenTails
a75bc92146
Create V_DrawCenteredSmallStringAtFixed() for new "small-fixed-center" option in v.drawString()
2020-02-01 10:59:38 -06:00
GoldenTails
933088f3cb
Create V_DrawRightAlignedSmallStringAtFixed() for new "small-fixed-right" option in v.drawString()
2020-02-01 10:59:21 -06:00
GoldenTails
ce744a5ebe
Create V_DrawCenteredThinStringAtFixed() for new "thin-fixed-center" option in v.drawString()
2020-02-01 10:58:55 -06:00
GoldenTails
e221e0b314
Create V_DrawRightAlignedThinStringAtFixed() for new "thin-fixed-right" option in v.drawString()
...
These function names are starting to become rediculous...
2020-02-01 10:55:54 -06:00
GoldenTails
7687d4d1ef
Create V_DrawSmallThinString() for new "small-thin" option in v.drawString()
...
Note this has some major limitations to prevent squished text. It defaults to using V_MONOSPACE|V_OLDSPACING and you cannot change the size of characters. V_6WIDTHSPACE seems to act exactly the same as V_OLDSPACING too.
2020-02-01 10:53:06 -06:00
GoldenTails
3d2934350d
Create V_DrawCenteredStringAtFixed() for new "fixed-center" option in v.drawString()
2020-02-01 10:51:43 -06:00
GoldenTails
3c00c22a1d
Create V_DrawRightAlignedStringAtFixed() for new "fixed-right" option in v.drawString()
2020-02-01 10:50:57 -06:00
GoldenTails
7ef82c6f08
Create V_DrawCenteredThinString() for new "thin-center" option in v.drawString()
2020-02-01 10:50:50 -06:00
GoldenTails
15e83615fa
Create V_DrawCenteredSmallString() for new "small-center" option in v.drawString()
2020-02-01 10:50:46 -06:00
GoldenTails
8a44ca0a75
Create V_DrawSmallStringAtFixed() for new "small-fixed" option in v.drawString()
2020-02-01 10:43:04 -06:00
GoldenTails
0da462836f
Create V_DrawThinStringAtFixed() for new "thin-fixed" option in v.drawString()
2020-02-01 10:42:15 -06:00
toaster
336b6ad85e
Hexafaceted sprite angle support (See merge request description coming soon).
...
Also, some minor memory efficiency fixes to both rotsprite and ordinary sprite rotations.
2020-01-08 20:49:14 +00:00
James R
67ca512120
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
Jaime Passos
d146594895
Fix Lua HUD library crashes.
2019-12-24 00:14:25 -03:00
Jaime Passos
ad317cd8a2
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
Jaime Passos
0cf6f7dc95
Intermission HUD hook for Lua
2019-12-18 18:09:56 -03:00
Tatsuru
06f02e81dd
Let Lua toggle Match/CTF team scores HUD element
2019-12-16 17:58:00 -03:00
Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Jaime Passos
23a5801a09
lua
2019-11-18 13:50:44 -03:00
Jaime Passos
f37e0de8c5
stuff
2019-11-18 11:39:54 -03:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
toaster
a8169e3844
Sound test is cool now!
...
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif
* Port MUSICDEFs from Kart.
* Safe to modify without modifying game, so we can put it in music.dta eventually.
* "Title", "AltTitle", "Authors" fields are self-evident.
* "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
* "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
* Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
* Now called "V_DrawStretchyFixedPatch".
* "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
* Available to Lua under v.drawStretched!
* Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.
Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
2019-11-05 16:23:46 +00:00