 Remco
|
e081373a45
|
Merge branch 'developer' into feature/Menu
# Conflicts:
# CrystalPoint.vcxproj.filters
# Main.cpp
# Skybox.cpp
# Skybox.h
|
2016-06-20 15:23:55 +02:00 |
|
 kennyboy55
|
348b53c027
|
Added enemy -> brightness skybox
|
2016-06-10 11:55:57 +02:00 |
|
|
kennyboy55
|
ced3ff4462
|
Attempt implement menu (unresolved symbol error)
|
2016-06-09 17:56:37 +02:00 |
|
|
kennyboy55
|
a4373adc25
|
Fix image direction / load from JSON
|
2016-06-09 12:22:40 +02:00 |
|
|
kennyboy55
|
69561794d8
|
Reimplemented into newer develop version
|
2016-06-09 12:01:24 +02:00 |
|