MascaraSnake
|
607aeb3a52
|
Adapt setup of air bobbing FOFs
|
2020-04-27 10:29:29 +02:00 |
|
MascaraSnake
|
e00531ed9c
|
Merge branch 'udmf-next' into udmf-fofs-mkii
# Conflicts:
# src/p_floor.c
# src/p_spec.c
# src/p_spec.h
|
2020-04-26 11:13:09 +02:00 |
|
MascaraSnake
|
b439fa2b99
|
Uh-oh! Forgot to stash a file
|
2020-04-26 10:37:31 +02:00 |
|
MascaraSnake
|
abcc47ac61
|
Bring signature of P_AddAirbob in line with next
|
2020-04-26 10:35:08 +02:00 |
|
MascaraSnake
|
1aa90754db
|
Port over raise thinker changes from next (preparation for merge)
|
2020-04-26 10:33:13 +02:00 |
|
MascaraSnake
|
0ab01cd4b2
|
Port over thwomp thinker changes manually, to avoid merge conflicts
|
2020-04-25 09:20:53 +02:00 |
|
MascaraSnake
|
04c10ed41b
|
Merge branch 'next' into udmf-next
|
2020-04-25 08:19:26 +02:00 |
|
MascaraSnake
|
3cd8f62ae9
|
Remove a line I overlooked in the thinker cleanup branch
|
2020-04-25 08:18:48 +02:00 |
|
MascaraSnake
|
3170f2b8c3
|
Merge branch 'next' into udmf-next
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
|
2020-04-24 21:15:53 +02:00 |
|
Monster Iestyn
|
d1d006a1a7
|
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
|
eaeb9358a3
|
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
|
9df5d6e1e0
|
These are flags! Serves me right for just rushing this out
|
2020-04-24 16:53:54 +01:00 |
|
Monster Iestyn
|
2419b65f79
|
Sync crumblestate in netgames
|
2020-04-24 16:40:09 +01:00 |
|
Monster Iestyn
|
bfb2467796
|
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
|
4ef8093e92
|
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
|
a71fe6445a
|
Merge branch 'master' into next
|
2020-04-23 18:49:53 +01:00 |
|
LJ Sonic
|
5e440e79cc
|
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
|
67f511a55e
|
Restore carelessly removed const keywords.
|
2020-04-22 23:38:10 +02:00 |
|
sphere
|
f85bfc87f5
|
Move variable declarations outside of for loops.
|
2020-04-22 23:17:18 +02:00 |
|
sphere
|
e26788d014
|
Fix variable-length array definition, just in case.
|
2020-04-22 23:10:43 +02:00 |
|
sphere
|
01a1297631
|
Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle.
|
2020-04-22 22:46:12 +02:00 |
|
sphere
|
b254cb186b
|
Fix a mistake with P_SpawnEmeraldHunt and make it more concise.
|
2020-04-22 20:38:58 +02:00 |
|
sphere
|
25affe6948
|
Make emerald hunt shards spawn at correct heights, and add Float option.
|
2020-04-22 18:58:40 +02:00 |
|
Nev3r
|
a3c9009389
|
Merge branch 'udmf-thingargs' into 'udmf-next'
Add mapthing arg support.
See merge request STJr/SRB2!874
|
2020-04-22 03:07:34 -04:00 |
|
Nev3r
|
1afb0eb79f
|
Initialize pitch and roll on textmap mapthings too.
|
2020-04-22 09:00:29 +02:00 |
|
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 |
|
Louis-Antoine
|
0ddd2fea21
|
Let W_CheckNumForName(Pwad) find entries with long names
|
2020-04-21 11:08:18 +02:00 |
|
Louis-Antoine
|
29a94ee26a
|
Add a longname field to lumpinfo_t
|
2020-04-21 10:21:41 +02:00 |
|
Louis-Antoine
|
f6e2c7063f
|
Rename lumpinfo_t.name2 to lumpinfo_t.fullname
|
2020-04-20 23:40:41 +02:00 |
|
Nev3r
|
efb81fc526
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-04-20 09:05:21 +02:00 |
|
James R
|
e79d8c7896
|
Merge branch 'flipfuncpointers-master' into 'master'
Flipfuncpointers (take two)
See merge request STJr/SRB2!864
|
2020-04-19 18:23:56 -04: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
|
1d3aa7129a
|
Add enums for textmap FOF values
|
2020-04-18 18:02:43 +02:00 |
|
MascaraSnake
|
8e5effa07b
|
Merge branch 'udmf-argenums' into udmf-fofs-mkii
|
2020-04-18 17:23:02 +02:00 |
|
MascaraSnake
|
09506112d7
|
Add enums to encapsulate the textmap colormap settings
|
2020-04-18 17:15:25 +02:00 |
|