Commit graph

11111 commits

Author SHA1 Message Date
Tatsuru
2669476e18 Use the sector's actual soundorg (how did it even work) 2020-09-13 13:54:43 -03:00
Tatsuru
087bdbad63 Check for sector_t userdata as well 2020-09-13 12:33:18 -03: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
Bartu İnce
f139fa9f81 Merge branch 'chain-attraction-homing' of https://git.magicalgirl.moe/ZipperQR/SRB2 into chain-attraction-homing
# Conflicts:
#	src/p_user.c
2020-09-08 03:08:35 +03:00
Bartu İnce
3a84946e98 no message 2020-09-08 03:03:48 +03:00
Jaime Passos
98c6b54994 Improved memory management for patches 2020-09-07 02:23:07 -03: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
GoldenTails
4c2a3e6c77 Expose V_GetStringColormap to Lua via v.getStringColormap(). 2020-09-01 10:47:02 -05: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
James R
f52b66fdf5 Merge branch 'makefile-detect-system' into 'master'
Detect which system the Makefile is running on to compile for

See merge request STJr/SRB2!1123
2020-08-28 22:49:34 -04:00
James R
2165d747cb Merge branch 'default-warningmode' into 'master'
Use WARNINGMODE by default

See merge request STJr/SRB2!1122
2020-08-28 22:49:24 -04:00
Steel Titanium
f0ec718aae Make the intro shorter as I felt it was a bit too long
Change the code a bit so less magic numbers.
2020-08-28 20:08:46 -04:00
Steel Titanium
2f06ff44cc Add new STARTUP lump, for the splash screen 2020-08-28 17:11:38 -04:00
Steel Titanium
6a37f39ca8 New STJR Intro, replaces the old PURE FAT intro 2020-08-28 17:10:54 -04:00
GoldenTails
ba4310939a Make Special Stage map transitions respect nextmapoverride.
In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars.
It's otherwise impossible to do so via Lua.
2020-08-26 23:22:53 -05:00
Tatsuru
57b1becfe0 Decolorize players as intended 2020-08-24 23:53:21 -03:00
Louis-Antoine
0846079c06 Fix bonus items sometimes overriding apples in Snake minigame 2020-08-24 00:34:44 +02:00
Hannu Hanhi
baaf19249b Add tic and ui times to render stats 2020-08-23 20:09:55 +03:00