Commit graph

11063 commits

Author SHA1 Message Date
James R
e9d8166e3b Add CV_SAVE to netvars
dumpconsistency
allowjoin
joinnextround
restrictskinchange
allowteamchange
startinglives
respawndelay
competitionboxes
allowseenames
matchboxes
specialrings
powerstones
countdowntime
touchtag
hidetime
autobalance
teamscramble
scrambleonchange
friendlyfire
overtime
pointlimit
timelimit
basenumlaps
allowexitlevel
inttime
coopstarposts
cooplives
advancemap
playersforexit
exitmove
pausepermission
respawnitemtime
respawnitem
flagtime

tv_recycler
tv_teleporter
tv_superring
tv_supersneaker
tv_invincibility
tv_jumpshield
tv_watershield
tv_ringshield
tv_forceshield
tv_bombshield
tv_1up
tv_eggmanbox
2020-10-09 15:06:09 -07: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
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
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
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
sphere
c020257d1d Merge Programming and Programming Assistance, and some other tweaks. 2020-09-28 15:54:10 +02:00
sphere
5a1b87689b These people deserve to be in the credits proper, also formatting fixes. 2020-09-28 14:48:55 +02:00
Lachlan
dcf358467b Bump RC version 2020-09-28 11:39:57 +08:00
Lachlan
6b738da309 Fix compiler warning 2020-09-28 11:38:56 +08:00
Lachlan
2a5d892463 Update patch.pk3 checksum 2020-09-28 11:12:15 +08:00
Lachlan Wright
bbca4ed805 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
05f4fb13fe 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
5f1048d51f 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
f13d938c57 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
045aaa678c 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
ca6689c8a0 Fix quotes appearing in product version string 2020-09-25 18:55:37 -04:00
Steel Titanium
583500cb92 Update patch.pk3 hash 2020-09-25 18:15:52 -04:00
Steel Titanium
6dbebc9178 Change prerelease version suffix to RC2 2020-09-25 17:58:02 -04:00
SteelT
73d753e670 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
0c71e6f431 Add Jeck to the credits 2020-09-25 11:47:24 -07:00
Lachlan Wright
27a33a8e29 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
Lachlan Wright
b37d6ba94d Merge branch 'name-change-spam' into 'next'
Don't let players change their name more than five times per minute

See merge request STJr/SRB2!1155
2020-09-25 09:36:39 -04:00
Lachlan Wright
1ec61bb8f4 Merge branch 'clarity' into 'next'
Add-on clarity from Kart

See merge request STJr/SRB2!1153
2020-09-25 09:33:04 -04:00
Lachlan Wright
500e0dfba1 Merge branch 'fix-236' into 'next'
Only allow explicitly living players to trigger sector specials

Closes #236

See merge request STJr/SRB2!1152
2020-09-25 09:31:06 -04:00
Lachlan Wright
d20b02b6cd Merge branch 'turret-seeing-ghosts' into 'next'
Fix P_SupermanLook4Players assigning spectators as targets

Closes #209

See merge request STJr/SRB2!1151
2020-09-25 09:30:38 -04:00
Lachlan Wright
e3bd66a210 Merge branch 'no-skincolor-space-warning' into 'next'
Remove "skincolor name contains spaces" console warning

Closes #280

See merge request STJr/SRB2!1148
2020-09-25 09:30:24 -04:00
Lachlan Wright
21094f565c Merge branch 'botsavestuff' into 'next'
Save changes made to the bot's skin, and display it properly in save select

See merge request STJr/SRB2!1147
2020-09-25 09:30:03 -04:00
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