Alam Ed Arias
|
1785b8149e
|
Merge branch 'master' into next
|
2019-12-28 21:43:16 -05:00 |
|
Alam Ed Arias
|
efad84a2d5
|
Revert "Delete the original configuration file."
This reverts commit 196e76cece.
|
2019-12-28 21:43:10 -05:00 |
|
Alam Ed Arias
|
bdccabe6a7
|
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 |
|
James R
|
31b03fadcd
|
Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC
|
2019-12-28 17:52:22 -08:00 |
|
Jaime Passos
|
ce138d67dc
|
Fix M_PathParts instead
|
2019-12-28 22:18:41 -03:00 |
|
Jaime Passos
|
ccbe29e5ab
|
Fix logfiles crashing Windoze
|
2019-12-28 22:14:23 -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 |
|
lachwright
|
65c5f7f571
|
Remove MF_NOTHINK from join-breaking referenced objects
|
2019-12-29 03:01:09 +08:00 |
|
MascaraSnake
|
411b1e17d9
|
Rename P_GroupLines to the more apt P_LinkMapData
|
2019-12-28 17:40:08 +01:00 |
|
MascaraSnake
|
ea402eea09
|
Fix debug prints
|
2019-12-28 17:37:32 +01:00 |
|
MascaraSnake
|
40d45d9221
|
Separate setting of sector field defaults into P_InitializeSector
|
2019-12-28 17:29:58 +01:00 |
|
MascaraSnake
|
f06184b466
|
Refactor P_SetupLines into P_InitializeLinedef
|
2019-12-28 17:21:31 +01:00 |
|
MascaraSnake
|
532a1bbfb7
|
Fix P_SetupLines printing the wrong line number
|
2019-12-28 17:05:04 +01:00 |
|
MascaraSnake
|
8646f6061c
|
Standardize P_LoadVertices and P_LoadSidedefs
|
2019-12-28 16:58:48 +01:00 |
|
MascaraSnake
|
06bcb74b37
|
Split P_LoadLineDefs2 into P_ProcessLinedefsWithSidedefs and P_CompressSidedefs
|
2019-12-28 16:49:56 +01:00 |
|
MascaraSnake
|
04dcc177ea
|
Reorganize and partially rename map loading functions
|
2019-12-28 16:40:35 +01:00 |
|
MascaraSnake
|
45359f830b
|
Remove stray #endif
|
2019-12-28 14:50:00 +01:00 |
|
MascaraSnake
|
af85de53d7
|
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
|
d085296cbe
|
Remove some old #if 0'd code
|
2019-12-28 14:03:48 +01:00 |
|
MascaraSnake
|
9e72dcddb6
|
Merge branch 'next' into mapload-refactor
|
2019-12-28 13:59:24 +01: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 |
|
MascaraSnake
|
d182000223
|
Fixed/clarified some flag descriptions in the ZB config
|
2019-12-28 08:42:16 +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 |
|
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 |
|
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
|
82d21224cf
|
Merge branch 'next' into kill-zshift
# Conflicts:
# src/p_mobj.c
|
2019-12-27 08:11:04 +01: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 |
|
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 |
|
MascaraSnake
|
29e78d161a
|
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
|
f342610413
|
Use startpos->z instead of startpos->options >> ZSHIFT in F_StartTitleScreen
|
2019-12-26 20:55:29 +01:00 |
|
MascaraSnake
|
b1a43c7c4a
|
Use mthing->z instead of mthing->options >> ZSHIFT in G_AddGhost
|
2019-12-26 20:54:06 +01:00 |
|