0000000000000000000000000000000000000000 c31df76c94b3245a3edae1351519a0a3be5fb833 Ferdie <Ferdie@Ferdie-devbox.(none)> 1484948850 +0000	clone: from https://github.com/rossvor/ggj2017.git
c31df76c94b3245a3edae1351519a0a3be5fb833 f23e2f89334914dbca2ccbf318324a1255ae8e36 Ferdie <Ferdie@Ferdie-devbox> 1484949121 +0000	commit: changed move from -2 to -1
f23e2f89334914dbca2ccbf318324a1255ae8e36 f23e2f89334914dbca2ccbf318324a1255ae8e36 Ferdie <Ferdie@Ferdie-devbox> 1484949245 +0000	checkout: moving from master to test
f23e2f89334914dbca2ccbf318324a1255ae8e36 8c2001f2df966a3620ceaac76e4c825494049f36 Ferdie <Ferdie@Ferdie-devbox> 1485004559 +0000	commit: Added MapLoader which provides a method to load a map from a csv file in the assets directory of the desktop launcher.
8c2001f2df966a3620ceaac76e4c825494049f36 870cb4672b9e333f8d838f0852136ed9e99d60d3 Ferdie <Ferdie@Ferdie-devbox> 1485011685 +0000	commit: Trying to commit maploader again
870cb4672b9e333f8d838f0852136ed9e99d60d3 f23e2f89334914dbca2ccbf318324a1255ae8e36 Ferdie <Ferdie@Ferdie-devbox> 1485011787 +0000	checkout: moving from test to master
f23e2f89334914dbca2ccbf318324a1255ae8e36 870cb4672b9e333f8d838f0852136ed9e99d60d3 Ferdie <Ferdie@Ferdie-devbox> 1485011810 +0000	checkout: moving from master to test
870cb4672b9e333f8d838f0852136ed9e99d60d3 a769ce602ccdab38d7f32584fe557c77d9239498 Ferdie <Ferdie@Ferdie-devbox> 1485012194 +0000	commit: Implemented Maploader and CharacterEntity Class
a769ce602ccdab38d7f32584fe557c77d9239498 f23e2f89334914dbca2ccbf318324a1255ae8e36 Ferdie <Ferdie@Ferdie-devbox> 1485013837 +0000	checkout: moving from test to master
f23e2f89334914dbca2ccbf318324a1255ae8e36 cca42fb3b4c928636bb344fccd54105964d026fb Ferdie <Ferdie@Ferdie-devbox.(none)> 1485013929 +0000	pull: Fast-forward
cca42fb3b4c928636bb344fccd54105964d026fb 1e8eb945afda08cbaac1b30aa7048dee8c678d8d Ferdie <Ferdie@Ferdie-devbox> 1485020310 +0000	merge branch 'master' of https://github.com/rossvor/ggj2017.git: Fast-forward
1e8eb945afda08cbaac1b30aa7048dee8c678d8d 613e85240168d197bc04970b5573ded20c1dd7f1 Ferdie <Ferdie@Ferdie-devbox> 1485021946 +0000	commit: Implemented map changing. Currently with '/' key.
613e85240168d197bc04970b5573ded20c1dd7f1 908bb909ecdff57e381c5500ee9d7bf68faaae04 Ferdie <Ferdie@Ferdie-devbox> 1485022159 +0000	commit: fixed an error with NextMap
908bb909ecdff57e381c5500ee9d7bf68faaae04 908bb909ecdff57e381c5500ee9d7bf68faaae04 Ferdie <Ferdie@Ferdie-devbox.(none)> 1485025588 +0000	checkout: moving from master to test
908bb909ecdff57e381c5500ee9d7bf68faaae04 baa16f9e3d2d7b7498817da59367b0f19aa73c51 Ferdie <Ferdie@Ferdie-devbox> 1485025679 +0000	commit: Implemented Player and Creature start location finding from map file. Implemented Player assigning start location.
baa16f9e3d2d7b7498817da59367b0f19aa73c51 908bb909ecdff57e381c5500ee9d7bf68faaae04 Ferdie <Ferdie@Ferdie-devbox> 1485026198 +0000	checkout: moving from test to master
908bb909ecdff57e381c5500ee9d7bf68faaae04 74f13e5a90bd17b7a9e7b1792148991729be482b Ferdie <Ferdie@Ferdie-devbox> 1485026207 +0000	merge branch 'master' of https://github.com/rossvor/ggj2017.git: Fast-forward
74f13e5a90bd17b7a9e7b1792148991729be482b 74f13e5a90bd17b7a9e7b1792148991729be482b Ferdie <Ferdie@Ferdie-devbox.(none)> 1485026313 +0000	checkout: moving from master to test
74f13e5a90bd17b7a9e7b1792148991729be482b 3a937c3a5579a53bf21c33bc528a4801f5c21656 Ferdie <Ferdie@Ferdie-devbox> 1485031175 +0000	commit: Implemented a dumb AI that follows the player.
3a937c3a5579a53bf21c33bc528a4801f5c21656 7d49cac27b809aef14a27763677dd3573fc7155f Ferdie <Ferdie@Ferdie-devbox> 1485032059 +0000	commit: Implemented CharacterEntities for Player and Creature
7d49cac27b809aef14a27763677dd3573fc7155f 45bdb088ad926f145fbbf0a2a42a1ae36d714f9d Ferdie <Ferdie@Ferdie-devbox> 1485033971 +0000	commit: Implemented PlayerCharacterEntity Implemented Creature to Player damage Implemented getDescription
45bdb088ad926f145fbbf0a2a42a1ae36d714f9d eabf0bcd6cc1ac0f8220cf7d2adc30ff15b2db8d Ferdie <Ferdie@Ferdie-devbox> 1485035636 +0000	commit: Implemented bottomText ArrayList Implemented beginnings of Karma on PlayerCharacterEntity for good/bad ending.
eabf0bcd6cc1ac0f8220cf7d2adc30ff15b2db8d 74f13e5a90bd17b7a9e7b1792148991729be482b Ferdie <Ferdie@Ferdie-devbox> 1485036201 +0000	checkout: moving from test to master
74f13e5a90bd17b7a9e7b1792148991729be482b 7d49cac27b809aef14a27763677dd3573fc7155f Ferdie <Ferdie@Ferdie-devbox> 1485036212 +0000	merge branch 'master' of https://github.com/rossvor/ggj2017.git: Fast-forward
7d49cac27b809aef14a27763677dd3573fc7155f 280c1a4a2a1b56cb613c079d38ca74a84f87783a Ferdie <Ferdie@Ferdie-devbox> 1485036323 +0000	merge branch 'master' of https://github.com/rossvor/ggj2017.git: Fast-forward
280c1a4a2a1b56cb613c079d38ca74a84f87783a 280c1a4a2a1b56cb613c079d38ca74a84f87783a Ferdie <Ferdie@Ferdie-devbox.(none)> 1485084078 +0000	checkout: moving from master to test
280c1a4a2a1b56cb613c079d38ca74a84f87783a 75d60d3b00125e467d83cd5d599cd43d75bde931 Ferdie <Ferdie@Ferdie-devbox> 1485084144 +0000	commit: Implemented description on map load
75d60d3b00125e467d83cd5d599cd43d75bde931 280c1a4a2a1b56cb613c079d38ca74a84f87783a Ferdie <Ferdie@Ferdie-devbox> 1485084670 +0000	checkout: moving from test to master
280c1a4a2a1b56cb613c079d38ca74a84f87783a b4d578c516ce0273364ffc7d3737c0deebca8da1 Ferdie <Ferdie@Ferdie-devbox> 1485084689 +0000	merge branch 'master' of https://github.com/rossvor/ggj2017.git: Fast-forward
b4d578c516ce0273364ffc7d3737c0deebca8da1 882de4f5ef7074b29cd89af1f473f4a717c34983 Ferdie <Ferdie@Ferdie-devbox> 1485085246 +0000	merge branch 'master' of https://github.com/rossvor/ggj2017.git: Fast-forward
882de4f5ef7074b29cd89af1f473f4a717c34983 882de4f5ef7074b29cd89af1f473f4a717c34983 Ferdie <Ferdie@Ferdie-devbox.(none)> 1485087986 +0000	checkout: moving from master to test
882de4f5ef7074b29cd89af1f473f4a717c34983 ec9978ad62cf157833bbe661f032a45a7c8e4935 Ferdie <Ferdie@Ferdie-devbox> 1485089527 +0000	commit: Implemented level changing, dying and game ending
ec9978ad62cf157833bbe661f032a45a7c8e4935 882de4f5ef7074b29cd89af1f473f4a717c34983 Ferdie <Ferdie@Ferdie-devbox> 1485090397 +0000	checkout: moving from test to master
882de4f5ef7074b29cd89af1f473f4a717c34983 425034d86e08c85278b79e24723a99db011c9313 Ferdie <Ferdie@Ferdie-devbox> 1485090408 +0000	merge branch 'master' of https://github.com/rossvor/ggj2017.git: Fast-forward
425034d86e08c85278b79e24723a99db011c9313 425034d86e08c85278b79e24723a99db011c9313 Ferdie <Ferdie@Ferdie-devbox.(none)> 1485090482 +0000	checkout: moving from master to test
425034d86e08c85278b79e24723a99db011c9313 599f6d3f35a5f5d9825539eb1413c116f974ff51 Ferdie <Ferdie@Ferdie-devbox> 1485093083 +0000	commit: Removed mouse, implemented basic damge descriptors.
599f6d3f35a5f5d9825539eb1413c116f974ff51 425034d86e08c85278b79e24723a99db011c9313 Ferdie <Ferdie@Ferdie-devbox> 1485093854 +0000	checkout: moving from test to master
425034d86e08c85278b79e24723a99db011c9313 9074629536b3e6c3a65901bbf0f15b2a696bda7b Ferdie <Ferdie@Ferdie-devbox> 1485093861 +0000	merge branch 'master' of https://github.com/rossvor/ggj2017.git: Fast-forward
9074629536b3e6c3a65901bbf0f15b2a696bda7b 9074629536b3e6c3a65901bbf0f15b2a696bda7b Ferdie <Ferdie@Ferdie-devbox.(none)> 1485093950 +0000	checkout: moving from master to test
9074629536b3e6c3a65901bbf0f15b2a696bda7b 9074629536b3e6c3a65901bbf0f15b2a696bda7b Ferdie <Ferdie@Ferdie-devbox> 1485096321 +0000	checkout: moving from test to master
9074629536b3e6c3a65901bbf0f15b2a696bda7b 446bf08a7d1c5c1176da17bde564fa8a84211987 Ferdie <Ferdie@Ferdie-devbox.(none)> 1485096634 +0000	pull: Fast-forward
446bf08a7d1c5c1176da17bde564fa8a84211987 496fcd31157845ec35c8fcb3bdd522874d9d80cd Ferdie <Ferdie@Ferdie-devbox> 1485102236 +0000	merge branch 'master' of https://github.com/rossvor/ggj2017.git: Fast-forward
