Commit graph

11177 commits

Author SHA1 Message Date
James R
14e586bfd3 Merge branch 'autocomplete-aliases' into 'next'
Autocomplete aliases in console

See merge request STJr/SRB2!1113
2020-10-08 20:30:07 -04:00
James R
0772c702cc Merge branch 'v-string-colormap-lua-exposure' into 'next'
Expose V_GetStringColormap to Lua via v.getStringColormap().

See merge request STJr/SRB2!1111
2020-10-08 20:28:25 -04:00
James R
df8c185ba7 Merge branch 'chain-attraction-homing' into 'next'
Chain Homing with Attraction Shield

See merge request STJr/SRB2!1109
2020-10-08 20:19:21 -04:00
James R
ceb4969505 Merge branch 'playercmd-kart-port' into 'next'
PlayerCmd Port

See merge request STJr/SRB2!1072
2020-10-08 20:10:16 -04:00
sphere
77f64b0a81 A special stage is a special stage, even outside of coop. 2020-10-08 18:45:20 +02:00
James R
2a316e49e5 Revert netvars after leaving a netgame 2020-10-06 23:32:11 -07:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Zachary McAlpin
bff3b20c4a Made states unmodifable in CMD building code 2020-10-06 16:54:23 -05:00
Zachary McAlpin
ae238236c8 Update comment 2020-10-06 16:43:14 -05:00
sphere
a627c0b013 Only set MV_MP in multiplayer or a netgame. 2020-10-06 19:06:06 +02:00
sphere
be761714f6 Don't count demo playback as visiting a level. 2020-10-06 16:49:53 +02:00
GoldenTails
3514ecdec8 Update help message to mention supported file extensions, and change the description to "Load add-ons" 2020-10-06 03:37:23 -05:00
Zachary McAlpin
36d7ddeb09 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into playercmd-kart-port 2020-10-06 02:07:05 -05:00
GoldenTails
f289999ce3 Add warning when files are skipped due to being previously processed. 2020-10-04 21:03:29 -05:00
GoldenTails
79861c1a98 Give the addfile command variable argument support. 2020-10-04 21:02:20 -05:00
gm3k4g
73ae63d8c4 Added splitscreen command line parameter 2020-10-05 00:12:13 +03:00
Steel Titanium
db0757aa69 Provide a default exe manifest 2020-10-03 19:53:59 -04:00
GoldenTails
da3a1b18f9 Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions. 2020-10-03 13:24:47 -05:00
Hannu Hanhi
e234eb8f87 Add error message when the GDI Generic OpenGL renderer is encountered in Windows 2020-10-03 18:45:56 +03:00
James R
ffeb48ab4d Merge branch 'update-228' into 'next'
2.2.8 prep

See merge request STJr/SRB2!1170
2020-10-03 01:45:06 -04:00
James R
b54bb3b596 Update appveyor.yml version 2020-10-02 18:05:12 -07:00
James R
bb98bea911 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
98be08db0b 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
94415facfe 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
8152c0c32a 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
2768e4008f 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
f75aa6cd18 Use leftoffset and topoffset, not loffs and toffs 2020-10-02 20:40:42 -03:00
James R
92cd4fd8ba Update Srb2win.rc 2020-10-02 16:11:39 -07:00
James R
7b812a8e27 Update version to 2.2.8 2020-10-02 16:10:21 -07:00
James R
41a0fd52c1 Update patch.pk3 2020-10-02 16:07:15 -07:00
Jaime Passos
9ad15fd556 Fix PNG issue in OpenGL + optimize PNG sprite loading 2020-10-02 19:48:13 -03:00
James R
e42eb9aba8 Revert "Warn when going to OpenGL from the menu"
This reverts commit 3883d44bb5.

And one line from 5c1b3baf18.
2020-10-02 15:37:23 -07:00
Steel Titanium
3cd14bc863 Model fallback 2020-10-02 15:45:43 -04:00
James R
3dad7ca226 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
e7c493904a 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
9adbb7dfa3 Fix off by one 2020-10-01 16:55:17 -07:00
James R
d612fb5c99 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
d4fdf8ee16 Remove "RC3" 2020-09-30 20:25:55 +02:00
sphere
c81d5ffd7c Merge branch 'credits-changes' into 'next'
Credits changes

See merge request STJr/SRB2!1161
2020-09-30 13:25:39 -04:00
lachwright
6fa06c4523 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
82535af856 comment typo 2020-09-30 08:44:43 +01:00
Snu
f6e3d347ff Make the function ACTUALLY work 2020-09-30 08:40:21 +01:00
Snu
34f8b84b1c god damnit 2020-09-30 08:10:28 +01:00
Snu
50d1193680 Expose function to Lua 2020-09-30 07:58:41 +01:00
Snu
43b1894be3 Create P_CeilingzAtPos function 2020-09-30 07:56:57 +01:00
Snu
4480273fc6 Remove all instances of PF_CANBUSTFLOORS 2020-09-29 20:16:06 +01:00
sphere
5e876fc805 Fix Arrietty's name being misspelled. 2020-09-29 18:06:50 +02:00
sphere
e00753e427 Game design is a team effort. 2020-09-29 17:23:44 +02:00
Snu
f0b7da9d79 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
5f96f8af58 Fix characters without SF_CANBREAKWALLS not being able to climb bustable walls. 2020-09-29 13:47:48 +01:00