James R
|
8b1c1a7ac2
|
Merge branch 'drain-antiri' into 'next'
Make Ring Drain sectors play the depletion sound instead of the ring sound
See merge request STJr/SRB2!1315
|
2020-12-15 20:51:39 -05:00 |
|
James R
|
b98d27a1ba
|
Merge branch 'circuit-finallap' into 'next'
Final lap text for circuit
See merge request STJr/SRB2!1303
|
2020-12-15 20:42:59 -05:00 |
|
Zippy_Zolton
|
7c1063ed86
|
Make Ring Drain sectors play the depletion sound instead of the ring sound
|
2020-12-11 12:34:30 -06:00 |
|
James R
|
9796b60cb0
|
Merge branch 'my-junk' into 'next'
Initialize dummy linedef tag lists
See merge request STJr/SRB2!1279
|
2020-12-10 15:29:10 -05:00 |
|
Zippy_Zolton
|
783c5490c2
|
CTF text 1
|
2020-12-08 15:56:45 -06:00 |
|
Zippy_Zolton
|
b8007b37f4
|
zwip suggestion
|
2020-12-08 12:05:06 -06:00 |
|
Zippy_Zolton
|
a198009fda
|
Final lap text for circuit
|
2020-12-07 16:46:05 -06:00 |
|
Tatsuru
|
e9a7d98522
|
Initialize in p_spec.c too + magic number replacement
|
2020-12-03 17:50:10 -03:00 |
|
SMS Alfredo
|
f4c640394f
|
Allow the Forcespin sector type to be used with intangible fofs
Didn't think simply removing the P_IsObjectOnGround was gonna work, but apparently it does.
|
2020-11-18 12:27:09 -06:00 |
|
SMS Alfredo
|
302ff8e43b
|
Allow forcespin sectors to work on no spin characters
|
2020-11-18 11:49:17 -06:00 |
|
Nev3r
|
003f46c18e
|
Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing.
|
2020-11-12 13:48:14 +01:00 |
|
Nev3r
|
38e17d556e
|
Forgot to change %d to %s for sizeu1().
|
2020-11-10 13:11:42 +01:00 |
|
Nev3r
|
f28a4077ba
|
Remove unused tag parameter.
|
2020-11-10 13:10:01 +01:00 |
|
Nev3r
|
7f14edf62e
|
Use sizeu1()
|
2020-11-10 12:34:08 +01:00 |
|
Nev3r
|
c22dbe1d2e
|
rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro.
|
2020-11-10 12:22:55 +01:00 |
|
Nev3r
|
df6a903592
|
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
|
2020-10-27 20:48:25 +01:00 |
|
Lachlan Wright
|
500e0dfba1
|
Merge branch 'fix-236' into 'next'
Only allow explicitly living players to trigger sector specials
Closes #236
See merge request STJr/SRB2!1152
|
2020-09-25 09:31:06 -04:00 |
|
Lachlan Wright
|
ed58fab45f
|
Merge branch 'dye-fix' into 'next'
Fix players not properly decolorizing via linedef action
See merge request STJr/SRB2!1127
|
2020-09-25 08:54:16 -04:00 |
|
lachwright
|
511518f0e4
|
Only allow explicitly living players to trigger sector specials
|
2020-09-20 11:49:53 +09:30 |
|
SteelT
|
6a168ac5e9
|
Merge branch 'pictureformats' into 'next'
PNG conversion refactoring
See merge request STJr/SRB2!675
|
2020-09-10 15:58:18 -04:00 |
|
Tatsuru
|
57b1becfe0
|
Decolorize players as intended
|
2020-08-24 23:53:21 -03:00 |
|
Nev3r
|
e80e0b6007
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
|
2020-08-15 13:44:59 +02:00 |
|
James R
|
0a85046b22
|
Merge branch 'bt_spin' into 'next'
Replace all occurances of BT_USE with BT_SPIN (2.2!)
See merge request STJr/SRB2!982
|
2020-08-09 21:03:17 -04:00 |
|
GoldenTails
|
36e1c30e19
|
Replace all occurances of BT_USE with BT_SPIN (2.3?)
I'd use `next-major` but it doesn't exist lol
|
2020-07-11 21:59:54 -05:00 |
|
Nev3r
|
ebe16a66d9
|
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
# Conflicts:
# src/hardware/hw_main.c
# src/p_ceilng.c
# src/p_floor.c
# src/p_mobj.c
# src/p_mobj.h
# src/p_polyobj.c
# src/p_saveg.c
# src/p_setup.c
# src/p_spec.c
# src/p_spec.h
# src/p_user.c
# src/r_bsp.c
# src/r_defs.h
|
2020-07-10 18:18:07 +02:00 |
|
Jaime Passos
|
c385eca5d2
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-06 19:29:14 -03:00 |
|
Nev3r
|
6b38fe4b2c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
|
2020-07-06 11:13:27 +02:00 |
|
LJ Sonic
|
b558c523a2
|
Merge branch 'fix-oldbrak-missiles2' into 'next'
Take 2: Fix Old Brak missiles + add pw_ignorelatch
See merge request STJr/SRB2!1006
|
2020-07-04 16:28:48 -04:00 |
|
LJ Sonic
|
6b288c7c81
|
Merge branch 'make-linedef-422-smarter' into 'next'
Make Linedef type 422 smarter
See merge request STJr/SRB2!1014
|
2020-07-04 08:35:42 -04:00 |
|
Nev3r
|
e301d268ec
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
# src/hardware/hw_main.c
|
2020-06-30 20:29:48 +02:00 |
|
James R
|
34eeb98cc4
|
Merge remote-tracking branch 'origin/next' into gtr-fixes
|
2020-06-24 19:31:19 -07:00 |
|
GoldenTails
|
40520302cd
|
More people ought to know what modulo is...
Or modulous if your prefer.
|
2020-06-22 04:14:42 -05:00 |
|
GoldenTails
|
5942c4f7b8
|
Stop resetting cusval cause that's annoying
|
2020-06-21 23:21:42 -05:00 |
|
GoldenTails
|
2d937925f8
|
Make it so Linedef type 422 instead sets cusval when the titlemap is in action.
I have no idea why it wasn't like this before, but oh well.
|
2020-06-21 22:20:06 -05:00 |
|
kaysrishaq
|
248cd81ee9
|
brak missile fix, pw_ignorelatch, small Recycler fix
|
2020-06-18 17:09:29 -04:00 |
|
MascaraSnake
|
3ce62d7780
|
Merge branch 'next' into udmf-next
# Conflicts:
# src/p_mobj.c
# src/p_polyobj.c
|
2020-06-09 09:38:01 +02:00 |
|
LJ Sonic
|
aeeb6e1b02
|
Merge branch 'next' into 'fix-spawn-desynch'
# Conflicts:
# src/p_map.c
|
2020-06-01 08:15:02 -04:00 |
|
MascaraSnake
|
473c9f372f
|
Merge branch 'executordelay' into 'udmf-next'
UDMF linedef executor delay
See merge request STJr/SRB2!918
|
2020-06-01 07:57:23 -04:00 |
|
SteelT
|
1f0feb84b8
|
Merge branch 'scroller-tweaks' into 'next'
Add back side wall scrollers & allow using offsets for tagged wall scrollers.
See merge request STJr/SRB2!955
|
2020-05-28 11:29:39 -04:00 |
|
Louis-Antoine
|
d886e35576
|
Fix potential desynch when a player spawns
|
2020-05-28 11:03:35 +02:00 |
|
SwitchKaze
|
58cac1fd73
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
sphere
|
ff6b9a9cf0
|
Add linedef actions 507 & 508, allow using offsets for actions 502-504.
|
2020-05-19 23:39:35 +02:00 |
|
MascaraSnake
|
a928eb3cf7
|
Merge branch 'more-polyobject-cleanup' into 'next'
Smooth polyobject movement and other cleanup
See merge request STJr/SRB2!947
|
2020-05-18 16:00:55 -04:00 |
|
MascaraSnake
|
f1744efbd5
|
Merge branch 'waypoints' into 'next'
Store waypoints at map load instead of iterating through the thinker list to find them
See merge request STJr/SRB2!938
|
2020-05-18 16:00:46 -04:00 |
|
Louis-Antoine
|
74fa35221d
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
|
2020-05-18 16:14:05 +02:00 |
|
MascaraSnake
|
42e6d1a593
|
Merge branch 'fof-cleanup' into 'next'
FOF cleanup
See merge request STJr/SRB2!910
|
2020-05-17 02:30:16 -04:00 |
|
MascaraSnake
|
b068a37d14
|
Merge branch 'udmf-next' into udmf-polyobjects
# Conflicts:
# src/p_polyobj.c
|
2020-05-16 11:18:47 +02:00 |
|
MascaraSnake
|
55aacf6b83
|
polywaypointdata_t: Turn reverse and continuous into flags
|
2020-05-16 09:49:30 +02:00 |
|
Jaime Passos
|
c69a4f9ced
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-05-15 01:34:54 -03:00 |
|
MascaraSnake
|
93b6615e61
|
Store PolyObject waypoint return behavior in an enum
|
2020-05-13 16:21:47 +02:00 |
|