Commit Graph

1 Commits

Author SHA1 Message Date
Lasse Öörni
9f3e5e9cbb Squashed commit of the following:
commit da349be28508316a690086f5f8cec4be80d4a0a9
Author: Lasse Öörni <loorni@gmail.com>
Date:   Tue Aug 16 21:40:50 2016 +0300

    Convert mutant textures to .jpg to conserve repository size.

commit 086bfd662631df30bbad033b8be967b04db44f0b
Merge: 84e5da6 d135d76
Author: Lasse Öörni <loorni@gmail.com>
Date:   Tue Aug 16 21:38:44 2016 +0300

    Merge remote-tracking branch 'Lumak/master'

commit d135d760460e1bc925b1a3ea6a14a9d7ed5e8283
Author: Lumak <lumak5309@gmail.com>
Date:   Tue Aug 16 10:01:53 2016 -0700

    replaced char model w/ mutant model in 18 char demo lua,

commit 9255fd76e5393b636f2c32d33dce99c00caa555a
Author: Lumak <lumak5309@gmail.com>
Date:   Mon Aug 15 16:08:39 2016 -0700

    replaced jack model w/ mutant model in 18 character demo
2016-08-16 21:45:17 +03:00