MascaraSnake
|
b333770a3b
|
Merge branch 'next' into mapload-refactor
|
2019-12-29 09:40:19 +01:00 |
|
MascaraSnake
|
cfadbb0f36
|
-Add linedef pointer to side_t, so sidedefs are able to tell if they're a front or back sidedef during setup
-Fix a broken condition during setup of texture fields for the change music linedef
|
2019-12-29 09:39:50 +01:00 |
|
Zachary McAlpin
|
ef9a7b01f5
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2019-12-28 22:29:10 -06:00 |
|
Steel Titanium
|
0d15f27026
|
Fix emerald hunt not working properly
|
2019-12-28 21:57:29 -05:00 |
|
Alam Ed Arias
|
d588e3ca9c
|
Merge branch 'master' into next
|
2019-12-28 21:43:16 -05:00 |
|
Alam Ed Arias
|
2acb4f9840
|
Revert "Delete the original configuration file."
This reverts commit 2cf94ea6ae .
|
2019-12-28 21:43:10 -05:00 |
|
Alam Ed Arias
|
c27d062cc8
|
Merge branch 'fixmain' into 'master'
Fix logfiles crashing Windoze (resolves #102)
Closes #102
See merge request STJr/SRB2!591
|
2019-12-28 21:15:23 -05:00 |
|
Jaime Passos
|
f997866b4d
|
Fix broken dynlight list because of a SPR_NON2 that doesn't exist
|
2019-12-28 22:57:37 -03:00 |
|
James R
|
0237dc8ca2
|
Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC
|
2019-12-28 17:52:22 -08:00 |
|
Jaime Passos
|
244f0b228f
|
Fix M_PathParts instead
|
2019-12-28 22:18:41 -03:00 |
|
Jaime Passos
|
3bb7fd4cbf
|
Fix logfiles crashing Windoze
|
2019-12-28 22:14:23 -03:00 |
|
Jaime Passos
|
e63f77ea1a
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-28 21:39:38 -03:00 |
|
James R
|
90e56bcdf9
|
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
|
97f1da9c12
|
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
|
dede51fc4c
|
Disallow few more characters.
|
2019-12-28 21:05:42 -03:00 |
|
Jaime Passos
|
5b1b556946
|
Remove characters that will not be allowed in the constant string.
|
2019-12-28 20:54:22 -03:00 |
|
Zachary McAlpin
|
745cced08e
|
Execute LUAh_PlayerThink(player) at the end if the player has a valid mobj_t object
|
2019-12-28 17:40:47 -06:00 |
|
Jaime Passos
|
2166571920
|
Add GTR_CUTSCENES. And I ran out of rule slots. Cool.
|
2019-12-28 20:33:28 -03:00 |
|
Zachary McAlpin
|
5a9b80b5d5
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2019-12-28 17:32:27 -06:00 |
|
Jaime Passos
|
ae0acfba0f
|
Organise gametype ruleset again.
|
2019-12-28 20:18:21 -03:00 |
|
Jaime Passos
|
7a00b3a331
|
Add GTR_FRIENDLY.
|
2019-12-28 19:56:18 -03:00 |
|
Jaime Passos
|
093a1baf1d
|
Remove debugging stuff.
|
2019-12-28 19:50:14 -03:00 |
|
Jaime Passos
|
45af6d8899
|
Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.
|
2019-12-28 19:49:34 -03:00 |
|
Jaime Passos
|
4b604328d5
|
Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.
|
2019-12-28 19:47:03 -03:00 |
|
lachwright
|
5ed1dc5410
|
Remove MF_NOTHINK from join-breaking referenced objects
|
2019-12-29 03:01:09 +08:00 |
|
MascaraSnake
|
bd7765227e
|
Rename P_GroupLines to the more apt P_LinkMapData
|
2019-12-28 17:40:08 +01:00 |
|
MascaraSnake
|
7e5b87ce42
|
Fix debug prints
|
2019-12-28 17:37:32 +01:00 |
|
MascaraSnake
|
d38ee51d49
|
Separate setting of sector field defaults into P_InitializeSector
|
2019-12-28 17:29:58 +01:00 |
|
MascaraSnake
|
54fe91b1cc
|
Refactor P_SetupLines into P_InitializeLinedef
|
2019-12-28 17:21:31 +01:00 |
|
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 |
|
GoldenTails
|
f62579811b
|
Fixed messed up comparison.
|
2019-12-27 23:51:13 -06:00 |
|
James R
|
afc78fb56a
|
Only return if we damaged the monitor
|
2019-12-27 14:48:55 -08: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 |
|