Commit Graph

68 Commits (e4a4beb787394e1f691c9abde2844c796058bb27)

Author SHA1 Message Date
hYdos e4a4beb787 1/4 vulkan implementation 2020-03-04 20:35:53 +10:00
Caroline Bell c4a84e48c0 Use common engine type instead of explicitly GingerGL 2020-03-03 15:34:44 -08:00
hYdos b535c09420 Merge branch 'Vulkan' of https://github.com/halotroop/Ginger3D.git into Vulkan
Conflicts:
	src/main/java/com/github/halotroop/litecraft/Litecraft.java
	src/main/java/com/github/halotroop/litecraft/world/World.java
	src/main/java/com/github/hydos/ginger/engine/common/obj/ModelLoader.java
	src/main/java/com/github/hydos/ginger/engine/opengl/utils/GlLoader.java
2020-03-03 16:34:53 +10:00
hYdos a635c549c1 yay merge conflict fixes 2020-03-03 16:27:53 +10:00
hYdos 1feffa5cd0 yEs 2020-03-03 16:21:46 +10:00
Caroline Bell cab3121c7a Removed references to classes within the Litecraft package from Ginger 2020-03-02 22:15:50 -08:00
hYdos 9a8fdc44a7 yEs 2020-03-03 15:56:37 +10:00
Caroline Bell 77d3d14753 ginger...Player.java -> litecraft...PlayerEntity.java 2020-03-02 21:04:19 -08:00
Caroline Bell 3dce58b238 Resolved errors created during merge 2020-03-02 02:51:46 -08:00
Caroline Bell f22076fe44 Don't allow unchecked scaling of cubes 2020-03-02 02:43:35 -08:00
hYdos a7e3541668 good non vulkan changes and some common ones 2020-03-02 20:26:30 +10:00
valoeghese 0361b799a8 remove unneccesary code, and do stuff tm 2020-03-02 20:47:47 +13:00
hYdos 2b4b1aa4d0 should be the final move of engine classes 2020-03-02 16:38:46 +10:00
hYdos 6db7693bc3 camal casing is good dont @ me 2020-03-02 15:11:55 +10:00
hayden v 722240a435 most of the rendering refactors 2020-03-02 14:33:27 +10:00
hayden v efbe206fcd a big refactor for vulkan 2020-03-02 14:19:55 +10:00
Caroline Bell 9c46f2a9b5 Moved debug stuff 2020-02-29 18:12:15 -08:00
Caroline Bell 2af1a71ab5 Moved stuff around 2020-02-29 18:06:35 -08:00
Caroline Bell 5853595fee This method does adds more data than it saves. 2020-02-29 18:03:14 -08:00
SuperCoder7979 4db454e5b4 totally didnt use a search+replace for this epic change 2020-02-29 18:05:48 -05:00
Caroline Bell 8247338f82 Exit game screen (doesn't really work) 2020-02-29 07:01:53 -08:00
Caroline Bell 3e3332271f Lots of little things (Part 1)
Featuring:
 - General safety
 - Small refactors
 - Micro-optimizations
 - Many manual code formats
 - Documentation
 - TODO and FIXME comments (Search for these!)
2020-02-29 07:01:30 -08:00
Caroline Bell ead57a9fa2 [Refactor] Clean up code 2020-02-29 03:43:40 -08:00
Caroline Bell b482b9c4da @hYdos STOP CAMELCASING PACKAGES 2020-02-29 03:33:47 -08:00
Caroline Bell 464511dd95 [Refactor] Removed camelCased package AGAIN @hYdos 2020-02-29 03:11:09 -08:00
Caroline Bell 8c12d200b8 Removed /bin/ from the repo! Why does this issue keep coming back?! 2020-02-29 01:24:04 -08:00
Caroline Bell 5478012e6e Position Integers 2020-02-28 22:42:49 -08:00
Caroline Bell 7b189e71d9 [WIP] IngameHUD 2020-02-28 21:56:17 -08:00
hYdos 046d92a87a qsdwfegrhtjyukil; 2020-02-29 10:41:32 +10:00
hYdos de06575654 finish off basic chunk multithreading 2020-02-29 10:10:11 +10:00
valoeghese 8338801b13 e 2020-02-28 23:15:44 +13:00
valoeghese 56d8c65e0e start dynamic chunkloading. crashes. 2020-02-28 22:42:00 +13:00
valoeghese baa863d6e1 e 2020-02-28 20:23:27 +13:00
valoeghese 3f2738ac1a organisation and stuff 2020-02-28 20:04:37 +13:00
hYdos 7e828a2ef7 "Its cleaner that way" 2020-02-28 16:32:32 +10:00
Caroline Bell 8b2ba123d9 Keybind enum 2020-02-27 21:12:11 -08:00
hYdos 3e89d1ad7d clean up and wtf is that weird lambda 2020-02-28 15:09:03 +10:00
valoeghese f1bc55e915 move movement to gateways callbacks 2020-02-28 17:58:14 +13:00
valoeghese 2e86f46778 add comments 2020-02-28 17:17:01 +13:00
Caroline Bell f88dd6f1d8 [Refactor] Post-JOML rewrite cleanup 2020-02-27 20:10:47 -08:00
valoeghese bf376068ad attempt merge 2020-02-28 17:00:06 +13:00
valoeghese 887e03e8f0 hacky setting player to world player and make player save data work. also less of a warning for missing fields in save loading 2020-02-28 16:45:23 +13:00
Caroline Bell 2ef60f694a JOML IS WORKING SORTA! 2020-02-27 19:44:50 -08:00
valoeghese 1d35eef9c0 player save dat 2020-02-28 16:17:20 +13:00
valoeghese c72658ad17 start player save data 2020-02-28 16:06:02 +13:00
Caroline Bell aeb5969684 Fixed NPE on Alt-F4 and partially implemented fullscreen key 2020-02-27 14:34:33 -08:00
valoeghese d01aebc4b5 fix merge 2020-02-28 10:18:01 +13:00
valoeghese 3d37dec619 world saving and loading integrated into the game 2020-02-28 10:16:10 +13:00
Caroline Bell 583faa58d3 [Refactor] Organized imports 2020-02-27 12:38:55 -08:00
hYdos 541cc3e0e8 Update Litecraft.java 2020-02-28 06:31:16 +10:00