stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-01 23:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity
11144 commits 174 branches 42 tags 257 MiB
Commit graph

9827 commits

Author SHA1 Message Date
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
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
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
Hannu Hanhi
684b868524 Add error message when the GDI Generic OpenGL renderer is encountered in Windows 2020-10-03 18:45:56 +03: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
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
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
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
Steel Titanium
16569b4e9a Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened 
Shouldn't break scripts as it stops execution as soon it happens, like it already does.
 2020-09-14 22:54:07 -04:00
Tatsuru
013714a26f Encapsulate userdata checks 2020-09-14 17:33:26 -03:00
Tatsuru
8d65ce81c7 Legacy moment 2020-09-13 14:30:02 -03:00
Tatsuru
454682df70 Use the sector's actual soundorg (how did it even work) 2020-09-13 13:54:43 -03:00
Tatsuru
782e559adf Check for sector_t userdata as well 2020-09-13 12:33:18 -03:00
SteelT
90302330ed 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
9f09e32520 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
a033f482be Merge branch 'pictureformats' into 'next' 
PNG conversion refactoring

See merge request STJr/SRB2!675
 2020-09-10 15:58:18 -04:00
Jaime Passos
0750d273a6 Attempt to use the PNG image's palette, if it is present 2020-09-10 03:16:21 -03:00
Jaime Passos
4e437076c1 Use color look-up table for PNG conversion 2020-09-10 02:10:31 -03:00
Jaime Passos
f24647dc4d Change method of color look-up table generation 2020-09-10 01:43:46 -03:00
GoldenTails
c61eeb9238 Can we just do this please? Thanks. 2020-09-09 22:19:14 -05:00
Bartu İnce
7e9bc0d103 no message 2020-09-08 03:03:48 +03:00
Jaime Passos
dcaad758f4 Improved memory management for patches 2020-09-07 02:23:07 -03:00
lachwright
efc82ffa74 Set additional UDMF parameters on objectplaced mapthings to defaults 2020-09-07 13:08:22 +09:30
lachwright
b805e10058 Let analog control schemes control objectplace like standard control schemes 2020-09-06 19:03:17 +09:30
lachwright
d7ab41a90b 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
ca9cf25423 Fix netid overflow check 2020-09-05 23:23:54 -07:00
GoldenTails
8ae5f3030f 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
30057e9268 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
9a1099ec17 Update SuperPhanto's name with real name per request 2020-09-02 17:59:53 -07:00
James R
7bec06856f Add SuperPhanto to the art credits 2020-09-01 18:51:47 -07:00
James R
c7c9ae3847 Disable update alert if this is a prerelease 2020-09-01 16:22:29 -07:00
James R
4b7d16283d Update version to 2.2.7 RC1 2020-09-01 15:38:51 -07:00
James R
72437ae357 Define BETAVERSION as a suffix to the version string 2020-09-01 15:38:27 -07:00