Commit Graph

1985 Commits

Author SHA1 Message Date
s809 db31c54309 Fix Enable Distant Generation config being ignored 2023-09-26 13:21:37 +05:00
s809 375e81b17d Merge branch 'main' of https://gitlab.com/jeseibel/distant-horizons-core 2023-09-26 11:40:38 +05:00
James Seibel 9bbb861b4e Fix AbstractFullDataSourceLoader locking issue
Both locations should've been write locks
2023-09-25 07:16:07 -05:00
James Seibel 37acd4a130 Add a todo comment to LodQuadTree 2023-09-24 21:22:07 -05:00
James Seibel 3004685235 Merge branch 'main' of https://gitlab.com/jeseibel/distant-horizons-core 2023-09-24 21:08:49 -05:00
James Seibel 1b094576d7 Fix sampling source pooling 2023-09-24 21:03:11 -05:00
James Seibel 4333cf65a2 Fix a null pointer in FullDataArrayAccessor 2023-09-24 20:47:53 -05:00
James Seibel a4b7e3e021 Move all data sampling logic into IIncompleteFullDataSource 2023-09-24 20:37:41 -05:00
James Seibel e7021dff2b Merge branch 'main' into 'main'
Deleting comments

See merge request jeseibel/distant-horizons-core!28
2023-09-24 19:06:42 +00:00
James Seibel a91c6e7e9e Merge branch 'NoName24Gitlab-main-patch-00777' into 'main'
Fixed "multiplayer.serverFolderNameMode.@tooltip"

See merge request jeseibel/distant-horizons-core!27
2023-09-24 19:06:00 +00:00
NoName 24 26c86b4059 Deleting comments 2023-09-24 19:01:07 +00:00
NoName 24 14bc64ea6d Update en_us.json. Fixed "distant horizons.config.client.advanced.multiplayer.serverFolderNameMode.@tooltip" by adding "advanced." (it didn't exist before) 2023-09-24 14:17:12 +00:00
s809 4fb9126d49 Fix unloaded file check 2023-09-24 18:48:14 +05:00
coolGi a2ed27c1d3 Merge branch 'main' into 'main'
Update ru_ru.json (minor fixes + Description).

See merge request jeseibel/distant-horizons-core!26
2023-09-24 10:00:03 +00:00
Steveplays28 ed2fca240e fix: Fix compiling after merge 2023-09-24 11:33:49 +02:00
Steveplays28 f5549f2ebe Merge remote-tracking branch 'origin-core/main' 2023-09-24 11:28:38 +02:00
Steveplays28 18e9cfe2a5 Merge branch 'main-upstream' 2023-09-24 11:24:55 +02:00
NoName 24 ebbeb02489 Update ru_ru.json (небольшие исправления + добавлены комментарии от меня: "unused_comment_..." / google en. small corrections + added comments from me: "unused_comment_...") 2023-09-24 09:24:51 +00:00
s809 e4e6753a02 Add gen task rate display 2023-09-24 14:24:31 +05:00
James Seibel c46e12fb7a remove unused commented out code in FullDataMetaFile 2023-09-23 22:32:44 -05:00
James Seibel 752c4af676 Add a todo comment 2023-09-23 22:31:30 -05:00
James Seibel b5bd50f789 Merge branch 'main' of https://gitlab.com/jeseibel/distant-horizons-core 2023-09-23 22:17:50 -05:00
James Seibel a5d0035f81 refactor and optimize full/render file handlers 2023-09-23 22:05:14 -05:00
coolGi 72e396bbcd Added Russian language file (Thx noname24_, pixsym (sym), and pshsh (пшш)) 2023-09-24 11:20:30 +09:30
James Seibel 7d7202950e Improve initial level loading time 2023-09-23 20:40:43 -05:00
coolGi cb0b610812 Made config use our lang for everything 2023-09-24 11:09:08 +09:30
James Seibel 19cde1bbd4 Add a config for synchronous GPU uploading
hopefully to help with Sodium/AMD issues
2023-09-23 16:05:56 -05:00
James Seibel 1fe209d72a Add some additional logging to GLProxy around GLFW context creation 2023-09-23 12:13:41 -05:00
James Seibel a61317aa57 Remove unhelpful GLProxy test configs 2023-09-23 11:53:44 -05:00
James Seibel 05a16e00ad Remove ReflectionHandler since it was only used by AbstractOptifineAccessor 2023-09-23 11:51:42 -05:00
James Seibel 03efa3c191 GLProxy reformat 2023-09-23 11:25:12 -05:00
James Seibel 9d5bfc4f16 Remove unimplemented IDhLevel.dumpRamUsage() 2023-09-23 11:21:29 -05:00
Steveplays28 8e7855405d Merge remote-tracking branch 'origin-core/main' 2023-09-23 16:34:07 +02:00
Steveplays28 381cae7307 feat: Add config option for server port 2023-09-23 16:33:43 +02:00
James Seibel 1aa45bd9d6 DhClientServerLevel reformat 2023-09-23 08:44:16 -05:00
James Seibel 04e8a99320 Improve World Gen tick method names and put queue work on queue thread 2023-09-23 08:44:01 -05:00
James Seibel 5b8649630c WorldGenerationQueue remove unused code and cleanup 2023-09-23 08:32:22 -05:00
James Seibel 89e92504e4 Fix null pointer in RenderDataMetaFile 2023-09-23 08:20:02 -05:00
s809 e94d67916d Fix compiling
Remove unused config category
Use pooling when receiving sections
Fix use of real time update config
Fix debug renderer not unregistered on queue close
2023-09-23 15:32:24 +05:00
Steveplays28 c98f9476cb Merge remote-tracking branch 'upstream-core/main'
# Conflicts:
#	core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiDebuggingConfig.java
#	core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
#	core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/CompleteFullDataSource.java
#	core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java
#	core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java
#	core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderDataMetaFile.java
#	core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java
#	core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java
#	core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DebugRenderer.java
#	core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java
2023-09-22 15:40:31 +02:00
James Seibel 6fa0c802dc fix merge for commit 5ae27310 2023-09-21 22:01:21 -05:00
James Seibel 10b3c94782 Fix some LodRenderSections not rendering when populated by the world generator 2023-09-21 21:56:36 -05:00
James Seibel cdb0ce63b8 Improve FullDataMetaFile debug colors 2023-09-21 19:40:32 -05:00
James Seibel 29d474c577 Improve full data sample pooling logic 2023-09-21 19:29:52 -05:00
James Seibel 74cac0c263 Restructure and optimize the debug wireframe renderer 2023-09-21 19:19:38 -05:00
s809 6c36f3c7e9 Merge branch 'main' of https://gitlab.com/jeseibel/distant-horizons-core 2023-09-21 21:04:58 +05:00
s809 877a89d17a Add config for a few slow features 2023-09-21 21:00:23 +05:00
James Seibel 9a82b718a5 refactor DebugRenderer 2023-09-21 07:31:29 -05:00
James Seibel cd7463728f Add full Data source pooling for certain sampling operations
May cause some concurrency issues
2023-09-21 07:11:41 -05:00
s809 d325a69e3f Move context levels to requests 2023-09-21 10:16:34 +05:00