stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 11:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
10550 commits 172 branches 41 tags 285 MiB
Commit graph

10550 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime Passos
290cd9d08e Same here 2020-02-23 16:46:45 -03:00
Jaime Passos
1b8e172af3 Consider Co-Op here as any campaign gametype 2020-02-23 16:45:01 -03:00
Jaime Passos
a334542f34 Scan for emeralds in gametypes with Emerald Hunt 2020-02-23 16:41:39 -03:00
Jaime Passos
b622f539ff Always allow skin switching in friendly gametypes 2020-02-23 16:40:52 -03:00
Jaime Passos
f313a0386f Don't reset player between maps in campaign gametypes 2020-02-23 16:40:16 -03:00
Jaime Passos
572bffcd83 Award pink shields in friendly gametypes 2020-02-23 16:38:32 -03:00
fickleheart
283bb52e7d Disable NOHUD/INLEVEL checks on Lua sound functions 
None of these are implicitly sync-safe anyway, and most have
no need to be walled off from HUD code or intermission thinkers.
 2020-02-23 12:50:45 -06:00
Snu
2dc72219e7 Merge branch 'master' into supergoldedit 2020-02-23 17:57:39 +00:00
SwitchKaze
58d435484c Fix userdataType typo 2020-02-23 12:17:52 -05:00
SwitchKaze
6415e10216 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
Jaime Passos
0362f53e9b Fix incorrect newdisplayplayer in forced ViewpointSwitch 2020-02-23 12:14:52 -03:00
lachwright
4517377552 Start CA_GLIDEANDCLIMB swimming functionality 2020-02-23 15:38:11 +08:00
Tatsuru
ff8a62819b Oopsie 2 2020-02-22 22:36:44 -03:00
Tatsuru
4c00e33096 Oopsie 2020-02-22 21:14:05 -03:00
James R
4244480d63 Add patch_music.pk3 2020-02-22 14:43:41 -08:00
SteelT
0770f77371 Merge branch '2.2.2-prep' into 'next' 
2.2.2 preparation

See merge request STJr/SRB2!811
 2020-02-22 17:27:19 -05:00
Steel Titanium
03e38e9486 Enable use of the patch file 2020-02-22 16:42:24 -05:00
Steel Titanium
1c1163bd0f Update version number to 2.2.2 2020-02-22 16:37:13 -05:00
Louis-Antoine
d19fe295e0 Fix buffer overrun with nodeless players 2020-02-22 15:08:17 +01:00
James R
af12f26f37 Merge remote-tracking branch 'origin/master' into next 2020-02-21 21:06:27 -08:00
James R
f6df71ba54 Fix NOMD5 compiling 2020-02-21 21:06:04 -08:00
James R
0f2b8b8b2c Register servername etc. under NOMD5 
This fixes crashes in the menus.
 2020-02-21 20:04:28 -08:00
James Hale
56b67a3b4f Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
SteelT
cfd190c453 Merge branch 'warp-gamedata-corruption-fix' into 'next' 
Warp gamedata corruption fix

See merge request STJr/SRB2!802
 2020-02-21 21:00:29 -05:00
SteelT
a1cf58cf7f Merge branch 'update-copyright-year' into 'master' 
Update copyright year

See merge request STJr/SRB2!801
 2020-02-21 20:59:56 -05:00
Louis-Antoine
778715f611 Cleanup code a little 2020-02-22 02:21:27 +01:00
Louis-Antoine
af9164f336 Improve join refusal handling 2020-02-22 02:17:21 +01:00
Louis-Antoine
472befd183 Replace MAX_WADPATH with plain numbers 
This is not ideal either, but I would rather
not use a constant for something unrelated.
 2020-02-21 17:31:32 +01:00
Louis-Antoine
ec5b88e79f Fix weird comment style 2020-02-21 17:17:39 +01:00
lachwright
365e63894f Merge branch 'next' into knuxtweaks 2020-02-21 16:28:17 +08:00
James R
93046c5e59 Merge remote-tracking branch 'origin/master' into next 2020-02-20 17:30:50 -08:00
James R
08627752b2 Fix NOPNG compiling 2020-02-20 17:30:32 -08:00
James R
2df4717f18 Fix NO_LUA compiling 2020-02-20 17:20:50 -08:00
James R
cce5308108 Fix compiler warnings 2020-02-20 17:18:26 -08:00
James R
fb0bedf02c Merge branch 'ogl-colorbug' into 'master' 
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
 2020-02-20 19:32:34 -05:00
James R
62d943b609 Merge branch 'thin-fixed' into 'next' 
Add more strings (and respective functions) for v.drawString().

See merge request STJr/SRB2!770
 2020-02-20 19:27:01 -05:00
Snu
2a93ddc2dd Change SKINCOLOR_SUPERGOLD1-5 2020-02-20 21:53:21 +00:00
Sally Cochenour
400366802c Make hook_FollowMobj a mobj hook instead of a player hook 
Makes more logical sense, as if you have a custom follow item for a custom skin, you probably want your new thinker to only run for your new MT_ and not the vanilla ones.
 2020-02-20 16:40:39 -05:00
Monster Iestyn
5c33ff0458 clarify the situation a bit more in the comments 2020-02-20 20:38:01 +00:00
Monster Iestyn
903cc311a7 move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified 2020-02-20 20:31:11 +00:00
Louis-Antoine
3502278f8a SpaceSpaceSpaceSpace 2020-02-20 01:15:54 +01:00
James R
54794f325d :) 2020-02-19 14:44:22 -08:00
James R
61470201f9 Regex bruh moment 2020-02-19 14:37:42 -08:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine
12959ff4a9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io 2020-02-19 22:40:54 +01:00
Louis-Antoine
20d054a679 Minor code cleanup 2020-02-19 22:37:30 +01:00
Louis-Antoine
ebc1809da9 Fix bad tabulation 2020-02-19 22:01:33 +01:00
Tatsuru
380b2f87bb Merge branch 'coloredtitlecard' into Tatsuru/SRB2-dye 2020-02-19 17:47:13 -03:00
Tatsuru
3022e38d15 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
 2020-02-19 17:46:18 -03:00