SemvdH
|
3a42966e92
|
Merge branch 'develop' into feature/loading_all_models
|
2021-06-18 15:33:06 +02:00 |
|
Jasper
|
17b585190a
|
[EDIT] loadingscreen now has a background, and got rid of some memory leaks
|
2021-06-18 15:09:30 +02:00 |
|
Jasper
|
ad2d651d41
|
[FIX] fixed the loading scene, everything runs correctly now
|
2021-06-18 14:53:16 +02:00 |
|
Jasper
|
06a6930c58
|
[ADD] filled the method load_all_models() in loading_Scene
|
2021-06-18 11:13:26 +02:00 |
|
Jasper
|
f1f8ac2d08
|
Merge branch 'feature/random_levels' into feature/loading_all_models
|
2021-06-18 10:54:17 +02:00 |
|
Lars
|
773e8e9a96
|
[FIX + check] cleaned up the singleton and loading scene, only loading the models should be the only thing to do. besides checking it in another scene!
|
2021-06-18 10:43:26 +02:00 |
|
Lars
|
8dbe088a91
|
[add] add some code + singleton, not working properly yet
|
2021-06-18 10:08:16 +02:00 |
|
Jasper
|
26d438e4d1
|
[EDIT] models now generate in a 3x3 grid with always 9 models
|
2021-06-18 09:58:08 +02:00 |
|
Jasper
|
24285b9714
|
[ADD] added an extra layer to the grid for the lamps and fans. Grid now generates correctly.
Good enough
|
2021-06-11 16:34:25 +02:00 |
|
Lars
|
001f28d198
|
[forget]
|
2021-06-11 16:01:17 +02:00 |
|
Jasper
|
fb70d10c47
|
[EDIT] made a grid for the models to load in
Some items still clip through the wall
|
2021-06-11 15:58:28 +02:00 |
|
Lars
|
f6fad79c2e
|
[TRY] trying to manage some data storage
|
2021-06-11 15:56:34 +02:00 |
|
Jasper
|
bce2ccf889
|
[ADD] added base for loading scene
|
2021-06-11 11:43:46 +02:00 |
|