Commit graph

10998 commits

Author SHA1 Message Date
Lachlan Wright
2fc82d429e Merge branch 'more-helpful-lua-error' into 'next'
Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened

See merge request STJr/SRB2!1145
2020-09-25 09:28:49 -04:00
Lachlan Wright
9f58d6f053 Merge branch 'snake-fixes' into 'next'
Fix bonus items sometimes overriding apples in Snake minigame

See merge request STJr/SRB2!1134
2020-09-25 09:23:33 -04:00
Lachlan Wright
ed58fab45f 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
0060bac482 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
6faa84eaee 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
923e3d4888 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
325f4757f0 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
1b4fa12493 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
dd2fa3077e 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
7374769573 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
ec8eb47852 Shitty decode listserv 2020-09-19 18:54:04 -07:00
James R
cc3a9b1bb1 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
3e511b131f 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
d99757278b Don't ifdef CV_LoadDemoVars out if OLD22DEMOCOMPAT defined 2020-09-19 18:34:52 -07:00
Steel Titanium
58d4045b93 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
543cc21bf4 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
d7a65640c4 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
6a168ac5e9 Merge branch 'pictureformats' into 'next'
PNG conversion refactoring

See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
SteelT
796165df82 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
a8d3510958 Attempt to use the PNG image's palette, if it is present 2020-09-10 03:16:21 -03:00
Jaime Passos
15eb91be69 Use color look-up table for PNG conversion 2020-09-10 02:10:31 -03:00
Jaime Passos
bf52125494 Change method of color look-up table generation 2020-09-10 01:43:46 -03:00
GoldenTails
92f8fb360e Can we just do this please? Thanks. 2020-09-09 22:19:14 -05:00
lachwright
89eccd7e87 Set additional UDMF parameters on objectplaced mapthings to defaults 2020-09-07 13:08:22 +09:30
lachwright
c4a4608236 Let analog control schemes control objectplace like standard control schemes 2020-09-06 19:03:17 +09:30
lachwright
e77ebf1234 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
6c94b9d07e Fix netid overflow check 2020-09-05 23:23:54 -07:00
GoldenTails
2c303b935d 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
9c2b121728 Merge branch 'credits-227' into 'next'
Update credits

See merge request STJr/SRB2!1136
2020-09-06 01:20:50 -04:00
James R
0b1f7792e9 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
c33f3e0cb2 Update SuperPhanto's name with real name per request 2020-09-02 17:59:53 -07:00
James R
e438d55720 Add SuperPhanto to the art credits 2020-09-01 18:51:47 -07:00
James R
a7d7933c5a Disable update alert if this is a prerelease 2020-09-01 16:22:29 -07:00
James R
605ea2c668 Update version to 2.2.7 RC1 2020-09-01 15:38:51 -07:00
James R
1922a78a3b Define BETAVERSION as a suffix to the version string 2020-09-01 15:38:27 -07:00
James R
aa8f07af41 Update patch.pk3 asset hash 2020-09-01 15:26:13 -07:00
SteelT
35c57b744d 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
861118ac53 Allow the game to continue even if the STARTUP lump is somehow missing 2020-09-01 14:46:03 -04:00
Steel Titanium
ca08a7675c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat 2020-09-01 13:54:27 -04:00
James R
d78befc713 Merge branch 'master' into next 2020-08-31 16:10:05 -07:00
James R
e4b7257ec9 Fix NOHW compiling 2020-08-31 16:09:41 -07:00
James R
7cbc9add07 Kill NOHS
(cherry picked from commit a79316b375)
2020-08-31 16:06:40 -07:00
James R
1818693d71 Fix NOGME compiling
(cherry picked from commit d52a35e5b6)
2020-08-31 16:04:09 -07:00
Steel Titanium
ce666acdda Fix some build errors
(cherry picked from commit f25235d1eb)
2020-08-29 18:08:41 -07:00
James R
e6c914c7b2 Fix stupid NONET 2020-08-29 17:51:59 -07:00
James R
d31fb748b2 Do not do master server things when NOCURL
(cherry picked from commit b681b6e9e6)
2020-08-29 17:45:28 -07:00
James R
c188d6eb5d C90? 2020-08-29 17:21:54 -07:00
Steel Titanium
08aa1a5ad7 Fix compile error 2020-08-29 20:04:11 -04:00
Steel Titanium
13033c521b Attempts to make the intro a bit more shorter
Make the scene time be 5 seconds long max

Use the standard fade which is much shorter in length.
2020-08-29 19:28:16 -04:00
James R
f013b73dd5 Merge remote-tracking branch 'origin/master' into next 2020-08-28 19:52:25 -07:00