stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-01 16:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
9600 commits 177 branches 41 tags 186 MiB
Commit graph

9600 commits

This branch
This branch
All branches
Author SHA1 Message Date
fickleheart
fed8167a81 Allow more options for when the titlecard shows up 2020-02-08 11:13:40 -06:00
lachwright
7a5d7afb30 Add Rob as the game's producer 2020-02-06 23:06:15 +08:00
Steel Titanium
d03d09f397 Update credits again 2020-02-05 15:20:35 -05:00
Monster Iestyn
f1bdaa2fda Updated version number to 2.2.1, increment MODVERSION. 
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
 2020-02-05 19:55:40 +00:00
James R
7805828c4a Merge remote-tracking branch 'origin/master' into next 2020-02-04 14:31:21 -08:00
colette
01433c3648 Fix title/card hud hooks grabbing the wrong functions 2020-02-03 23:09:18 -05:00
Louis-Antoine
2eaf02d234 Let Lua access spectators mobjs 2020-02-03 19:42:37 +01:00
James R
700d9426d4 Merge branch 'name-stuck' into 'master' 
Fix game hanging on server creation/splitscreen if your name is whack

See merge request STJr/SRB2!752
 2020-02-03 03:49:13 -05:00
Jaime Passos
d1e8744583 What 2020-02-03 02:24:22 -03:00
Jaime Passos
af66a2e5fa Restore some functionality that went missing 2020-02-03 02:12:55 -03:00
Jaime Passos
520e2148fe Merge remote-tracking branch 'origin/master' into local-color-table 2020-02-03 01:52:43 -03:00
James R
bd90c20366 Turn the shadow scale if-else into a switch statement, for sake of editing and in case object types ever change 💦 2020-02-02 18:00:02 -08:00
James R
f8310236e0 Merge branch 'folder-blacklist' into 'public_next' 
Implement folder blacklisting

See merge request STJr/SRB2Internal!626
 2020-02-02 20:35:51 -05:00
Steel Titanium
1794949696
Add empty entry 2020-02-02 18:52:41 -05:00
James R
57492347ed Don't I_Error on startup files only if a file was added twice 2020-02-01 19:32:08 -08:00
James R
5a524f21da Merge branch 'starpost-config-additions' into 'next' 
Starpost config additions

See merge request STJr/SRB2!680
 2020-02-01 21:42:43 -05:00
James R
ce3a79e51a Merge branch 'bruh2' into 'master' 
Fix fuckup 2

See merge request STJr/SRB2!744
 2020-02-01 21:42:21 -05:00
James R
ec995d620f Merge branch 'rotsprite-memory-leak' into 'next' 
Fix memory leak when caching rotsprite

See merge request STJr/SRB2!745
 2020-02-01 21:42:12 -05:00
James R
c069cf94bc Merge branch 'tnt-is-laggy' into 'next' 
Make flying TNTs' explosions not so laggy the first time

See merge request STJr/SRB2!746
 2020-02-01 21:41:59 -05:00
James R
52c1e73035 Merge branch 'platform-fixes' into 'next' 
Reset pmomz after applying it to momz

See merge request STJr/SRB2!747
 2020-02-01 21:41:49 -05:00
James R
5c8406f6d7 Merge branch 'protect-wrists' into 'next' 
Remove flight cutoff property

See merge request STJr/SRB2!748
 2020-02-01 21:41:33 -05:00
James R
c46d9a1b87 Merge branch 'file-param-error' into 'master' 
Don't I_Error if non base files fail to load with -file

See merge request STJr/SRB2!678
 2020-02-01 21:41:22 -05:00
James R
d5ced42f06 Remove Player 0 2020-02-01 18:22:03 -08:00
James R
bf3b7fc5b0 Clean player name before joining!!! 2020-02-01 18:20:35 -08:00
James R
ab8eed6efb Add missing conditions to CleanupPlayerName 2020-02-01 18:11:41 -08:00
LJ Sonic
bd6438dda1 Merge branch 'fix-splitscreen' into 'next' 
Fix splitscreen player being unable to move

See merge request STJr/SRB2!749
 2020-02-01 16:18:40 -05:00
Louis-Antoine
7dd0f2b808 Fix splitscreen player being unable to move 2020-02-01 20:19:39 +01:00
GoldenTails
fe17933156 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
7d9f138160 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
b2b4c4c79e 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
4cbcb68795 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
c858d9fd4d Make V_DrawSmallThinString() a less precise wrapper for V_DrawSmallThinStringAtFixed() to fix rounding errors. 2020-02-01 11:00:24 -06:00
GoldenTails
75d94c6c1a 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
a216736ef4 Create V_DrawCenteredSmallStringAtFixed() for new "small-fixed-center" option in v.drawString() 2020-02-01 10:59:38 -06:00
GoldenTails
5f56d19a43 Create V_DrawRightAlignedSmallStringAtFixed() for new "small-fixed-right" option in v.drawString() 2020-02-01 10:59:21 -06:00
GoldenTails
f7085fc171 Create V_DrawCenteredThinStringAtFixed() for new "thin-fixed-center" option in v.drawString() 2020-02-01 10:58:55 -06:00
GoldenTails
f1655d32f5 Fixed V_DrawRightAlignedThinStringAtFixed declaration to use fixed_t for positioning. 2020-02-01 10:58:19 -06:00
GoldenTails
cb5c90fc40 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
d147a50e9b remove large commented broken version of V_DrawSmallThinString() lol 2020-02-01 10:54:10 -06:00
GoldenTails
6527b5d16b 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
9f50b6ef73 Create V_DrawCenteredStringAtFixed() for new "fixed-center" option in v.drawString() 2020-02-01 10:51:43 -06:00
GoldenTails
b0e66874d3 Fixed v_video.h declaration for V_DrawRightAlignedStringAtFixed() 2020-02-01 10:51:31 -06:00
GoldenTails
dc1871a74f Create V_DrawRightAlignedStringAtFixed() for new "fixed-right" option in v.drawString() 2020-02-01 10:50:57 -06:00
GoldenTails
426ccc9203 Create V_DrawCenteredThinString() for new "thin-center" option in v.drawString() 2020-02-01 10:50:50 -06:00
GoldenTails
df15ad82d2 Create V_DrawCenteredSmallString() for new "small-center" option in v.drawString() 2020-02-01 10:50:46 -06:00
GoldenTails
37cef69c95 Add V_COLORMAP support for small-fixed and thin-fixed text. 2020-02-01 10:46:26 -06:00
GoldenTails
63721b99cf Create V_DrawSmallStringAtFixed() for new "small-fixed" option in v.drawString() 2020-02-01 10:43:04 -06:00
GoldenTails
93b64a8d7d Create V_DrawThinStringAtFixed() for new "thin-fixed" option in v.drawString() 2020-02-01 10:42:15 -06:00
Jaime Passos
77f373c903 Merge branch 'am-line' into 'master' 
Automap fixes

See merge request STJr/SRB2!735
 2020-02-01 03:22:53 -05:00
Jaime Passos
decc381698 Merge branch 'colorlutfix' into 'master' 
Fix color LUT using the wrong palette

See merge request STJr/SRB2!739
 2020-02-01 03:22:26 -05:00