8 Commits

Include renames

Author	SHA1	Message	Date
kennyboy55	0df47eac6b	World rendering from array	2016-04-25 17:35:49 +02:00
Bluepr1nt	34a17d143c	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # OpenGL2/Main.cpp	2016-04-25 13:35:04 +02:00
Bluepr1nt	fa9482d092	boom merge	2016-04-25 13:32:39 +02:00
Bluepr1nt	e03c33d622	boom	2016-04-25 13:31:41 +02:00
kennyboy55	9b143eca97	Alpha + textures	2016-04-25 13:31:25 +02:00
kennyboy55	46e5f4ec57	Show single texture	2016-04-25 12:21:57 +02:00
kennyboy55	68da0178ec	load textures	2016-04-25 11:27:21 +02:00
kennyboy55	fda7845f5f	Added OpenGL2	2016-04-25 11:03:39 +02:00