Commit Graph

8 Commits

Author SHA1 Message Date
newincpp
f8dcc8d5b1 fix merging 2015-05-18 16:59:52 +09:00
newincpp
35c3ea2c8d Merge branch 'master' of https://github.com/teamMadScientist/celerity 2015-05-18 16:59:07 +09:00
newincpp
e7e300ee98 yay city 2015-05-18 16:57:56 +09:00
newincpp
81611044fb new level 1 2015-05-18 16:45:23 +09:00
b6f9137410 Assets, credits, HUD... 2015-05-16 22:59:03 +09:00
newincpp
7b80ae33f1 tuned foliage tool, ready to use 2015-05-16 21:12:32 +09:00
9a8f3be106 Playtest + blocker working for linux 2015-05-15 15:49:57 +09:00
albinor
9cec971480 Level 1 first draft
Base for the first level of the game (it is a different map from the one
romain created so I wouldn't erase his work)
2015-05-13 21:40:44 +02:00