Commit graph

11952 commits

Author SHA1 Message Date
James R
fdc1de357b Update appveyor.yml version 2020-10-02 18:05:12 -07:00
James R
b1d59c6641 Merge branch 'picfmt-pngfix' into 'next'
Fix uninitialized variable issue in patches with missing grAb chunks

See merge request STJr/SRB2!1171
2020-10-02 20:24:10 -04:00
James R
27d96bb21c Merge branch 'fartification' into 'next'
Prevent Canarivore gas from teleporting up walls

See merge request STJr/SRB2!1154
2020-10-02 20:23:36 -04:00
James R
8beee3761e Merge branch 'windows-console-go-brrr' into 'next'
Fix #178

Closes #178

See merge request STJr/SRB2!1112
2020-10-02 20:23:20 -04:00
James R
c35c5ad568 Merge branch 'remove-renderer-notice' into 'next'
Remove "The OpenGL renderer is incomplete" notice (closes #281)

Closes #281

See merge request STJr/SRB2!1169
2020-10-02 20:22:38 -04:00
James R
a0759816e5 Merge branch 'load-graphics-after-startuppwads' into 'next'
Fix graphics replacements not taking effect via -file

See merge request STJr/SRB2!1168
2020-10-02 20:22:11 -04:00
Jaime Passos
ebf50aad44 Use leftoffset and topoffset, not loffs and toffs 2020-10-02 20:40:42 -03:00
James R
401508e9d4 Update Srb2win.rc 2020-10-02 16:11:39 -07:00
James R
c51a4c8fb1 Update version to 2.2.8 2020-10-02 16:10:21 -07:00
James R
1c6c51744c Update patch.pk3 2020-10-02 16:07:15 -07:00
Jaime Passos
aaa9cff6ac Fix PNG issue in OpenGL + optimize PNG sprite loading 2020-10-02 19:48:13 -03:00
James R
be4c5751f8 Revert "Warn when going to OpenGL from the menu"
This reverts commit 569453ee93.

And one line from b6089ccdaf.
2020-10-02 15:37:23 -07:00
Steel Titanium
386db4b7a1 Model fallback 2020-10-02 15:45:43 -04:00
James R
8a8e0ceda2 Move HU_LoadGraphics after startuppwads are loaded
This is needed for graphics replacements to take effect.
2020-10-02 11:54:58 -07:00
James R
304e4bb1f9 Merge branch 'netids-break-again-fuck-this' into 'next'
Fix net ids broken AGAIN (closes #310)

Closes #310

See merge request STJr/SRB2!1166
2020-10-01 23:13:05 -04:00
James R
61cae79bd4 Fix off by one 2020-10-01 16:55:17 -07:00
James R
1cfb1f673b Add wads from the -file parameter after netvars are registered
This is so netvars registered by any lua scripts will load in the correct order.
2020-10-01 16:50:31 -07:00
sphere
a9a0137d22 Remove "RC3" 2020-09-30 20:25:55 +02:00
sphere
d45d5b4e20 Merge branch 'credits-changes' into 'next'
Credits changes

See merge request STJr/SRB2!1161
2020-09-30 13:25:39 -04:00
lachwright
e715b2f01a Update ICNS icon for macOS
Replaced some of the lower resolution variants with some smoother downscales. The 16x16 one is even Sonic's 1-up icon from the game!
2020-10-01 02:47:24 +10:00
Snu
bfd8bd7564 comment typo 2020-09-30 08:44:43 +01:00
Snu
8a00b47b38 Make the function ACTUALLY work 2020-09-30 08:40:21 +01:00
Snu
82ceddb2be god damnit 2020-09-30 08:10:28 +01:00
Snu
feb011ee52 Expose function to Lua 2020-09-30 07:58:41 +01:00
Snu
ca88db00cd Create P_CeilingzAtPos function 2020-09-30 07:56:57 +01:00
Snu
afcadb3232 Remove all instances of PF_CANBUSTFLOORS 2020-09-29 20:16:06 +01:00
sphere
2642df4c98 Fix Arrietty's name being misspelled. 2020-09-29 18:06:50 +02:00
sphere
2ebe731bd4 Game design is a team effort. 2020-09-29 17:23:44 +02:00
Snu
cd4f755e53 Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively. 2020-09-29 13:52:35 +01:00
Snu
75042d781f Fix characters without SF_CANBREAKWALLS not being able to climb bustable walls. 2020-09-29 13:47:48 +01:00
Snu
90fbb752fa Add functionality to PF_CANBREAKFLOORS 2020-09-29 12:58:36 +01:00
Snu
04b749f1f9 Remove SF_BUSTABLEBUSTER, change SF_CANBREAKFLOORS to a pflags; PF_CANBREAKFLOORS 2020-09-29 11:05:04 +01:00
Snu
d07422bda1 Change breaking walls requirement from CA_GLIDEANDCLIMB to SF_CANBREAKWALLS. 2020-09-29 10:32:45 +01:00
Snu
07a57d0419 Add SF_CANBREAKWALLS, SF_CANBREAKFLOORS and SF_BUSTABLEBUSTER 2020-09-29 09:45:34 +01:00
sphere
2e172de6eb Merge Programming and Programming Assistance, and some other tweaks. 2020-09-28 15:54:10 +02:00
sphere
a3d09ca625 These people deserve to be in the credits proper, also formatting fixes. 2020-09-28 14:48:55 +02:00
Lachlan
becc42920b Bump RC version 2020-09-28 11:39:57 +08:00
Lachlan
5946b54a92 Fix compiler warning 2020-09-28 11:38:56 +08:00
Lachlan
7697553498 Update patch.pk3 checksum 2020-09-28 11:12:15 +08:00
Lachlan Wright
09c83b43b1 Merge branch 'fix-shoop-da-koop' into 'next'
Fix Eggmobile spawning Bowsers after hitting Fang with pinch phase laser

Closes #288

See merge request STJr/SRB2!1160
2020-09-27 22:42:28 -04:00
Lachlan Wright
ca2eb78055 Merge branch 'special-stage-respects-nextmapoverride' into 'next'
Make Special Stage map transitions respect nextmapoverride.

See merge request STJr/SRB2!1129
2020-09-27 22:42:07 -04:00
Lachlan Wright
27b7b5efce Merge branch 'fix-noscalepatch-with-string-drawers' into 'next'
Fix string drawing functions so they account for V_NOSCALEPATCH effectively…

See merge request STJr/SRB2!1107
2020-09-27 22:41:39 -04:00
Monster Iestyn
ddd59a6e9d A_Boss1Laser (pinch phase): Reset var1 to locvar1 each time so we don't accidentally spawn koopas (or something else) as a result of hitting enemies with the laser 2020-09-26 17:31:49 +01:00
SteelT
060f46653d Merge branch 'ogl-model-uv-adjust' into 'next'
Re-adjust model UVs when sprite texture dimensions change

See merge request STJr/SRB2!1068
2020-09-25 21:19:59 -04:00
Steel Titanium
9e036e6291 Fix quotes appearing in product version string 2020-09-25 18:55:37 -04:00
Steel Titanium
375d09c734 Update patch.pk3 hash 2020-09-25 18:15:52 -04:00
Steel Titanium
5d54c70bfa Change prerelease version suffix to RC2 2020-09-25 17:58:02 -04:00
SteelT
966bf2c0d9 Merge branch 'jeck' into 'next'
Add Jeck to the credits

See merge request STJr/SRB2!1159
2020-09-25 17:47:33 -04:00
James R
057d765821 Add Jeck to the credits 2020-09-25 11:47:24 -07:00
Lachlan Wright
b4f9767b7b Merge branch 'sound-origin' into 'next'
Apply volume to sounds with origin too

See merge request STJr/SRB2!1156
2020-09-25 10:04:46 -04:00