Jaime Passos
|
bd28daea02
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-28 21:39:38 -03:00 |
|
James R
|
c576804671
|
Merge branch 'levelload-refactor' into 'next'
Hack P_SetupLevel into little pie- actually just clean it up a bit
See merge request STJr/SRB2!587
|
2019-12-28 19:37:06 -05:00 |
|
James R
|
963f757495
|
Merge branch 'give-brains-back' into 'next'
Remove MF_NOTHINK from join-breaking referenced objects
See merge request STJr/SRB2!589
|
2019-12-28 19:33:35 -05:00 |
|
Jaime Passos
|
37b1953a14
|
Disallow few more characters.
|
2019-12-28 21:05:42 -03:00 |
|
Jaime Passos
|
4dafc59133
|
Remove characters that will not be allowed in the constant string.
|
2019-12-28 20:54:22 -03:00 |
|
Jaime Passos
|
e5e4b4891a
|
Add GTR_CUTSCENES. And I ran out of rule slots. Cool.
|
2019-12-28 20:33:28 -03:00 |
|
Jaime Passos
|
8f0d5bf468
|
Organise gametype ruleset again.
|
2019-12-28 20:18:21 -03:00 |
|
Jaime Passos
|
d165634870
|
Add GTR_FRIENDLY.
|
2019-12-28 19:56:18 -03:00 |
|
Jaime Passos
|
41e5789e04
|
Remove debugging stuff.
|
2019-12-28 19:50:14 -03:00 |
|
Jaime Passos
|
63132da7e0
|
Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.
|
2019-12-28 19:49:34 -03:00 |
|
Jaime Passos
|
a7fa90d11d
|
Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.
|
2019-12-28 19:47:03 -03:00 |
|
lachwright
|
65c5f7f571
|
Remove MF_NOTHINK from join-breaking referenced objects
|
2019-12-29 03:01:09 +08:00 |
|
MascaraSnake
|
e3955ed4f3
|
Fix accidental removal of sector_t's spawn_lightlevel initialization
|
2019-12-28 13:58:23 +01:00 |
|
MascaraSnake
|
d00a9a42a1
|
Cleaned up some more stuff in P_LoadLevel()
|
2019-12-28 12:48:32 +01:00 |
|
MascaraSnake
|
9b81821d44
|
Move more P_LoadLevel parts into subfunctions
|
2019-12-28 11:37:56 +01:00 |
|
MascaraSnake
|
f67ff6d97e
|
Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions
|
2019-12-28 11:30:39 +01:00 |
|
MascaraSnake
|
12fbaf85f8
|
Fixed/clarified some flag descriptions in the ZB config
|
2019-12-28 08:43:27 +01:00 |
|
Alam Ed Arias
|
2c03fcaac5
|
Merge branch 'master' into next
|
2019-12-27 17:08:16 -05:00 |
|
James R
|
720ab51340
|
Merge branch 'rotsprite3' into 'next'
More rollangle changes
See merge request STJr/SRB2!582
|
2019-12-27 16:49:21 -05:00 |
|
James R
|
8d70a18fc7
|
Merge branch 'skinusable-fix' into 'next'
Fix edge case with R_SkinUsable
See merge request STJr/SRB2!573
|
2019-12-27 16:49:06 -05:00 |
|
Jaime Passos
|
7d4c00affb
|
GTR_HIDETIME, not GTR_TAG
|
2019-12-27 18:24:08 -03:00 |
|
Jaime Passos
|
9ede8f7c2e
|
In P_KillPlayer, check for the gametype's rules, instead of the gametype itself, before bursting rings.
|
2019-12-27 17:22:55 -03:00 |
|
Jaime Passos
|
142875cf3d
|
Fix CoopLives_OnChange.
|
2019-12-27 17:15:23 -03:00 |
|
Jaime Passos
|
62d79eef2a
|
Same deal, but for starposts.
|
2019-12-27 17:14:56 -03:00 |
|
Jaime Passos
|
ff80c4ef4d
|
Preparing for the inevitable gametype rule that will handle cooplives...
|
2019-12-27 17:08:20 -03:00 |
|
Jaime Passos
|
58c1adf3ef
|
ST_drawLivesArea stuff.
|
2019-12-27 16:58:55 -03:00 |
|
Alam Ed Arias
|
848a144956
|
fread and fwrite use size_t, not int
|
2019-12-27 13:08:26 -05:00 |
|
Alam Ed Arias
|
7201e165a4
|
we only need link on unix systems
|
2019-12-27 13:05:15 -05:00 |
|
Jaime Passos
|
3ce02b8135
|
burst emeralds with GTR_MATCHEMERALDS
|
2019-12-27 12:34:35 -03:00 |
|
Jaime Passos
|
8a3b47e1a9
|
look for GTR_LIVES rule instead of coop/competition gametype
|
2019-12-27 12:29:21 -03:00 |
|
Jaime Passos
|
203f4c50a0
|
add G_CompetitionGametype(void)
|
2019-12-27 12:28:00 -03:00 |
|
Jaime Passos
|
964125c8cf
|
change this > to >=
|
2019-12-27 12:23:50 -03:00 |
|
Jaime Passos
|
5e328d6d33
|
check if the gametype allows spectators to allow jump key respawn
|
2019-12-27 12:17:38 -03:00 |
|
Jaime Passos
|
ca3941f5b8
|
use GTR_DEATHMATCHSTARTS
|
2019-12-27 12:14:33 -03:00 |
|
MascaraSnake
|
e673833780
|
Merge branch 'why-inline' into 'master'
I got a compiler warning from P_PlayerHitsPlayer being too big
See merge request STJr/SRB2!581
|
2019-12-27 02:12:01 -05:00 |
|
MascaraSnake
|
472749de84
|
Merge branch 'zb-config-refactor' into 'next'
Zone Builder configuration refactor
See merge request STJr/SRB2!570
|
2019-12-27 02:04:22 -05:00 |
|
Jaime Passos
|
adb34258f1
|
P_SetupCamera funny
|
2019-12-27 02:07:13 -03:00 |
|
Jaime Passos
|
be32397562
|
Respawn delay gametype rule
|
2019-12-27 01:44:27 -03:00 |
|
James R
|
8311380146
|
Merge branch 'time' into 'master'
haha log files
See merge request STJr/SRB2!567
|
2019-12-26 21:43:46 -05:00 |
|
Jaime Passos
|
a88b0bffe7
|
Avoid possible overflows in the rotsprite arrays.
|
2019-12-26 21:49:36 -03:00 |
|
Jaime Passos
|
a187538157
|
Remove the min() and max() calls.
|
2019-12-26 21:36:35 -03:00 |
|
Jaime Passos
|
f65ac6feab
|
stuff
|
2019-12-26 21:27:30 -03:00 |
|
James R
|
0fd77ff5f4
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-26 15:35:53 -08:00 |
|
James R
|
0726e0b1ee
|
Merge branch 'rotsprite2' into 'next'
rollangle and SpriteInfo changes
See merge request STJr/SRB2!547
|
2019-12-26 18:32:37 -05:00 |
|
Jaime Passos
|
070adb4191
|
Merge remote-tracking branch 'origin/next' into rotsprite2
|
2019-12-26 20:27:29 -03:00 |
|
James R
|
bd472eb353
|
Merge branch 'turnmultiplier' into 'master'
Option to increase the turning speed
See merge request STJr/SRB2!553
|
2019-12-26 18:18:23 -05:00 |
|
James R
|
abdd904ef0
|
Merge branch 'char-damage-fix' into 'next'
Fix Amy and Fang being able to attack other players in MP Special Stages
See merge request STJr/SRB2!558
|
2019-12-26 18:18:10 -05:00 |
|
James R
|
599477061a
|
Merge branch 'gametype-clownery' into 'next'
Custom gametypes
See merge request STJr/SRB2!566
|
2019-12-26 18:08:41 -05:00 |
|
James R
|
2c93621d5c
|
P_PlayerHitsPlayer is too big for inline, and these other functions are getting there
|
2019-12-26 14:59:31 -08:00 |
|
Monster Iestyn
|
3bafa90b7a
|
Fix mixed declaration-and-code compiling error
|
2019-12-26 21:59:09 +00:00 |
|