Commit graph

10042 commits

Author SHA1 Message Date
Jaime Passos 4c59f8c615 Fix OpenGL GIF recording crashing with gif_localcolortable disabled 2020-10-15 01:14:16 -03:00
Steel Titanium b19764dc8e Merge branch 'master' into next 2020-10-14 14:58:07 -04:00
sphere a2ff89f007 Make record attack's quick retry more consistent. 2020-10-14 17:39:23 +02:00
James R b35633bb61 brug 2020-10-14 01:19:43 -07:00
James R cce55ccf90 Merge branch 'ffloorclip-2' into 'next'
Software 3D floor rendering optimization (second attempt)

See merge request STJr/SRB2!1184
2020-10-14 03:10:44 -04:00
James R f7e9772e10 Merge branch 'i-pity-you' into 'next'
Allow JumpSpin abilities to be used with non-ability shields

Closes #277

See merge request STJr/SRB2!1146
2020-10-14 03:08:20 -04:00
James R bc23f582fe Don't need to set this actually 2020-10-13 19:11:18 -07:00
James R 5fca04c3dd Apply step up/down to opposite plane too 2020-10-13 19:04:52 -07:00
Zippy_Zolton 6fd226eb29 Crosshair fix, no GAMEQUIT 2020-10-13 16:41:39 -05:00
Zippy_Zolton 5d699591c7 more!!!!! :3 2020-10-13 14:23:56 -05:00
Zippy_Zolton 45b52e3729 good night 2020-10-13 02:19:20 -05:00
Zippy_Zolton 2ba1017dab More whitelists :D 2020-10-13 02:13:35 -05:00
James R cb8f6097cf Merge branch 'save-netvars' into 'next'
Save netvars

See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
James R 58464771a8 Merge branch 'addfile-vararg' into 'next'
Give the addfile command variable argument support.

See merge request STJr/SRB2!1176
2020-10-12 18:32:20 -04:00
lachwright 6a73e81227 Merge remote-tracking branch 'origin/next' into i-pity-you 2020-10-13 09:24:09 +11:00
James R d73fbd8616 Merge branch 'slight-shader-cleanup' into 'next'
Shader code cleanup

