MascaraSnake
|
1ca25224c2
|
Fix P_SetupLines printing the wrong line number
|
2019-12-28 17:05:04 +01:00 |
|
|
MascaraSnake
|
85de3614cb
|
Standardize P_LoadVertices and P_LoadSidedefs
|
2019-12-28 16:58:48 +01:00 |
|
|
MascaraSnake
|
86d1fb73f4
|
Split P_LoadLineDefs2 into P_ProcessLinedefsWithSidedefs and P_CompressSidedefs
|
2019-12-28 16:49:56 +01:00 |
|
|
MascaraSnake
|
21b7507aee
|
Reorganize and partially rename map loading functions
|
2019-12-28 16:40:35 +01:00 |
|
|
MascaraSnake
|
b1854b5c96
|
Remove stray #endif
|
2019-12-28 14:50:00 +01:00 |
|
|
MascaraSnake
|
5590343043
|
Rename P_LoadThingsOnly to P_RespawnThings to make it clearer that it doesn't actually reload the things from the file, it just respawns them.
|
2019-12-28 14:13:26 +01:00 |
|
|
MascaraSnake
|
3971067cf3
|
Remove some old #if 0'd code
|
2019-12-28 14:03:48 +01:00 |
|
|
MascaraSnake
|
303e6cee4a
|
Merge branch 'next' into mapload-refactor
|
2019-12-28 13:59:24 +01:00 |
|
|
MascaraSnake
|
ceca99e3c5
|
Fix accidental removal of sector_t's spawn_lightlevel initialization
|
2019-12-28 13:58:23 +01:00 |
|
|
MascaraSnake
|
e9376a8353
|
Cleaned up some more stuff in P_LoadLevel()
|
2019-12-28 12:48:32 +01:00 |
|
|
MascaraSnake
|
c059146937
|
Move more P_LoadLevel parts into subfunctions
|
2019-12-28 11:37:56 +01:00 |
|
|
MascaraSnake
|
319ed09c00
|
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
|
08895ef751
|
Fixed/clarified some flag descriptions in the ZB config
|
2019-12-28 08:43:27 +01:00 |
|
|
MascaraSnake
|
f83d0fe3a1
|
Fixed/clarified some flag descriptions in the ZB config
|
2019-12-28 08:42:16 +01:00 |
|
|
Alam Ed Arias
|
94bb6655a5
|
Merge branch 'master' into next
|
2019-12-27 17:08:16 -05:00 |
|
|
James R
|
152a63b682
|
Merge branch 'rotsprite3' into 'next'
More rollangle changes
See merge request STJr/SRB2!582
|
2019-12-27 16:49:21 -05:00 |
|
|
James R
|
69ad41e58e
|
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
|
1fb244d87f
|
GTR_HIDETIME, not GTR_TAG
|
2019-12-27 18:24:08 -03:00 |
|
|
Jaime Passos
|
e03eaa554b
|
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
|
4b2c88fab8
|
Fix CoopLives_OnChange.
|
2019-12-27 17:15:23 -03:00 |
|
|
Jaime Passos
|
3b341245f1
|
Same deal, but for starposts.
|
2019-12-27 17:14:56 -03:00 |
|
|
Jaime Passos
|
1f96f70173
|
Preparing for the inevitable gametype rule that will handle cooplives...
|
2019-12-27 17:08:20 -03:00 |
|
|
Jaime Passos
|
ed29efd9eb
|
ST_drawLivesArea stuff.
|
2019-12-27 16:58:55 -03:00 |
|
|
Alam Ed Arias
|
0caa08defd
|
fread and fwrite use size_t, not int
|
2019-12-27 13:08:26 -05:00 |
|
|
Alam Ed Arias
|
ff004c4cf6
|
we only need link on unix systems
|
2019-12-27 13:05:15 -05:00 |
|
|
Jaime Passos
|
6b8839d5aa
|
burst emeralds with GTR_MATCHEMERALDS
|
2019-12-27 12:34:35 -03:00 |
|
|
Jaime Passos
|
f0d58368f9
|
look for GTR_LIVES rule instead of coop/competition gametype
|
2019-12-27 12:29:21 -03:00 |
|
|
Jaime Passos
|
f8eed7171a
|
add G_CompetitionGametype(void)
|
2019-12-27 12:28:00 -03:00 |
|
|
Jaime Passos
|
5c023739e6
|
change this > to >=
|
2019-12-27 12:23:50 -03:00 |
|
|
Jaime Passos
|
1d0d404922
|
check if the gametype allows spectators to allow jump key respawn
|
2019-12-27 12:17:38 -03:00 |
|
|
Jaime Passos
|
9613bdeca6
|
use GTR_DEATHMATCHSTARTS
|
2019-12-27 12:14:33 -03:00 |
|
|
MascaraSnake
|
45c432462e
|
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
|
e71d07fa8e
|
Merge branch 'next' into kill-zshift
# Conflicts:
# src/p_mobj.c
|
2019-12-27 08:11:04 +01:00 |
|
|
MascaraSnake
|
6a85e40232
|
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
|
56e94182d5
|
P_SetupCamera funny
|
2019-12-27 02:07:13 -03:00 |
|
|
Jaime Passos
|
51404130af
|
Respawn delay gametype rule
|
2019-12-27 01:44:27 -03:00 |
|
|
James R
|
e19d0877e8
|
Merge branch 'time' into 'master'
haha log files
See merge request STJr/SRB2!567
|
2019-12-26 21:43:46 -05:00 |
|
|
Jaime Passos
|
da1718f93c
|
Avoid possible overflows in the rotsprite arrays.
|
2019-12-26 21:49:36 -03:00 |
|
|
Jaime Passos
|
4b653a0b12
|
Remove the min() and max() calls.
|
2019-12-26 21:36:35 -03:00 |
|
|
Jaime Passos
|
56fd29a42a
|
stuff
|
2019-12-26 21:27:30 -03:00 |
|
|
James R
|
1dac3d174e
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-26 15:35:53 -08:00 |
|
|
James R
|
5872e8d453
|
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
|
c0390f5186
|
Merge remote-tracking branch 'origin/next' into rotsprite2
|
2019-12-26 20:27:29 -03:00 |
|
|
James R
|
414a066ec8
|
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
|
aa9cc6e6f2
|
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
|
e6532b9bad
|
Merge branch 'gametype-clownery' into 'next'
Custom gametypes
See merge request STJr/SRB2!566
|
2019-12-26 18:08:41 -05:00 |
|
|
James R
|
dd1ca69f54
|
P_PlayerHitsPlayer is too big for inline, and these other functions are getting there
|
2019-12-26 14:59:31 -08:00 |
|
|
Monster Iestyn
|
ca5a4d90e0
|
Fix mixed declaration-and-code compiling error
|
2019-12-26 21:59:09 +00:00 |
|
|
MascaraSnake
|
b24bcbab65
|
Merge branch 'mobjthinker-refactoring' into 'next'
Hack P_MobjThinker into little pieces
See merge request STJr/SRB2!574
|
2019-12-26 14:59:37 -05:00 |
|
|
MascaraSnake
|
2d90098b6a
|
Use startpos->z instead of startpos->options >> ZSHIFT in F_StartTitleScreen
|
2019-12-26 20:55:29 +01:00 |
|