lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8922 commits 1 branch 29 tags 122 MiB
Commit graph

7775 commits

Author SHA1 Message Date
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
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
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
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
Jaime Passos 2166571920 Add GTR_CUTSCENES. And I ran out of rule slots. Cool. 2019-12-28 20:33:28 -03: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
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
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
Monster Iestyn 1d04001fdf use P_SetTarget to assign a value to th->target 2019-12-27 19:24:00 +00:00
Monster Iestyn 282fe7667c added a "target" pointer to polywaypoint_t, so the polyobj waypoint thinker doesn't have to re-find the next waypoint every tic 2019-12-27 19:10:14 +00:00
Alam Ed Arias c394ad056c use size_t to count the sprites 2019-12-27 13:20:58 -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
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
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
Jaime Passos 5ea43aa023 Fix sprite rotation crashes. 2019-12-27 00:37:40 -03:00
James R 855e61f59e Pop monitors properly so Metal doesn't destroy enemy team's monitors 2019-12-26 19:27:25 -08:00
Jaime Passos 96609e45ae OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos 2d3f45de0d Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch 2019-12-26 23:53:03 -03:00
Jaime Passos eca5be52b2 And the sound test 2019-12-26 23:52:42 -03:00
Jaime Passos 956905c8f4 Same deal, but for the level platter and save select screen 2019-12-26 23:49:31 -03:00
James R 76a1a80d71 Save the renderer 2019-12-26 18:44:02 -08: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 644e41d90c Handle character select screen correctly after a renderer switch 2019-12-26 23:39:40 -03:00
James R 7df6a3090a Lua CV_FindVar function 
(cherry picked from commit b5746c231d17cd7b58c6b633e242d5ad26ad7017)
 2019-12-26 18:30:34 -08:00
James R e49d12b731 Expose CV_FindVar 
(cherry picked from commit 0e9d69d6a3759686ca8bb567817be650291ea0e1)
 2019-12-26 18:30:34 -08:00
Jaime Passos e617f35182 PU_PATCH funny 2019-12-26 23:26:43 -03:00
James R 4865a19057 One more optimization 2019-12-26 18:23:01 -08:00
James R 9673439628 e 2019-12-26 18:20:48 -08:00
James R 4959d52ae0 Make cv_renderer CV_NOLUA instead of hidden!!! 2019-12-26 18:15:52 -08:00
James R cb29a9dd0a CV_NOLUA for when a cvar should not be changed via Lua 2019-12-26 18:15:19 -08:00
James R f26bdf00fe A system to encode flags in the command buffer 2019-12-26 18:12:10 -08: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
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
Jaime Passos 69b4efb579 Rename R_WorldSegTextured 2019-12-26 18:13:03 -03:00
Jaime Passos ad6cda7c53 Masked stuff 2019-12-26 17:39:18 -03:00
Jaime Passos 0ec800b266 I forgot a `static` 2019-12-26 17:20:17 -03:00
Jaime Passos 919864d0f3 Thick stuff. Hoping I didn't break anything. 2019-12-26 17:15:30 -03:00
MascaraSnake 2d90098b6a Use startpos->z instead of startpos->options >> ZSHIFT in F_StartTitleScreen 2019-12-26 20:55:29 +01:00
MascaraSnake 7ccb695fa1 Use mthing->z instead of mthing->options >> ZSHIFT in G_AddGhost 2019-12-26 20:54:06 +01:00
MascaraSnake 24e15387b3 Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift 2019-12-26 20:50:48 +01:00
Alam Ed Arias e823441e31 Merge branch 'next' into mobjthinker-refactoring 2019-12-26 14:50:35 -05:00
MascaraSnake f86c5f13ce Use mt->z instead of mt->options >> ZSHIFT in Command_Teleport_f 2019-12-26 20:48:52 +01:00
Alam Ed Arias 61a0197339 Merge branch 'next' into gametype-clownery 2019-12-26 14:48:04 -05:00
Alam Ed Arias 5a5d5a76d4 Merge branch 'next' into kill-zshift 2019-12-26 14:45:18 -05:00
Alam Ed Arias c0d6cd8599 Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift 2019-12-26 14:43:03 -05:00
Jaime Passos 5f1e3bab71 struct time 2019-12-26 16:25:04 -03:00
MascaraSnake 855f5da6c9 Make P_RespawnSpecials call P_SpawnMapThing instead of trying to do everything itself 2019-12-26 20:13:56 +01:00
Sally Cochenour a1d944fc4d Fix scoreadd not doing anything when modified by Lua 
This does not change any vanilla behavior, as scoreadd is reset constantly on the ground anyway -- this simply makes the behavior modifiable for Lua scripts.
 2019-12-26 14:02:02 -05:00