See merge request STJr/SRB2!1103
2020-10-12 18:22:08 -04:00
GoldenTails 87a5e1d30c Futureproof against strict buildbots. 2020-10-12 17:14:32 -05:00
James R d7b8d5d0f3 Merge branch 'penalty-of-death' into 'next'
I am going to die :D (closes #337)

Closes #337

See merge request STJr/SRB2!1183
2020-10-12 18:11:09 -04:00
James R 5a5024faf4 Merge branch 'skip-credits-gone-wrong' into 'next'
Fix clients being able to skip credits AGAIN (closes #339)

Closes #339

See merge request STJr/SRB2!1182
2020-10-12 18:09:48 -04:00
James R d4bef36c19 Merge branch 'specialstagecheck' into 'next'
A special stage is a special stage, even outside of coop.

Closes #211

See merge request STJr/SRB2!1180
2020-10-12 18:08:02 -04:00
James R d1c8d41f94 Merge branch 'no-demo-visit' into 'next'
Don't count demo playback as visiting a level.

Closes #327 and #340

See merge request STJr/SRB2!1177
2020-10-12 18:05:43 -04:00
GoldenTails 94f6d0b002 Fix gzip failing to compress SRB2's objdump on non-Windows. 2020-10-12 16:59:47 -05:00
James R 35c666514b Merge branch 'splitscreen-parameter' into 'next'
Add `-splitscreen` commandline parameter

See merge request STJr/SRB2!1175
2020-10-12 17:46:55 -04:00
James R 9538ca696a Merge branch 'ceilingz' into 'next'
Add P_CeilingzAtPos function

See merge request STJr/SRB2!1164
2020-10-12 17:44:51 -04:00
Zippy_Zolton da27f720da Whitelist the "X" shown in the HUD 2020-10-11 23:22:16 -05:00
James R 7f8ec74c27 Use the macro in sectorlines_num too 2020-10-10 17:40:01 -07:00
James R 8bc8946be8 Turn the lua sector lines hack into a macro 2020-10-10 16:43:09 -07:00
Hannu Hanhi 465693b242 Put newline to end of m_perfstats.h 2020-10-10 22:23:33 +03:00
Hannu Hanhi 4f20a20165 Performance stats 2020-10-10 22:12:34 +03:00
Jaime Passos 06c0932ab4 Only check the tRNS (trans) chunk if the image is still palettized 2020-10-10 14:17:53 -03:00
Jaime Passos 4d847f4223 Compare the PNG's palette with the game's palette instead of assuming they are the same 2020-10-10 14:17:42 -03:00
Jaime Passos 0021a9aeaf Fix bug 2020-10-10 13:37:23 -03:00
Jaime Passos c5a3a61b28 Make 3D floors cull areas below or above them to reduce overdraw (2) 2020-10-10 01:00:39 -03:00
James R 4b5cb8025b Show revert value of cvar with help command 2020-10-09 16:28:03 -07:00
James R b67807dd04 When save/loading config use revert value for netvars if you are not the server 2020-10-09 16:22:17 -07:00
James R f5e4d076b9 Add CV_NETVAR to server affecting cvars
showjoinaddress
maxplayers
joindelay
rejointimeout
resynchattempts
blamecfail
maxsend
noticedownload
downloadspeed
jointimeout
maxping
pingtimeout
servername
2020-10-09 15:23:16 -07:00
James R aa102dcea0 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
Zippy_Zolton 1c751fdf0f I am going to die :D 2020-10-09 15:42:55 -05:00
James R a17446f905 Oops, go straight to evaluation if not in a netgame
serverrunning means that you are actually the server.
2020-10-09 13:16:56 -07:00
sphere 76d16473b9 how did this even happen 2020-10-09 05:55:10 -04:00
Jaime Passos 0811f60b2a Let the server or an admin toggle clients' custom shaders 2020-10-09 02:06:13 -03:00
James R 15008f31a7 Merge branch 'sanity-meter-empty' into 'next'
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R 7c72eab58b Merge branch 'manifest-stuff' into 'next'
Provide a default exe manifest

See merge request STJr/SRB2!1174
2020-10-08 22:01:17 -04:00
James R ddb6823fe5 Merge branch 'fix-theoretical-lua-exposure-crashes' into 'next'
Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions in Lua.

See merge request STJr/SRB2!1173
2020-10-08 22:01:02 -04:00
James R 45b9e23895 Merge branch 'ogl-driver-error' into 'next'
Add error message when the GDI Generic OpenGL renderer is encountered in Windows

See merge request STJr/SRB2!1172
2020-10-08 22:00:43 -04:00
James R 933381fb8f Merge branch 'expose-modversion-to-lua' into 'next'
Expose MODVERSION to Lua (because for some reason it wasn't).

See merge request STJr/SRB2!1158
2020-10-08 21:57:38 -04:00
James R d83a112fc5 Merge branch 'next' into 'next'
Updated 16 bit momentum values to 32 bit in demos, changed demo version

See merge request STJr/SRB2!1157
2020-10-08 21:56:30 -04:00
Jaime Passos 63d4c1dffc Merge remote-tracking branch 'origin' into slight-shader-cleanup 2020-10-08 22:45:39 -03:00
James R c3c34c489b Merge branch 'lua-sectorsounds' into 'next'
Support sectors as sound origins in Lua

See merge request STJr/SRB2!1144
2020-10-08 21:05:01 -04:00
James R 355cc1a697 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 88b3a3cd2e 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 95a5bb888a 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
sphere b71c75d2ec A special stage is a special stage, even outside of coop. 2020-10-08 18:45:20 +02:00
James R b3d8ed7d43 Revert netvars after leaving a netgame 2020-10-06 23:32:11 -07:00
James R dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Zachary McAlpin 0f3c87a705 Made states unmodifable in CMD building code 2020-10-06 16:54:23 -05:00
Zachary McAlpin e393093e73 Update comment 2020-10-06 16:43:14 -05:00
sphere f210316d8a Only set MV_MP in multiplayer or a netgame. 2020-10-06 19:06:06 +02:00
sphere 48ca58f580 Don't count demo playback as visiting a level. 2020-10-06 16:49:53 +02:00
GoldenTails d5848e78fc 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 1681371fbd Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into playercmd-kart-port 2020-10-06 02:07:05 -05:00
GoldenTails 2d3a589167 Add warning when files are skipped due to being previously processed. 2020-10-04 21:03:29 -05:00
GoldenTails 0b74818771 Give the addfile command variable argument support. 2020-10-04 21:02:20 -05:00
gm3k4g 2cc8de2bdd Added splitscreen command line parameter 2020-10-05 00:12:13 +03:00
Steel Titanium 0aa1b16fd1 Provide a default exe manifest 2020-10-03 19:53:59 -04:00
GoldenTails 2ae5c02050 Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions. 2020-10-03 13:24:47 -05:00
Louis-Antoine e49032eaf7 Let Lua scripts access userdata metatables 2020-10-03 18:40:37 +02:00
Hannu Hanhi 684b868524 Add error message when the GDI Generic OpenGL renderer is encountered in Windows 2020-10-03 18:45:56 +03:00
Louis-Antoine 121c7da809 Let Lua scripts relink tables to their metatables when unarchiving
This is done through the new "registermetatable" function,
in a somewhat similar fashion to "freeslot" but for metatables:
it must be called at script load to tell SRB2 your metatable
can be automatically relinked during the unarchiving process.
2020-10-03 16:31:04 +02:00
James R 17ce7d57c3 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 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
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 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
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
Lachlan Wright 92b61aacd8 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 86b7957b61 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 1caf92f0ae 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 8f5f248c87 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 9208f0bc33 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 3117dfaf2b 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 256fa9fa10 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 c42f247ce5 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 f1d2992f51 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 982435cf86 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 650635e780 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 7fee293034 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 dbc32ea9ea 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 86252cbea7 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
GoldenTails 021061d80b Expose MODVERSION to Lua (because for some reason it wasn't).
The wiki even states its existence!
2020-09-23 22:28:29 -05:00
James R 30056157c2 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 aa4c1eeea8 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
Riku Salminen e947007920 Wrote 3 lines in 1, as Zwip-Zwap Zapony suggested 2020-09-23 22:37:06 +03:00
Riku Salminen b261e17fdd Update g_demo.c, Remove old comments of fractional loss of one byte 2020-09-23 15:29:03 -04:00
Riku Salminen 1447aba964 Updated 16 bit momentum values to 32 bit in demos, changed demo version 2020-09-23 21:26:51 +03:00
James R de9d1d2b35 Forgot to commit s_sound.h 2020-09-22 20:51:01 -07:00
James R b18d60c1d3 Apply volume to sounds with origin too
Previously sounds with an origin would always start at max volume. This is
because the distance calculation adjusts the volume, and that volume needs to
be updated every tic as distance changes. Storing the original volume works.

(cherry picked from commit 22177753d2f00d58d19d930f51dcd086097dfd0d)
2020-09-22 20:47:31 -07:00
James R b655fa496e Don't let players change their name more than five times per minute
(ported 17f75903b029bbf01217153dc98009d305137c8f and 11ddcfa9a1f2311ec67377b76ed1160ef14b7f60)
2020-09-22 12:04:28 -07:00
lachwright 9ae2010880 Allow Canarivore gas to interact with players again (oops) 2020-09-22 13:11:56 +09:30
lachwright 5d1a95b9c6 Prevent Canarivore gas from teleporting up walls 2020-09-21 17:23:53 +09:30
Zippy_Zolton 62f379ec41 Add-on clarity from Kart 2020-09-20 13:07:28 -05:00
lachwright 7eb760afca Only allow explicitly living players to trigger sector specials 2020-09-20 11:49:53 +09:30
Tatsuru a52afc2baf Ignore spectators 2020-09-19 23:10:03 -03:00
James R 5edcc72839 Shitty decode listserv 2020-09-19 18:54:04 -07:00
James R 9e31adf22c 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 9684149ba6 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 bdb44e6ce1 Don't ifdef CV_LoadDemoVars out if OLD22DEMOCOMPAT defined 2020-09-19 18:34:52 -07:00
kaysrishaq c3430951be Update lua_infolib.c 2020-09-18 17:47:38 -04:00
lachwright a78a0071f2 Save changes made to the bot's skin, and display it properly in save select 2020-09-17 19:00:49 +09:30