Nev3r
|
dbf2b9c0f0
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
# Conflicts:
# src/p_floor.c
# src/p_mobj.c
# src/p_spec.c
# src/r_segs.c
|
2020-04-25 10:47:45 +02:00 |
|
MascaraSnake
|
dbebcc8466
|
Remove a line I overlooked in the thinker cleanup branch
|
2020-04-25 08:18:48 +02:00 |
|
Monster Iestyn
|
f26e8f3df7
|
Merge branch 'thinker-cleanup' into 'next'
Plane movement thinker cleanup
See merge request STJr/SRB2!880
|
2020-04-24 14:30:52 -04:00 |
|
Monster Iestyn
|
da9a53daca
|
Merge branch 'crumbling-sink' into 'next'
Sync crumblestate in netgames
See merge request STJr/SRB2!890
|
2020-04-24 12:53:14 -04:00 |
|
Monster Iestyn
|
db9c14702d
|
These are flags! Serves me right for just rushing this out
|
2020-04-24 16:53:54 +01:00 |
|
Monster Iestyn
|
d1e49fa926
|
Sync crumblestate in netgames
|
2020-04-24 16:40:09 +01:00 |
|
Monster Iestyn
|
8fb68b025f
|
Merge branch 'uh-oh-spriteinfo' into 'next'
Fix minor issue with lua spriteinfo
See merge request STJr/SRB2!872
|
2020-04-23 16:12:55 -04:00 |
|
Monster Iestyn
|
20ec3f6c89
|
Merge branch 'emeraldspawnfix' into 'next'
Fix emerald hunt not working properly, part 2
See merge request STJr/SRB2!887
|
2020-04-23 15:41:27 -04:00 |
|
Monster Iestyn
|
e78a2fa297
|
Merge branch 'master' into next
|
2020-04-23 18:49:53 +01:00 |
|
LJ Sonic
|
c7f8791894
|
Merge branch 'long-names' into 'next'
Enable entry searching functions to retrieve entry names longer than 8 characters
See merge request STJr/SRB2!885
|
2020-04-23 04:40:33 -04:00 |
|
sphere
|
7955c96fa1
|
Restore carelessly removed const keywords.
|
2020-04-22 23:38:10 +02:00 |
|
sphere
|
d5863b912f
|
Move variable declarations outside of for loops.
|
2020-04-22 23:17:18 +02:00 |
|
sphere
|
13c47b9e6f
|
Fix variable-length array definition, just in case.
|
2020-04-22 23:10:43 +02:00 |
|
sphere
|
b3b7ffb889
|
Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle.
|
2020-04-22 22:46:12 +02:00 |
|
sphere
|
d7185516f5
|
Fix a mistake with P_SpawnEmeraldHunt and make it more concise.
|
2020-04-22 20:38:58 +02:00 |
|
sphere
|
0868930d3b
|
Make emerald hunt shards spawn at correct heights, and add Float option.
|
2020-04-22 18:58:40 +02:00 |
|
Nev3r
|
96f6800ec3
|
Merge branch 'udmf-thingargs' into udmf-multitag
# Conflicts:
# src/doomdata.h
# src/lua_mobjlib.c
# src/p_setup.c
|
2020-04-22 10:54:27 +02:00 |
|
Nev3r
|
3c6ad3a9a8
|
Merge branch 'udmf-next' into udmf-multitag
# Conflicts:
# src/doomdata.h
# src/p_setup.c
|
2020-04-22 09:11:17 +02:00 |
|
Nev3r
|
3d6d767bce
|
Initialize pitch and roll on textmap mapthings too.
|
2020-04-22 09:00:29 +02:00 |
|
Nev3r
|
fbb2450133
|
Merge branch 'udmf-next' into udmf-thingargs
# Conflicts:
# src/p_setup.c
|
2020-04-22 08:58:40 +02:00 |
|
Nev3r
|
3358413479
|
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
|
0368c7b4bd
|
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 |
|
Louis-Antoine
|
74fd37fa38
|
Let W_CheckNumForName(Pwad) find entries with long names
|
2020-04-21 11:08:18 +02:00 |
|
Louis-Antoine
|
90ebe18c5a
|
Add a longname field to lumpinfo_t
|
2020-04-21 10:21:41 +02:00 |
|
Louis-Antoine
|
74e8d7f733
|
Rename lumpinfo_t.name2 to lumpinfo_t.fullname
|
2020-04-20 23:40:41 +02:00 |
|
Nev3r
|
d0340c864f
|
Merge branch 'udmf-next' into udmf-multitag
|
2020-04-20 09:05:55 +02:00 |
|
Nev3r
|
2d15e953eb
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-04-20 09:05:21 +02:00 |
|
James R
|
1d2d5266ab
|
Merge branch 'flipfuncpointers-master' into 'master'
Flipfuncpointers (take two)
See merge request STJr/SRB2!864
|
2020-04-19 18:23:56 -04:00 |
|
Nev3r
|
ccb8e7a7c6
|
Use fixed_t on the mapthing scale for the sake of coherence.
|
2020-04-19 18:34:00 +02:00 |
|
Nev3r
|
1ebfeb3be6
|
Add mapthing pitch/roll Lua access as well.
|
2020-04-19 17:19:04 +02:00 |
|
Nev3r
|
9eb5fe954d
|
Add missed pitch and roll to precipmobj_t
|
2020-04-19 16:05:08 +02:00 |
|
Nev3r
|
c00f995b7f
|
Move the scale setting code behind the MapthingSpawn hook.
|
2020-04-19 16:00:57 +02:00 |
|
Nev3r
|
f55f425d1a
|
Add Lua support.
|
2020-04-19 15:56:06 +02:00 |
|
Nev3r
|
5632120a74
|
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
|
da165d2d22
|
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
|
2020-04-19 14:51:55 +02:00 |
|
Nev3r
|
a11f94e45b
|
Fix cage issue with boss 4.
|
2020-04-19 13:13:53 +02:00 |
|
Nev3r
|
630e8f27a1
|
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
|
268a66a55a
|
Fix an outrageous typo which didn't get pushed for some reason.
|
2020-04-19 12:23:51 +02:00 |
|
Nev3r
|
57b12f4592
|
Taggroups are now sorted when a new entry is added.
|
2020-04-19 12:21:22 +02:00 |
|
James R
|
28b1e8de1c
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-18 17:20:33 -07:00 |
|
James R
|
01da59fe02
|
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
|
a7291a2ad4
|
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
|
7e981edfcc
|
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
|
a891b1126b
|
Merge branch 'netgame-urls' into 'master'
srb2:// server URLs
See merge request STJr/SRB2!858
|
2020-04-18 20:11:00 -04:00 |
|
MascaraSnake
|
c1dff185bf
|
Add enums to encapsulate the textmap colormap settings
|
2020-04-18 17:15:25 +02:00 |
|
MascaraSnake
|
7978920b53
|
Merge branch 'udmf-next' into udmf-argenums
|
2020-04-18 16:56:21 +02:00 |
|
MascaraSnake
|
6abc3da5de
|
Add enums to encapsulate the textmap slope settings
|
2020-04-18 16:55:56 +02:00 |
|
MascaraSnake
|
548f4a1594
|
Enable SF_TRIGGERSPECIAL_TOUCH for sectors with spike damage
|
2020-04-18 15:17:25 +02:00 |
|
Nev3r
|
c6cc863a3a
|
Merge branch 'udmf-next' into udmf-multitag
# Conflicts:
# src/p_spec.c
|
2020-04-18 14:04:15 +02:00 |
|
Nev3r
|
109d09aa4c
|
Merge branch 'udmf-colormaps' into 'udmf-next'
UDMF colormaps
See merge request STJr/SRB2!855
|
2020-04-18 07:42:24 -04:00 |
|