Jaime Passos 4e0a7030ca Move all the thick/masked/splat stuff to the end of the file 2019-12-26 15:34:33 -03:00
Jaime Passos e09838224e ifdef this right so it works like before without the define 2019-12-26 15:27:16 -03:00
Alam Ed Arias e8431e168a Merge branch 'next' into kill-zshift 2019-12-26 12:49:04 -05:00
Alam Ed Arias 4906cd4331 ISO C90 fixup 2019-12-26 12:44:47 -05:00
Alam Ed Arias 0a873d857d Merge branch 'next' into lua-damage-hooks-hotfix 2019-12-26 12:41:02 -05:00
Alam Ed Arias 50379dac85 cleanup buildbot error 2019-12-26 12:27:15 -05:00
Jaime Passos 649455c2d0 R_CalculateSegDistance stuff... 2019-12-26 01:58:38 -03:00
James R 6bd383621e More fine tuned versioning 
You get a PACKETVERSION, for when some packets change format.

You get SRB2APPLICATION, for when you have big fucking mod.
 2019-12-25 20:52:02 -08:00
Jaime Passos 69e9784085 Something in R_RenderSegLoop I thought looked off... 2019-12-26 00:55:34 -03:00
Jaime Passos 6f5a259983 Tame R_StoreWallRange 2019-12-26 00:07:04 -03:00
James R 70f08007eb Correct the check for rings on thing 604 - 607 
The original code used a switch case, not AND 1. :V
 2019-12-25 15:23:19 -08:00
Monster Iestyn 5241030012 Fix ShouldDamage, MobjDamage and MobjDeath hooks all messing up the pushing of variables to Lua as function args, by adding damagetype support where it was missing! 
The above issue occured only if you had both a generic hook and a type specific hook for a particular hook type. This way, the stack is never updated to include damagetype at the start, and all pushes of the variables get offsetted by 1 compared to what they should be, once the code *expects* damagetype to be included in it.
 2019-12-25 21:48:59 +00:00
Nev3r 9b89ed92f5 Merge branch 'tokentweaks' into 'next' 
Slight touchups on the tokenizer

See merge request STJr/SRB2!569
 2019-12-25 06:22:11 -05:00
Nev3r a932b54b26 Merge branch 'mapdataload_refactor' into 'next' 
Mapdataload refactor

See merge request STJr/SRB2!568
 2019-12-25 06:21:49 -05:00
Nev3r c4a017ddf0 Move flat caching code to the map data load function. 2019-12-25 12:05:40 +01:00
MascaraSnake de7575416a P_FlagFuseThink: Use mt->z instead of mt->options >> ZSHIFT 2019-12-25 11:17:57 +01:00
MascaraSnake f4c6068ab1 P_MovePlayerToSpawn: Use mthing->z instead of mthing->options >> ZSHIFT 2019-12-25 10:59:12 +01:00
Jaime Passos 7e5ec552ee Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-25 06:09:00 -03:00
MascaraSnake 12d30b7acc Use mthing->z instead of mthing->options >> ZSHIFT in particle generator setup 2019-12-25 09:46:09 +01:00
Jaime Passos 03a3b02301 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
MascaraSnake 32ef930c04 Get rid of a few mt->options >> ZSHIFT usages in objectplace 2019-12-25 09:40:08 +01:00
MascaraSnake b9a276f5aa Make slope vertices use mt->z directly instead of mt->options >> ZSHIFT 2019-12-25 09:10:20 +01:00
MascaraSnake f11caefed7 Merge branch 'spawnhoopsandrings_refactor' into 'next' 
Hack P_SpawnHoopsAndRings into little pieces

See merge request STJr/SRB2!572
 2019-12-25 03:00:07 -05:00
MascaraSnake 64df10f7be P_MobjThinker: Separate fuse handling into its own function 2019-12-25 00:36:24 +01:00
Steel Titanium f0ef4e3193 Fix edge case with R_SkinUsable 2019-12-24 18:31:47 -05:00
MascaraSnake 6032aa3cd1 P_MobjThinker: Separate MF2_FIRING handling into its own function 2019-12-25 00:18:12 +01:00
MascaraSnake 5d89e915c6 Continue cutting up P_MobjThinker into multiple functions 2019-12-25 00:14:53 +01:00
Steel Titanium 8d8e0ca22c Clean up comment 2019-12-24 17:45:57 -05:00
Steel Titanium b49672e3f9 Change this condition a bit 2019-12-24 17:44:06 -05:00
Steel Titanium 2f83c2977e Merge branch 'next' into char-damage-fix 2019-12-24 17:08:23 -05:00
Jaime Passos 3622829504 Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery 2019-12-24 17:55:46 -03:00
MascaraSnake ddccfbd73d P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions 2019-12-24 21:07:55 +01:00
GoldenTails 25f8f2706b Also cap dashspeed to at most maxdash. 2019-12-24 13:55:19 -06:00
James R 02779cb6ef Merge remote-tracking branch 'origin/master' into next 2019-12-24 11:53:49 -08:00
James R 0780e48f86 Merge branch 'titlecard2' into 'next' 
More customisable title card

