Commit Graph

9909 Commits

Author SHA1 Message Date
Nev3r 188ad67c58 Merge branch 'udmf-next' into udmf-thingargs
# Conflicts:
#	src/p_setup.c
2020-04-22 08:58:40 +02:00
Nev3r 3d9d9d74f6 Merge branch 'udmf-pitch-and-roll' into 'udmf-next'
Add textmap pitch and roll parsing, and mobj pitch and roll variables.

See merge request STJr/SRB2!882
2020-04-21 12:27:26 -04:00
Nev3r f4c2d70c7e Merge branch 'udmf-mthingscale' into 'udmf-next'
Add mapthing scale support

See merge request STJr/SRB2!883
2020-04-21 12:26:46 -04:00
Nev3r efb81fc526 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-20 09:05:21 +02:00
Nev3r 1e4eab77a6 Use fixed_t on the mapthing scale for the sake of coherence. 2020-04-19 18:34:00 +02:00
Nev3r aa98eb5a4c Add mapthing pitch/roll Lua access as well. 2020-04-19 17:19:04 +02:00
Nev3r 0147320ff4 Add missed pitch and roll to precipmobj_t 2020-04-19 16:05:08 +02:00
Nev3r beb42c9499 Move the scale setting code behind the MapthingSpawn hook. 2020-04-19 16:00:57 +02:00
Nev3r 67acb6e498 Add Lua support. 2020-04-19 15:56:06 +02:00
Nev3r 7cf08e1a08 Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike. 2020-04-19 15:18:36 +02:00
Nev3r ca10b38b9c Add textmap pitch and roll parsing, and mobj pitch and roll variables. 2020-04-19 14:51:55 +02:00
Nev3r 197d4e405d Merge branch 'udmf-argenums' into 'udmf-next'
No more magic numbers for linedef arg values in UDMF

See merge request STJr/SRB2!881
2020-04-19 07:06:32 -04:00
Nev3r cde14c1d9f Fix an outrageous typo which didn't get pushed for some reason. 2020-04-19 12:23:51 +02:00
James R 536fb1ef2a Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
James R cbe181c66d Merge branch 'angle-for-spawn-object' into 'next'
Make the Spawn Object linedef executor able to set the object's angle.

See merge request STJr/SRB2!877
2020-04-18 20:16:07 -04:00
James R b11845b045 Merge branch 'packetversion-revision' into 'master'
The rule for PACKETVERSION is too confusing, it's also too hard to unify formats

See merge request STJr/SRB2!875
2020-04-18 20:15:23 -04:00
James R abb338d650 Merge branch 'continue_tweaks' into 'next'
A tangible mechanism to disable Continues

See merge request STJr/SRB2!865
2020-04-18 20:15:04 -04:00
James R 40ec8c4344 Merge branch 'netgame-urls' into 'master'
srb2:// server URLs

See merge request STJr/SRB2!858
2020-04-18 20:11:00 -04:00
MascaraSnake 09506112d7 Add enums to encapsulate the textmap colormap settings 2020-04-18 17:15:25 +02:00
MascaraSnake f0c63ce76a Merge branch 'udmf-next' into udmf-argenums 2020-04-18 16:56:21 +02:00
MascaraSnake 111da04b07 Add enums to encapsulate the textmap slope settings 2020-04-18 16:55:56 +02:00
Nev3r 2b2a18fdf1 Merge branch 'udmf-colormaps' into 'udmf-next'
UDMF colormaps

See merge request STJr/SRB2!855
2020-04-18 07:42:24 -04:00
MascaraSnake 2a300bcea4 Fix NULL pointer crash involving stringargs 2020-04-18 12:23:01 +02:00
Nev3r d40713d08b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-14 22:20:54 +02:00
Nev3r 464ecc01a4 Merge branch 't_moveplane-refactor' into 'next'
Remove faulty code from T_MovePlane()

See merge request STJr/SRB2!876
2020-04-14 05:53:59 -04:00
Nev3r caea71b68b Merge branch 'remove-bridge' into 'next'
Remove the disabled/broken bridge thinker code

See merge request STJr/SRB2!879
2020-04-14 05:51:45 -04:00
Nev3r 98481dc10b Remove the bridge thinker entry from the ZB configuration. 2020-04-14 10:31:26 +02:00
Nev3r 778ef86fee Remove the bridge thinker code. 2020-04-14 10:31:07 +02:00
sphere 01b28b66a6 Make linedef type 461 able to set object angle, using the line's angle. 2020-04-13 17:10:25 +02:00
Nev3r 01c0797ba6 Remove now unused P_MobjReadyToMove(). 2020-04-13 16:00:58 +02:00
Nev3r 74bd23c275 Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose. 2020-04-13 15:17:53 +02:00
Nev3r 711c35970c Refactor an unholy piece of code. 2020-04-13 14:31:19 +02:00
Nev3r 5e20e9e27e Fix typo involving the stringargs exposure. 2020-04-13 10:21:32 +02:00
James R 4214397679 Make the PACKETVERSION rule easier 2020-04-12 17:05:18 -07:00
Nev3r ca694c8c43 Merge branch 'udmf-next' into udmf-thingargs 2020-04-12 10:02:12 +02:00
Nev3r 4128f826b7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
#	src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
Nev3r 21de33bd08 Add mapthing arg support. 2020-04-11 12:54:34 +02:00
fickleheart be07a23e52 Make a separate function instead of clogging up IdentifyVersion 2020-04-09 20:56:27 -05:00
fickleheart 6845aca6e5 Make chdir usage consistent with other source usage 2020-04-09 20:52:23 -05:00
fickleheart 614449298e Merge remote-tracking branch 'upstream/master' into netgame-urls 2020-04-09 20:48:52 -05:00
James R d460e1e826 Merge branch 'pk3-xtra-comm-fix' into 'next'
PK3: Proper ignorance for file comments/extra data

See merge request STJr/SRB2!761
2020-04-09 21:25:11 -04:00
James R efe74cfd8f Merge branch 'md2-rollangle' into 'master'
Fix MD2 rollangle in reverse gravity

See merge request STJr/SRB2!818
2020-04-09 21:25:02 -04:00
James R 0313213c59 Merge branch 'hw-horizon' into 'master'
OGL horizon lines

See merge request STJr/SRB2!861
2020-04-09 21:24:41 -04:00
James R e457b71e7e Merge branch 'execcfg-fixes' into 'master'
ExecCfg fixes

See merge request STJr/SRB2!821
2020-04-09 21:24:12 -04:00
James R aca39d6210 Merge remote-tracking branch 'origin/master' into next 2020-04-09 17:04:04 -07:00
James R b029ccff0d Merge branch 'hide-useless-1p-menu-options' into 'master'
Hide record & NiGHTS attack options if there are no available maps for them.

See merge request STJr/SRB2!868
2020-04-09 19:57:27 -04:00
James R 40a74a6211 Merge branch 'ra-emblemhints' into 'master'
Allow emblem hints (and radar) in record attack.

See merge request STJr/SRB2!820
2020-04-09 19:56:17 -04:00
James R 5f7bd9a947 Merge branch 'fix-256-brightness' into 'master'
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.

See merge request STJr/SRB2!840
2020-04-09 19:53:40 -04:00
James R 2fda89f1c3 Merge branch 'bot-respawn-hook' into 'next'
BotRespawn hook

See merge request STJr/SRB2!804
2020-04-09 19:52:25 -04:00
James R bd7d05fdf0 Merge branch 'gtr-replace' into 'next'
Separate PvP damage from ringslinger

See merge request STJr/SRB2!831
2020-04-09 19:51:52 -04:00