LetterJay 92c347d068 Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

..

verbs

Replace pAI verb tab with an action button (#33358)

2017-12-08 22:46:30 -06:00

asset_cache.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

client_colour.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

client_defines.dm

Update client_defines.dm

2017-12-19 15:36:07 -06:00

client_procs.dm

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

message.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

player_details.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

preferences_savefile.dm

Update preferences_savefile.dm

2017-10-27 23:54:51 -05:00

preferences_toggles.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

preferences_vr.dm

adds vore back (why this was removed, I have no idea)

2017-04-14 13:40:44 -05:00

preferences.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00