Commit graph

11064 commits

Author SHA1 Message Date
Lachlan Wright
f1d2992f51 Merge branch 'dye-fix' into 'next'
Fix players not properly decolorizing via linedef action

See merge request STJr/SRB2!1127
2020-09-25 08:54:16 -04:00
Lachlan Wright
982435cf86 Merge branch 'more-stats' into 'next'
Add tic and UI times to render stats

See merge request STJr/SRB2!1125
2020-09-25 08:54:01 -04:00
Lachlan Wright
650635e780 Merge branch 'w-initfile-bruh' into 'next'
Fix a bug where adding the same mod multiple times counted towards the mod limit

See merge request STJr/SRB2!1124
2020-09-25 08:52:22 -04:00
Lachlan Wright
7fee293034 Merge branch 'gl-shearing-fix-2' into 'next'
Fix cv_glshearing 2 in first person

See merge request STJr/SRB2!1114
2020-09-25 08:51:57 -04:00
Lachlan Wright
dbc32ea9ea Merge branch 'console-silly-characters' into 'next'
Get rid of some silly behavior with certain characters in console

See merge request STJr/SRB2!1110
2020-09-25 08:31:08 -04:00
Lachlan Wright
86252cbea7 Merge branch 'more-nodes' into 'next'
Increase MAXNETNODES, show more servers in the server browser

