#4 PR: features -> master

Zlúčené
swatson mergnuté 10 commitov z swatson/features do swatson/master 10 mesiacov pred

10 Commity

Autor SHA1 Správa Dátum
  esko997 fc6803e4d2 WIP, just commiting to switch pcs 2 rokov pred
  Simon Watson e5160fc7f2 Just adding some notes 2 rokov pred
  Simon Watson 7cee6c8ca1 Barebones Combat Commit #2 2 rokov pred
  Simon Watson 9af2ed00fc Barebones Combat 2 rokov pred
  Simon Watson f60ce10808 WIP -- more features 2 rokov pred
  Simon Watson 318f8a1687 Merge branch 'asdf-setup' of swatson/clwars into features 2 rokov pred
  Simon Watson fa7ca02ba4 Remove (load) and move everything to ASDF. 2 rokov pred
  spesk 38206409cb Reworked some crew stuff, added crew buffs 2 rokov pred
  Simon Watson 4c344347ba WIP, does not compile 2 rokov pred
  Simon Watson 23a8d45e87 README update, a few small things 2 rokov pred