Commit Graph
397 Commits
Author SHA1 Message Date
MihailRis 2ebaad6cb6 msvc build fix 2023-12-01 19:04:13 +03:00
MihailRis 647662b0d3 json::JObject added method putArray 2023-12-01 16:56:07 +03:00
MihailRis c8a283c645 Base content package + ContentLoader 2023-12-01 16:26:42 +03:00
MihailRis 6708e1ef86 Removed unused camera from BlocksPreview 2023-12-01 13:59:51 +03:00
MihailRis d655404b7a Added missing files 2023-12-01 13:56:52 +03:00
MihailRis 1fda002e0b Actual 3D block icons 2023-12-01 13:56:35 +03:00
MihailRis cfda17e21d fix 2023-12-01 02:24:06 +03:00
MihailRis aebf9f48aa Batch3D update 2023-12-01 02:21:44 +03:00
MihailRis d6c6d13786 Actually added ui3d shader 2023-11-30 21:13:45 +03:00
MihailRis 11d00dbbf8 Added ui3d shader 2023-11-30 21:13:27 +03:00
MihailRisandGitHub 28d93ca39a Merge pull request #30 from clasher113/main
Fixes
2023-11-30 20:36:28 +03:00
@clasher113 bc4fe168d7 Merge 2023-11-30 19:00:14 +02:00
@clasher113 e5e1dc0ed3 Memory leak fix 2023-11-30 18:58:26 +02:00
MihailRis dc0c497ec1 fixes + Block.replaceable 2023-11-30 19:11:58 +03:00
@clasher113 c691183bf8 Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp 2023-11-30 14:05:23 +02:00
MihailRis cee0214ac5 selection normal vector debug 2023-11-30 15:04:20 +03:00
MihailRis 0c35eeb072 aabb block shape WIP + common refactor 2023-11-30 14:48:38 +03:00
@clasher113 d11f4b7348 Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp 2023-11-30 08:39:56 +02:00
MihailRis 73d87ae451 Controllers minor refactor 2023-11-30 05:16:34 +03:00
MihailRis 856f5879f1 Controllers minor refactor 2023-11-30 05:14:10 +03:00
MihailRis c0050cffaa Minor refactor + comments 2023-11-30 05:00:48 +03:00
MihailRis 1d5037893c General refactor 2023-11-30 04:30:40 +03:00
MihailRis de134dc2e5 PhysicsSolver minor refactor, changed crouch speed 2023-11-30 00:18:31 +03:00
@clasher113 0b826a7b5a Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp 2023-11-29 23:09:26 +02:00
MihailRis 5accfe18c9 glfwInit errors logging 2023-11-29 23:57:44 +03:00
MihailRis f62279e46a Added glfw and glew errors logging 2023-11-29 23:37:34 +03:00
MihailRis fd679b8320 Block selection visual fix 2023-11-29 22:53:50 +03:00
@clasher113 6d5be563d6 Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp 2023-11-29 21:33:37 +02:00
MihailRis c30dc594b2 crouch fix 2023-11-29 22:27:39 +03:00
@clasher113 49ec6c6bd4 Merge branch 'main' of https://github.com/clasher113/VoxelEngine-Cpp 2023-11-29 20:49:51 +02:00
@clasher113 bf69f7df1a MSVC build fix 2023-11-29 20:46:46 +02:00
@clasher113 8e34ce9269 Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp 2023-11-29 20:28:24 +02:00
MihailRis efacb041b5 blocks hitboxes physics 2023-11-29 21:22:42 +03:00
clasher113andGitHub 64ef5404b1 Merge branch 'MihailRis:main' into main 2023-11-29 17:13:43 +02:00
@clasher113 a8af2653f4 Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp 2023-11-29 17:11:56 +02:00
MihailRis 693ad6d9a7 GLFW_OPENGL_PROFILE set to GLFW_OPENGL_ANY_PROFILE 2023-11-29 18:04:14 +03:00
MihailRis 1c258828c3 Small engine startup fix 2023-11-29 17:57:38 +03:00
MihailRis 56f055562d removed extra include 2023-11-29 16:40:44 +03:00
MihailRis 91a6426efe AABB block hitboxes 2023-11-29 16:36:00 +03:00
MihailRis cad1f6a669 temporary fixed grass hitbox 2023-11-29 13:29:28 +03:00
MihailRis f3889421d8 AABB.inside fix 2023-11-29 13:21:31 +03:00
MihailRis 7add5e6dcb Added AABB struct 2023-11-29 13:18:47 +03:00
@clasher113 984ffcbfe6 Merge branch 'main' of https://github.com/clasher113/VoxelEngine-Cpp 2023-11-28 22:09:01 +02:00
clasher113andGitHub 3bd4e68b3c Merge branch 'MihailRis:main' into main 2023-11-28 22:08:19 +02:00
@clasher113 ff0e617732 Grass rendering behing water fix 2023-11-28 22:07:37 +02:00
MihailRis b6a139528d Small fix 2023-11-28 22:41:55 +03:00
clasher113andGitHub 7502aa2d20 Merge branch 'MihailRis:main' into main 2023-11-28 16:42:32 +02:00
MihailRis a60cc70246 GLSL 'include' support 2023-11-28 16:13:49 +03:00
clasher113andGitHub 979d448fd8 Merge branch 'MihailRis:main' into main 2023-11-28 11:57:41 +02:00
@clasher113 805f203f22 Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp 2023-11-28 11:57:20 +02:00