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 |
|
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 |
|
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 |
|
SteelT
|
966bf2c0d9
|
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
|
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 |
|