Jaime Passos
|
ea756fd557
|
Make exitmove friendly, don't start empty intermission screens
|
2020-02-29 01:51:45 -03:00 |
|
Jaime Passos
|
9d0e3465f9
|
G_CoopGametype, for all the GT_COOP cases
|
2020-02-29 00:57:22 -03:00 |
|
Jaime Passos
|
d831163487
|
Consider hide-and-seek as GTR_HIDEFROZEN
|
2020-02-28 23:52:33 -03:00 |
|
Jaime Passos
|
d5f6e5fcc6
|
Race is Competition without the lives
|
2020-02-28 23:47:38 -03:00 |
|
Jaime Passos
|
33f58f006d
|
Score adding and stealing should check the gametype's rules.
|
2020-02-28 23:41:10 -03:00 |
|
Jaime Passos
|
895c226548
|
Fix incorrect team gametype rule being used in A_OldRingExplode
|
2020-02-28 23:25:25 -03:00 |
|
Jaime Passos
|
604c05801a
|
Fix homing ring using the wrong team gametype rule
|
2020-02-28 23:21:27 -03:00 |
|
Jaime Passos
|
7a34372885
|
Let spectators decide where they spawn
Also fixes some issues with tag gametypes
|
2020-02-23 19:23:00 -03:00 |
|
Jaime Passos
|
48a9ea8d0e
|
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
|
8efba0e367
|
Allow countdown time-up in any campaign gametype
|
2020-02-23 16:50:36 -03:00 |
|
Jaime Passos
|
1b9a6fed3e
|
Same here
|
2020-02-23 16:46:45 -03:00 |
|
Jaime Passos
|
990df8e8c0
|
Consider Co-Op here as any campaign gametype
|
2020-02-23 16:45:01 -03:00 |
|
Jaime Passos
|
4d94689af7
|
Scan for emeralds in gametypes with Emerald Hunt
|
2020-02-23 16:41:39 -03:00 |
|
Jaime Passos
|
1d5f9ed292
|
Always allow skin switching in friendly gametypes
|
2020-02-23 16:40:52 -03:00 |
|
Jaime Passos
|
220cf7bd89
|
Don't reset player between maps in campaign gametypes
|
2020-02-23 16:40:16 -03:00 |
|
Jaime Passos
|
84cde74bda
|
Award pink shields in friendly gametypes
|
2020-02-23 16:38:32 -03:00 |
|
SteelT
|
8328c2a9b7
|
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
|
4f5694fa14
|
Enable use of the patch file
|
2020-02-22 16:42:24 -05:00 |
|
Steel Titanium
|
c7778af7d6
|
Update version number to 2.2.2
|
2020-02-22 16:37:13 -05:00 |
|
James R
|
f8c9912d25
|
Merge remote-tracking branch 'origin/master' into next
|
2020-02-21 21:06:27 -08:00 |
|
James R
|
1a251ccee2
|
Fix NOMD5 compiling
|
2020-02-21 21:06:04 -08:00 |
|
Steel Titanium
|
fc042e90f0
|
Merge branch 'master' into next
|
2020-02-21 21:01:29 -05:00 |
|
SteelT
|
0d02983d97
|
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
|
fcb0c62bf7
|
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
|
e6dafe3002
|
Merge remote-tracking branch 'origin/master' into next
|
2020-02-20 17:30:50 -08:00 |
|
James R
|
441be52fd8
|
Fix NOPNG compiling
|
2020-02-20 17:30:32 -08:00 |
|
James R
|
aa0d40212e
|
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
|
4331b13952
|
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
|
8eb80cbf75
|
clarify the situation a bit more in the comments
|
2020-02-20 20:38:01 +00:00 |
|
Monster Iestyn
|
7ee6ff2b03
|
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
|
185c8a073e
|
:)
|
2020-02-19 14:44:22 -08:00 |
|
James R
|
ccfea66d68
|
Regex bruh moment
|
2020-02-19 14:37:42 -08:00 |
|
James R
|
2274129f57
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Steel Titanium
|
42f141d32f
|
Merge branch 'master' into next
|
2020-02-18 22:03:08 -05:00 |
|
James R
|
a1cf43605a
|
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
|
ba9f866acf
|
Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks
See merge request STJr/SRB2!709
|
2020-02-18 21:58:18 -05:00 |
|
James R
|
903e9ee17e
|
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
|
7ff3fb6a36
|
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
|
f39785672d
|
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
|
3070a09dde
|
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
|
b329536bd1
|
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
|
1bc6f2cd91
|
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
|
4f150cb811
|
Enough
|
2020-02-18 22:55:40 -03:00 |
|
Tatsuru
|
522a51b3a1
|
Standards 2
|
2020-02-18 22:50:22 -03:00 |
|
Tatsuru
|
c562a4eea4
|
Standards
|
2020-02-18 22:46:16 -03:00 |
|
Steel Titanium
|
9efae0bda0
|
Merge branch 'master' into next
|
2020-02-18 17:41:13 -05:00 |
|
Jaime Passos
|
d32b88b18c
|
Merge remote-tracking branch 'origin/master' into rscache
|
2020-02-18 19:38:19 -03:00 |
|
Jaime Passos
|
e98e0c785a
|
Merge remote-tracking branch 'origin/master' into seenames-fix
|
2020-02-18 19:37:55 -03:00 |
|
SteelT
|
8d6d574fa5
|
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
|
f1204a80aa
|
Merge branch 'next' into the-colors-feel-so-right
|
2020-02-18 14:29:50 -05:00 |
|