valoeghese
|
accb0e7b86
|
attempted merge
|
2020-03-02 20:33:43 +13:00 |
|
valoeghese
|
a72bb2d2cc
|
lol there are merge conflicts
|
2020-03-02 20:15:38 +13:00 |
|
valoeghese
|
3624a3480e
|
Merge branch 'worldgen' into 16x16-chunks
|
2020-03-02 20:14:58 +13:00 |
|
hYdos
|
4f57639aeb
|
Merge branch 'liteCraft' into Vulkan
|
2020-03-02 16:39:15 +10:00 |
|
hYdos
|
2b4b1aa4d0
|
should be the final move of engine classes
|
2020-03-02 16:38:46 +10:00 |
 Caroline Bell
|
7ccfb6ba5e
|
Use formatting tags and get rid of redundant formatting profile
|
2020-03-01 21:50:27 -08: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 |
|
hayden v
|
202e0f1324
|
fix up
|
2020-03-02 12:31:23 +10:00 |
|
hYdos
|
06817492af
|
buggy atlas code
|
2020-03-02 07:58:00 +10:00 |
|
hYdos
|
a0b71fbecb
|
Merge branch 'liteCraft' into the-best-render-fix
|
2020-03-02 07:26:46 +10:00 |
|
Caroline Bell
|
e4787171c2
|
Block textures always use textures from the block folder, right?
|
2020-03-01 12:59:12 -08:00 |
|
hYdos
|
30826695f2
|
Arrays and array fixes also part of atlas code
|
2020-03-02 06:55:06 +10:00 |
|
Caroline Bell
|
3cd8cc1a07
|
You commited without an import @Valoeghese
|
2020-03-01 12:14:42 -08:00 |
|
SuperCoder7979
|
60b514dbb1
|
more optimizations
|
2020-03-01 14:14:48 -05:00 |
|
SuperCoder7979
|
3fa156c8bf
|
remove extra threading code
|
2020-03-01 12:06:08 -05:00 |
|
SuperCoder7979
|
1ae5e3e633
|
fix renderer and more ""optimizations""
|
2020-03-01 12:01:07 -05:00 |
|
SuperCoder7979
|
b82f24b4ad
|
fix really bad bug and add memory counter
|
2020-03-01 07:47:37 -05:00 |
|
SuperCoder7979
|
e285e752b0
|
Merge branch 'worldgen' of https://github.com/halotroop/Ginger3D into worldgen
|
2020-03-01 07:33:22 -05:00 |
|
SuperCoder7979
|
8d5a3efbdf
|
multithreading good
|
2020-03-01 07:32:50 -05:00 |
|
hYdos
|
6849bea21a
|
prepare for atlas texturing
|
2020-03-01 19:44:38 +10:00 |
|
valoeghese
|
91f1fb3147
|
Merge branch 'worldgen' into 16x16-chunks
|
2020-03-01 17:08:04 +13:00 |
|
valoeghese
|
2768e05d48
|
move cave modifier to modifier package
|
2020-03-01 17:07:50 +13:00 |
|
valoeghese
|
309626c5d0
|
comment out code, gen still broken. who hardcoded irritater
|
2020-03-01 17:02:33 +13:00 |
|
valoeghese
|
4b918be743
|
start 16x16. Faster. Caves are broken
|
2020-03-01 16:58:45 +13:00 |
|
valoeghese
|
4cff7b5d64
|
please fix caves super
|
2020-03-01 16:41:15 +13:00 |
|
valoeghese
|
6e678a0c9d
|
cave stoff
|
2020-03-01 16:32:09 +13:00 |
|
valoeghese
|
e3b5b54489
|
cave carve threshold
|
2020-03-01 16:27:25 +13:00 |
|
valoeghese
|
eeb514fab0
|
Merge branch 'liteCraft' into worldgen
|
2020-03-01 16:09:07 +13:00 |
|
SuperCoder7979
|
d026feb525
|
start multithreading, the sane way
|
2020-02-29 22:08:50 -05:00 |
|
Caroline Bell
|
9c46f2a9b5
|
Moved debug stuff
|
2020-02-29 18:12:15 -08:00 |
|
Caroline Bell
|
d66e0bda90
|
Simpler boolean setting for cave carving blocks
|
2020-02-29 18:11:44 -08:00 |
|
Caroline Bell
|
2af1a71ab5
|
Moved stuff around
|
2020-02-29 18:06:35 -08:00 |
|
Caroline Bell
|
804dc2471e
|
Made chunks add blocks next to all non-full cubes to the render list
Instead of just ones that are next to air.
|
2020-02-29 18:05:41 -08:00 |
|
Caroline Bell
|
5853595fee
|
This method does adds more data than it saves.
|
2020-02-29 18:03:14 -08:00 |
|
hYdos
|
c3ae97b99d
|
Update Image.java
|
2020-03-01 11:31:02 +10:00 |
|
hYdos
|
eb61ff715f
|
Update BlockRenderer.java
|
2020-03-01 11:30:55 +10:00 |
|
valoeghese
|
914885af31
|
caves better
|
2020-03-01 13:47:44 +13:00 |
|
valoeghese
|
9a2586d881
|
fix population, accidentally invent Hell 2.0
|
2020-03-01 13:27:51 +13:00 |
|
valoeghese
|
f0c85f0693
|
Merge branch 'worldgen' of https://github.com/halotroop/Ginger3D into worldgen
|
2020-03-01 13:11:01 +13:00 |
|
valoeghese
|
f42231f1a4
|
yes
|
2020-03-01 12:17:05 +13:00 |
|
SuperCoder7979
|
4db454e5b4
|
totally didnt use a search+replace for this epic change
|
2020-02-29 18:05:48 -05:00 |
|
valoeghese
|
def0540622
|
use cARRect vARRiables
|
2020-03-01 12:01:26 +13:00 |
|
SuperCoder7979
|
69702db72f
|
Merge branch 'worldgen' of https://github.com/halotroop/Ginger3D into worldgen
|
2020-02-29 17:58:11 -05:00 |
|
SuperCoder7979
|
96804781ad
|
oh boy i hope this won't conflict
|
2020-02-29 17:58:09 -05:00 |
|
valoeghese
|
7844c10222
|
fix merge conflict
|
2020-03-01 11:37:21 +13:00 |
|
Caroline Bell
|
157ee88181
|
Added Java Formatting Preferences preset
You must use this to contribute.
|
2020-02-29 14:25:09 -08:00 |
|
hYdos
|
2f203175bc
|
better vbo support
|
2020-03-01 07:48:36 +10:00 |
|
hYdos
|
ad4761d065
|
fix camal case bug
|
2020-03-01 07:36:02 +10:00 |