MMMiracles c5447934aa conflicts

2020-01-05 09:32:12 -05:00

..

effects

Merge pull request #48522 from Mickyan/trimdecal_update

2020-01-04 21:08:43 +01:00

items

Merge pull request #48326 from cacogen/wayfindingpinpointers

2020-01-05 15:28:29 +01:00

structures

conflicts

2020-01-05 09:32:12 -05:00

buckling.dm

Revert "[ready] Smooth-ish move rising: revengeance" (#48156)

2020-01-04 23:58:31 +13:00

empulse.dm

Fix Travis grep script to use PCRE to actually match things (#47065)

2019-10-19 10:21:05 -07:00

items.dm

Updates energy gun overlays and inhands (#47913)

2019-11-25 17:22:58 +01:00

obj_defense.dm

Batch of runtime fixes. (#48268)

2019-12-21 18:40:10 +01:00

objs.dm

Removes unreachable code (#48143)

2019-12-10 20:52:13 +13:00

structures.dm

Fixes Structures and Coin Press UIs being usable by ghosts (#48531)

2020-01-03 11:36:50 +01:00