See merge request STJr/SRB2!1106
2020-09-25 08:24:16 -04:00
James R
30056157c2 Merge branch 'listserv' into 'next'
Percent decode listserv (closes #244)

Closes #244

See merge request STJr/SRB2!1150
2020-09-23 18:43:41 -04:00
James R
aa4c1eeea8 Merge branch 'bird-pain' into 'next'
Fix playing back demos never working (closes #203)

Closes #203

See merge request STJr/SRB2!1149
2020-09-23 18:37:56 -04:00
James R
de9d1d2b35 Forgot to commit s_sound.h 2020-09-22 20:51:01 -07:00
James R
b18d60c1d3 Apply volume to sounds with origin too
Previously sounds with an origin would always start at max volume. This is
because the distance calculation adjusts the volume, and that volume needs to
be updated every tic as distance changes. Storing the original volume works.

(cherry picked from commit 22177753d2f00d58d19d930f51dcd086097dfd0d)
2020-09-22 20:47:31 -07:00
James R
b655fa496e Don't let players change their name more than five times per minute
(ported 17f75903b029bbf01217153dc98009d305137c8f and 11ddcfa9a1f2311ec67377b76ed1160ef14b7f60)
2020-09-22 12:04:28 -07:00
lachwright
9ae2010880 Allow Canarivore gas to interact with players again (oops) 2020-09-22 13:11:56 +09:30
lachwright
5d1a95b9c6 Prevent Canarivore gas from teleporting up walls 2020-09-21 17:23:53 +09:30
Zippy_Zolton
62f379ec41 Add-on clarity from Kart 2020-09-20 13:07:28 -05:00
lachwright
7eb760afca Only allow explicitly living players to trigger sector specials 2020-09-20 11:49:53 +09:30
Tatsuru
a52afc2baf Ignore spectators 2020-09-19 23:10:03 -03:00
James R
5edcc72839 Shitty decode listserv 2020-09-19 18:54:04 -07:00
James R
9e31adf22c Merge branch 'objectplace' into 'next'
Fix & improve objectplace

Closes #232

See merge request STJr/SRB2!1139
2020-09-19 21:40:55 -04:00
James R
9684149ba6 Merge branch 'start-netid-at-1' into 'next'
Avoid CV_FindNetVar returning a normal cvar (closes #251)

Closes #251

See merge request STJr/SRB2!1137
2020-09-19 21:40:45 -04:00
James R
bdb44e6ce1 Don't ifdef CV_LoadDemoVars out if OLD22DEMOCOMPAT defined 2020-09-19 18:34:52 -07:00
kaysrishaq
c3430951be Update lua_infolib.c 2020-09-18 17:47:38 -04:00
lachwright
a78a0071f2 Save changes made to the bot's skin, and display it properly in save select 2020-09-17 19:00:49 +09:30
Steel Titanium
16569b4e9a Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened
Shouldn't break scripts as it stops execution as soon it happens, like it already does.
2020-09-14 22:54:07 -04:00
SteelT
90302330ed Merge branch 'make-float-strings-great-again' into 'next'
Can we just do this please? Thanks.

See merge request STJr/SRB2!1142
2020-09-11 11:47:04 -04:00
SteelT
9f09e32520 Merge branch 'remove-bt_use-deprecation' into 'next'
Remove BT_USE and PF_USEDOWN warning

See merge request STJr/SRB2!1138
2020-09-10 16:06:20 -04:00
SteelT
a033f482be Merge branch 'pictureformats' into 'next'
PNG conversion refactoring

See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
SteelT
c2e6c0c0ad Merge branch 'png-conversion-fixes' into 'pictureformats'
Optimize PNG conversion

See merge request STJr/SRB2!1143
2020-09-10 15:47:58 -04:00
Jaime Passos
0750d273a6 Attempt to use the PNG image's palette, if it is present 2020-09-10 03:16:21 -03:00
Jaime Passos
4e437076c1 Use color look-up table for PNG conversion 2020-09-10 02:10:31 -03:00
Jaime Passos
f24647dc4d Change method of color look-up table generation 2020-09-10 01:43:46 -03:00
GoldenTails
c61eeb9238 Can we just do this please? Thanks. 2020-09-09 22:19:14 -05:00
lachwright
efc82ffa74 Set additional UDMF parameters on objectplaced mapthings to defaults 2020-09-07 13:08:22 +09:30
lachwright
b805e10058 Let analog control schemes control objectplace like standard control schemes 2020-09-06 19:03:17 +09:30
lachwright
d7ab41a90b Objectplace improvements:
- movement speeds are scaled with player scale
- spawned objects are scaled with player scale
- command accepts argument for thing num to set
2020-09-06 17:28:34 +09:30
James R
ca9cf25423 Fix netid overflow check 2020-09-05 23:23:54 -07:00
GoldenTails
8ae5f3030f Remove BT_USE and PF_USEDOWN warning
someone entertained the idea of maybe removing it, so might as well put this merge request up to see if people want it
2020-09-06 00:30:05 -05:00
James R
4959aa5614 Merge branch 'credits-227' into 'next'
Update credits

See merge request STJr/SRB2!1136
2020-09-06 01:20:50 -04:00
James R
30057e9268 Start netid at 1 to avoid CV_FindNetVar returning a regular cvar for netid 0 2020-09-05 22:03:14 -07:00
James R
9a1099ec17 Update SuperPhanto's name with real name per request 2020-09-02 17:59:53 -07:00
James R
7bec06856f Add SuperPhanto to the art credits 2020-09-01 18:51:47 -07:00
James R
c7c9ae3847 Disable update alert if this is a prerelease 2020-09-01 16:22:29 -07:00
James R
4b7d16283d Update version to 2.2.7 RC1 2020-09-01 15:38:51 -07:00
James R
72437ae357 Define BETAVERSION as a suffix to the version string 2020-09-01 15:38:27 -07:00
James R
045a5d3dd1 Update patch.pk3 asset hash 2020-09-01 15:26:13 -07:00
SteelT
9393efc9cc Merge branch 'replace-purefat' into 'next'
New STJR Intro and related changes (resolves #202)

Closes #202

See merge request STJr/SRB2!1132
2020-09-01 15:00:48 -04:00
Steel Titanium
db6bd42eb1 Allow the game to continue even if the STARTUP lump is somehow missing 2020-09-01 14:46:03 -04:00
Steel Titanium
4509cd3798 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat 2020-09-01 13:54:27 -04:00
James R
b2226e95d6 Merge branch 'master' into next 2020-08-31 16:10:05 -07:00
James R
e593610862 Fix NOHW compiling 2020-08-31 16:09:41 -07:00
James R
6c2370f894 Kill NOHS
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
2020-08-31 16:06:40 -07:00