Ben
|
ed4179dcd1
|
resolved git conflict
|
2018-09-17 17:41:47 +01:00 |
|
Ben
|
3e6e6f40df
|
Merge branch 'master' of https://github.com/plane000/crumpet-engine
|
2018-09-17 17:40:41 +01:00 |
|
Ben
|
20b6bd04bf
|
Shader loading and applying working
|
2018-09-17 15:49:19 +01:00 |
|
Ben
|
52203417e1
|
Colour mapping on meshes working
|
2018-09-17 13:43:26 +01:00 |
|
Ben
|
2ca62a2201
|
i think i broke somthing
|
2018-09-17 12:38:09 +01:00 |
|
plane000
|
11f63887e9
|
(broken) texture loading
|
2018-09-16 22:28:22 +01:00 |
|
plane000
|
0cc6e9cef0
|
Moved some files around and eddited the project files to include folders
|
2018-09-16 14:06:14 +01:00 |
|
plane000
|
32d9ad1dea
|
Initial commit
|
2018-09-16 14:02:14 +01:00 |
|