Merge branch 'main' of yibble.dev:bulmanator/ld58
Fixed conflicts Added "code" directory for include to make it easier to include core headers Stopped warnings (probably cl specific)
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
|
||||
void G_ImagesLoad(G_State *game) {
|
||||
M_TempScope(0, 0) {
|
||||
FS_List assets = FS_PathList(temp.arena, S("assets"));
|
||||
@@ -193,3 +192,7 @@ void G_PipelinesLoad(G_State *game) {
|
||||
|
||||
Vk_PipelineCreate(basic);
|
||||
}
|
||||
|
||||
#include "impl/aabb.c"
|
||||
#include "impl/nav.c"
|
||||
#include "impl/player.c"
|
||||
|
||||
Reference in New Issue
Block a user