58 Commits

Include renames

Author	SHA1	Message	Date
Remco	cf124b3f38	enemy collison added, no jittering anymore	2016-05-25 13:38:13 +02:00
kennyboy55	965b54c901	Added heightmap	2016-05-25 11:31:37 +02:00
jancoow	e7a7cc5588	Fixed capital letters and string return error..	2016-05-23 12:34:55 +02:00
Remco	9d3cfa7e2a	Merge branch 'developer' into johan ... # Conflicts: # World.cpp # worlds/world1.json	2016-05-23 10:34:21 +02:00
Remco	d01efecb0e	enemy comes to you when in his radius	2016-05-23 08:48:23 +02:00
jancoow	7d13269480	Refactor johan branch for compiling with g++	2016-05-22 23:19:05 +02:00
kennyboy55	a8415db4ac	Added new Johan Code	2016-05-20 13:00:04 +02:00
kennyboy55	7c4ee37867	Johan is love, Johan is life	2016-05-19 14:25:03 +02:00