stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-16 01:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
11112 commits 174 branches 41 tags 300 MiB
Commit graph

11112 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
sphere
b71c75d2ec A special stage is a special stage, even outside of coop. 2020-10-08 18:45:20 +02: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
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
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
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
Snu
bfd8bd7564 comment typo 2020-09-30 08:44:43 +01:00