Jaime Passos
fd062308fe
Score adding and stealing should check the gametype's rules.
2020-02-28 23:41:10 -03:00
Jaime Passos
3ce4ddf854
Fix incorrect team gametype rule being used in A_OldRingExplode
2020-02-28 23:25:25 -03:00
Jaime Passos
51c593e633
Fix homing ring using the wrong team gametype rule
2020-02-28 23:21:27 -03:00
Jaime Passos
b103a792c0
Let spectators decide where they spawn
...
Also fixes some issues with tag gametypes
2020-02-23 19:23:00 -03:00
Jaime Passos
678935f26a
Turn players IT if they join the game after the hide time in tag gametypes
...
Except in gametypes with hide time stasis, because they can't change team.
2020-02-23 17:02:50 -03:00
Jaime Passos
7439ab5296
Allow countdown time-up in any campaign gametype
2020-02-23 16:50:36 -03:00
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
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
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
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
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
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
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
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
Steel Titanium
281d40d6d2
Merge branch 'master' into next
2020-02-18 22:03:08 -05:00
James R
d3d8f85602
Merge branch 'the-colors-feel-so-right' into 'next'
...
New skin colors, add support for preferred opposite color to save cards, new lua features.
See merge request STJr/SRB2!787
2020-02-18 22:02:01 -05:00
James R
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
a447a3d8a9
Merge branch 'rscache' into 'master'
...
Fix R_CacheRotSprite not working with PNG lumps
See merge request STJr/SRB2!800
2020-02-18 21:54:45 -05:00
James R
b92d66a54c
Merge branch 'seenames-fix' into 'master'
...
Fix seenames not working without a SeenPlayer hook
See merge request STJr/SRB2!799
2020-02-18 21:53:28 -05:00
James R
c1a91cdc2e
Merge branch 'setrenderneeded-fix' into 'master'
...
Clear setrenderneeded after calling VID_CheckRenderer
See merge request STJr/SRB2!793
2020-02-18 21:53:14 -05:00
James R
26825a2b4c
Merge branch 'pw-justlaunched' into 'next'
...
Add pw_justlaunched to tell modders when a player launches from a slope
See merge request STJr/SRB2!792
2020-02-18 21:53:05 -05:00
James R
2d8522b9ec
Merge branch 'titlecard-options' into 'next'
...
Allow more options for when the titlecard shows up
See merge request STJr/SRB2!765
2020-02-18 21:52:03 -05:00
James R
8054f341a1
Merge branch 'startup-file-not-found' into 'master'
...
Fix the issue !678 did, but just don't exit if the file was added twice
See merge request STJr/SRB2!753
2020-02-18 21:50:11 -05:00
Tatsuru
4a8de7cb55
Enough
2020-02-18 22:55:40 -03:00
Tatsuru
ec67e776dc
Standards 2
2020-02-18 22:50:22 -03:00
Tatsuru
c76a8e8a58
Standards
2020-02-18 22:46:16 -03:00
Steel Titanium
da15c92568
Merge branch 'master' into next
2020-02-18 17:41:13 -05:00
Jaime Passos
1dc080e8cd
Merge remote-tracking branch 'origin/master' into rscache
2020-02-18 19:38:19 -03:00
Jaime Passos
72edf514c2
Merge remote-tracking branch 'origin/master' into seenames-fix
2020-02-18 19:37:55 -03:00
SteelT
802bd4040f
Merge branch 'ftrim-tweak-2' into 'master'
...
M_Ftrim
See merge request STJr/SRB2!798
2020-02-18 17:24:05 -05:00
Steel Titanium
f0e2ba9e6a
Merge branch 'next' into the-colors-feel-so-right
2020-02-18 14:29:50 -05:00
Monster Iestyn
2b3034a7af
Merge branch 'master' into next
2020-02-18 17:38:05 +00:00
James R
e3ba369ae4
Fix M_Ftrim
...
- Use '%f' instead of '%g' to avoid going scientific. Should also fix some
compiler warnings.
- The trailing zero trimming code is now useful. It started on the terminating
byte before and wouldn't have done anything with '%g' anyway.
- Use the absolute fractional value to avoid a sign.
2020-02-17 19:38:14 -08:00
Jaime Passos
369fd8e35f
Fix LUAh_SeenPlayer not working
2020-02-17 23:06:38 -03:00
Jaime Passos
b3933c7842
Fix R_CacheRotSprite not working with PNG lumps
2020-02-17 22:59:36 -03:00