See merge request STJr/SRB2!552
 2019-12-24 14:47:55 -05:00
James R 75a5142aad Merge branch 'wipes2' into 'master' 
Wipe styles cleanup

See merge request STJr/SRB2!525
 2019-12-24 14:47:14 -05:00
James R f077413f31 Merge branch 'soc-srb2-fix' into 'master' 
The "SRB2" directive, for warning if a SOC isn't compatible

See merge request STJr/SRB2!551
 2019-12-24 14:44:55 -05:00
James R e0a20a733c Merge branch 'gl_gifs' into 'master' 
OpenGL GIF movie recording

See merge request STJr/SRB2!549
 2019-12-24 14:44:44 -05:00
James R 3f339384c8 Merge branch 'hwrtexfix' into 'master' 
Fix model texture blending

See merge request STJr/SRB2!546
 2019-12-24 14:44:19 -05:00
James R 1df31f2e98 Merge branch 'soundtest-fix' into 'master' 
Init MUSICDEFs regardless of music state

See merge request STJr/SRB2!532
 2019-12-24 14:44:08 -05:00
James R be063c454a Fix NOPNG compiling 2019-12-24 11:37:37 -08:00
Jaime Passos c61c1e2514 Turn the babysitting deterrent into its own rule. 2019-12-24 16:30:18 -03:00
Jaime Passos 9319014d8d Title card fixes. 2019-12-24 16:22:25 -03:00
James R 9d28351b5c I'm an idiot 2019-12-24 11:14:21 -08:00
Jaime Passos 5b4d587b1a Don't warn about missing CTF starts if the gametype doesn't have team flags. 2019-12-24 16:12:05 -03:00
Jaime Passos b740daf5bf GTR_HURTMESSAGES 2019-12-24 16:09:00 -03:00
James R d1f12347cc Merge remote-tracking branch 'origin/master' into time 2019-12-24 11:02:31 -08:00
MascaraSnake 0aa3c9b0a3 Fixed missing break in offset handling for horizontal springs 2019-12-24 13:01:17 +01:00
MascaraSnake 13eb71e1ee Fixed missing break in offset handling for horizontal springs 2019-12-24 12:58:12 +01:00
MascaraSnake a57f903933 Move bonus time handling into new function P_SetBonusTime() 2019-12-24 12:52:43 +01:00
MascaraSnake ac3a57aaf5 Allow P_SpawnItemRow to spawn different item types in the same row 2019-12-24 12:47:44 +01:00
MascaraSnake 72a1571937 Allow P_SpawnItemCircle to spawn arbitrary mobjtypes (will be used in UDMF) 2019-12-24 12:38:16 +01:00
MascaraSnake 2dac47a54c Allow P_SpawnItemRow to spawn arbitrary mobjtypes (will be used in UDMF) 2019-12-24 12:19:13 +01:00
James R b7b4945c36 Correct usage of logdir 2019-12-24 01:59:05 -08:00
James R f2c2836301 Overwrite an already existing symlink 2019-12-24 01:55:47 -08:00
MascaraSnake dd01fce1a8 Separate P_SpawnHoopsAndRings into different functions: 
-Hoops are spawned in P_SpawnHoop
-Item patterns are spawned in P_SpawnItemPattern
-Ring-like items are spawned normally via P_SpawnMapThing
-Bonus time items are spawned via P_SpawnBonusTimeItem, which is a wrapper for P_SpawnMapThing
 2019-12-24 10:50:49 +01:00
Nev3r 36996c8c91 Treat strings inside ""s as a single token. 2019-12-24 10:27:23 +01:00
Nev3r ce3f526a5e Ignore '=' and ';' when tokenizing, for textmap reading's sake. 2019-12-24 10:25:38 +01:00
James R 9defd997c3 Merge branch 'fixsignalhandler' into 'master' 
Handle signals correctly on linux

See merge request STJr/SRB2!530
 2019-12-24 02:54:44 -05:00
MascaraSnake 04a56120d4 Merge branch 'spawnmapthing-refactor' into 'next' 
Hack P_SpawnMapThing into tiny little pieces

See merge request STJr/SRB2!564
 2019-12-24 01:59:36 -05:00
