Cameron653 9dd973221d Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

..

aura

Pol sync part 2

2017-10-27 15:30:51 -04:00

insert

…

modifier

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

projectile

…

spawner

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

summon

Resolves some merge conflicts

2019-01-05 16:29:19 -05:00

abjuration.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

apportation.dm

Merge pull request #5378 from Anewbe/camera_thieves_reeeeeeeeeeee

2018-06-30 18:47:28 -04:00

aspect_aura.dm

Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

audible_deception.dm

…

blink.dm

work

2017-11-26 12:08:05 -05:00

chroma.dm

…

condensation.dm

…

control.dm

Resolves some merge conflicts

2019-01-05 16:29:19 -05:00

dispel.dm

…

energy_siphon.dm

…

flame_tongue.dm

Partially ports the GLOB system

2018-08-14 18:14:09 -05:00

gambit.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

illusion.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

instability_tap.dm

…

mark_recall.dm

work

2017-11-26 12:08:05 -05:00

mend_organs.dm

…

oxygenate.dm

…

passwall.dm

work

2017-11-26 12:08:05 -05:00

phase_shift.dm

Additional types which need Destroy to return qdel hints (and other Destroy fixes)

2017-12-30 16:02:27 -05:00

radiance.dm

Additional types which need Destroy to return qdel hints (and other Destroy fixes)

2017-12-30 16:02:27 -05:00

reflect.dm

…

resurrect.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

shared_burden.dm

…

shield.dm

…

targeting_matrix.dm

…

track.dm

…

warp_strike.dm

…