#4 PR: features -> master

Fusionné
swatson a fusionné 10 commits à partir de swatson/features vers swatson/master il y a 1 an

10 Commits

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