Jaime Passos d76c4eaba8 Fix Lua HUD library crashes. 2019-12-24 00:14:25 -03:00
James R 25525a6aae symlink latest-log.txt on nix, copy to the real log file everywhere else 2019-12-23 18:20:04 -08:00
Jaime Passos 40b0c853b7 Add IDENTIFIER to gametype DeHackEd. 2019-12-23 23:19:48 -03:00
Jaime Passos 89b4a558a8 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-23 23:08:16 -03:00
James R 98cb238d36 Create directories from -logfile too 2019-12-23 17:43:42 -08:00
James R 5fbe77cdda Let an asbolute path work with -logfile 2019-12-23 17:40:43 -08:00
James R 457e986b75 -logdir lets the user change the log directory 2019-12-23 17:21:58 -08:00
James R c285000c56 Change default log filename to not use a space 
bleh
 2019-12-23 15:34:27 -08:00
James R d9d13764e6 -logfile to let the user change the log file name 2019-12-23 15:31:50 -08:00
Jaime Passos a657392d39 ViewpointSwitch improvements. 2019-12-23 20:22:57 -03:00
MascaraSnake ffd6cf4aca Replaced functions for spawning premade rows of rings with a function for spawning a generic row of rings (groundwork for UDMF) 2019-12-24 00:10:29 +01:00
Jaime Passos 630c06b7b0 Turn GTR_CHASECAM into GTR_FIRSTPERSON. 2019-12-23 19:24:06 -03:00
Jaime Passos bb1f43d374 Add gametyperules to LUA_CheckGlobals. 2019-12-23 19:16:10 -03:00
Jaime Passos e9f69b9c6a Add sstimer to LUA_PushGlobals. 2019-12-23 19:08:57 -03:00
Jaime Passos bbe946ac1e Bail out earlier. 2019-12-23 19:00:46 -03:00
MascaraSnake 50dd0a71db Turn size and number of items for item circle into function parameters (in preparation for UDMF) 2019-12-23 22:58:58 +01:00
Jaime Passos d050e04dae Bail out if there are no more free gametype slots. 2019-12-23 18:58:33 -03:00
Jaime Passos edddc3e64e Custom gametype constant support for Lua. 2019-12-23 18:54:25 -03:00
Jaime Passos 5ebd84c3e7 Move ALL the Lua global variable stuff into lua_script.c. 2019-12-23 18:49:23 -03:00
Jaime Passos 7425591815 Add pointlimit and timelimit to Lua. 2019-12-23 18:37:38 -03:00
Jaime Passos d0f7877fd0 Turn noglobals into setglobals, move the extra global variable handling to gamestateglobals. 2019-12-23 18:33:39 -03:00
Jaime Passos 61b72203a8 Merge remote-tracking branch 'origin/master' into gametype-clownery 2019-12-23 18:21:13 -03:00
MascaraSnake 6939da0164 Turned nightsreplace into a macro so we have don't have to keep dragging it along as a function parameter 2019-12-23 21:35:03 +01:00
MascaraSnake 24f8d4ef51 Made a mapthing-independent version of P_GetMobjSpawnHeight so P_SpawnHoopsAndRings subfunctions can use it instead of duplicating code. 2019-12-23 21:17:12 +01:00
GoldenTails a5a8d0c77b Cap dashspeed to at least mindash before revving. 2019-12-23 14:01:37 -06:00
MascaraSnake 2b3922a8f3 Set mthing->mobj before the flags handling code, since at this point the setup can't fail anymore 2019-12-23 20:12:45 +01:00
MascaraSnake 6fc325f3d2 Merge branch 'netarchive_compare_changes' into 'next' 
Netarchive compare changes

See merge request STJr/SRB2!563
 2019-12-23 13:57:49 -05:00
MascaraSnake eab5f8c851 P_SpawnMapThing(): Separate handling of MTF_AMBUSH and MTF_OBJECTSPECIAL in its own functions 2019-12-23 19:08:40 +01:00
MascaraSnake e382c2e094 P_SpawnMapThing(): Separated the giant post-Lua hook switch-case statement into its own function, and separated some of the larger cases into their own function as well 2019-12-23 18:59:11 +01:00
MascaraSnake 8ddd078b20 P_MapThingSpawn(): Move early returning/substitution code into their own functions 2019-12-23 17:28:21 +01:00
MascaraSnake e90eb9a5e7 Move P_GetMobjtype above first use 2019-12-23 16:54:26 +01:00
MascaraSnake 6a69aa4ffa Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function 2019-12-23 16:53:45 +01:00
Nev3r 9a9f72f598 Don't reload mapthings in P_LoadThingsOnly() as they should no longer be modified past the mapload procedure. 2019-12-23 16:37:44 +01:00
Nev3r d6a86c37b2 P_PrepareRawThings() is now where it was supposed to be at; moved save and flat & texture caching related functions to the end of P_LoadMapData(). 2019-12-23 16:36:26 +01:00
Jaime Passos 6779c508e7 Satisfy rollangle table with a 3deg angle 2019-12-23 12:19:05 -03:00
MascaraSnake 112b15cca2 Add P_GetMobjtype for finding the mobjtype for a given mapthingnum 2019-12-23 14:45:43 +01:00