stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 03:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
8722 commits 172 branches 41 tags 284 MiB
Commit graph

8722 commits

This branch
This branch
All branches
Author SHA1 Message Date
MascaraSnake
abdfe60aa7 Store custom FOF flags directly in back toptexture field at map load instead of re-reading the sidedefs data later on 2019-12-29 12:01:41 +01:00
James R
e04e1ac1b4 Merge branch 'mfe-lua' into 'next' 
Add missing MFE_ flags to Lua (resolves #103)

See merge request STJr/SRB2!592
 2019-12-29 04:44:29 -05:00
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
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
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
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
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
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
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
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
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