lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,097 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

11097 Commits

Author SHA1 Message Date
Zippy_Zolton 1c751fdf0f I am going to die :D 2020-10-09 15:42:55 -05: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
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
James R faaefd5061 Merge branch 'playercmd-kart-port' into 'next' 
PlayerCmd Port

See merge request STJr/SRB2!1072
 2020-10-08 20:10:16 -04: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
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 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
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
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