Commit graph

11097 commits

Author SHA1 Message Date
Zippy_Zolton
25b0290e2e I am going to die :D 2020-10-09 15:42:55 -05:00
James R
6363162826 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
4e011051db 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
c75429b5c1 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
eaec5126a6 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
ed0336a9f5 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
a82f568fc3 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
ac8def3139 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
14e586bfd3 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
0772c702cc 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
df8c185ba7 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
ceb4969505 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
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Zachary McAlpin
bff3b20c4a Made states unmodifable in CMD building code 2020-10-06 16:54:23 -05:00
Zachary McAlpin
ae238236c8 Update comment 2020-10-06 16:43:14 -05:00
Zachary McAlpin
36d7ddeb09 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
db0757aa69 Provide a default exe manifest 2020-10-03 19:53:59 -04:00
GoldenTails
da3a1b18f9 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
e234eb8f87 Add error message when the GDI Generic OpenGL renderer is encountered in Windows 2020-10-03 18:45:56 +03: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