Commit graph

43 commits

Author SHA1 Message Date
Sally Knight 97172039dd Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
Tropical 0835dcb768
Merge pull request #244 from jerryjhird/staging
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
added brightness and FOV sliders to graphics settings
2026-03-15 15:30:14 -05:00
jerryjhird 0c5a300b1c added brightness and FOV sliders to grahpic settings as well as changed weird text in PauseScreen
(also adds sliding logic to sliders so you can drag them with your mouse)
2026-03-15 19:54:35 +00:00
Sally Knight fae7ebe7fa feat(jui): new multiline container item tooltips
Backported from Java Edition 1.3.x
This replaces the old non-functional tooltips
2026-03-15 18:29:09 +03:00
Tropical 1928c8b662 chore: fmt, remove subprojects 2026-03-14 22:46:47 -05:00
Tropical f66b293e33 Merge branch 'dev' into feat/iggy-dev 2026-03-14 03:25:09 -05:00
Tropical e8424f2000 chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
Sally Knight 04b76893ca feat: re-enable boss health bar 2026-03-13 20:53:41 +03:00
Tropical b63f4171d7 chore: set RENDER_HUD to 0 for now 2026-03-13 12:34:27 -05:00
Tropical 177ed6d176
Merge pull request #215 from 4jcraft/dev
just merging all of the dev branch stuff into the java gui branch
2026-03-13 12:11:37 -05:00
Leah Anderson 2fd1a136df
Merge pull request #210 from lotaviods/creative_java_gui
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
(java gui) Implement Creative Inventory screen and container
2026-03-13 09:23:28 -06:00
Sally Knight e4428a983a feat: backport more advanced world creation screen from 1.3.2
Main reference used was MCP 7.1
This allows players to toggle:
Gamemodes
Structure generation
Flat/normal world generation
Cheats (needs chat fully implemented to work however)
2026-03-13 16:52:34 +03:00
lotaviods 66fb0f1a96 feat: Implement creative inventory 2026-03-13 03:22:42 -03:00
Tropical 8f10806f70 Merge branch 'dev' into feat/restore-java-gui
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
2026-03-13 01:02:17 -05:00
notmatthewbeshay bcc765f3e7 Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup
# Conflicts:
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Rendering/Tesselator.cpp
2026-03-13 15:16:43 +11:00
Sally Knight 8e26b471ea fix: remove unused GLFW include
was causing CI failure
2026-03-12 22:13:08 +03:00
Sally Knight 5525aac9d5 fix: reorder and correct lighting for blocks in container screens 2026-03-12 16:07:16 +03:00
Sally Knight 10a1095ab2 fix: add proper head movement to player inventory preview 2026-03-12 02:07:36 +03:00
Nikita Edel faa4a989ce new blob 2026-03-11 18:49:36 +01:00
Tropical 9acefd2cc6 fix: hotbar selection indicator being chopped off at the bottom
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
2026-03-11 01:27:02 -05:00
Tropical 8ae9e62be3 feat: reimplement absolute mouse input on SDL 2026-03-10 21:14:19 -05:00
Sally Knight 716fa4fc21 fix: pass ESC keypress to screen (#161) 2026-03-10 16:49:50 +03:00
Tropical 3f8f7795f9 fix: display a blank screen while the world loads 2026-03-10 00:57:06 -05:00
Tropical c4ce9b5377 refactor: use InputManager for screens, DPI-aware InputManager 2026-03-09 23:41:56 -05:00
Tropical f0aa04a7ee fix: compute logical mouse position using window scale factor
Fixes mouse support in menus on systems with scaling factors other than 1.0x
2026-03-09 23:07:42 -05:00
Tropical 0a286d4ddc refactor: modify ClientConstants::VERSION_STRING to list 4jcraft
Co-Authored-By: ffqq <36998498+realffqq@users.noreply.github.com>
2026-03-09 22:47:16 -05:00
Tropical db7a5f9519 feat: restore unused java GUI
Co-Authored-By: ffqq <36998498+realffqq@users.noreply.github.com>
2026-03-09 22:29:32 -05:00
notmatthewbeshay e76f427e34 Remove DWORD from GUI chat accessors 2026-03-10 10:13:59 +11:00
DecalOverdose a73e6e145f
Merge pull request #107 from 4jcraft/refactor/untangle-assets-mess
refactor: untangle assets from source
2026-03-09 11:10:27 +04:00
Tropical c1d9413968 feat: render HUD 2026-03-09 02:04:02 -05:00
Tropical 5a36950239 fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h 2026-03-09 00:34:09 -05:00
Tropical 54dab7708d refactor: rename Build -> Platform in Minecraft.World 2026-03-08 21:33:18 -05:00
Tropical 66248339e5 refactor: unglob std::dynamic_pointer_cast 2026-03-08 22:44:00 +01:00
Tropical a2e6957383 fix: unglob std::{min, max}, manual stuff 2026-03-08 22:43:59 +01:00
Tropical 9a1e4e7752 refactor: byebye using namespace std
shoo
2026-03-08 22:43:44 +01:00
Tropical 5fad08b9fd refactor: begin unglobbing std::vector 2026-03-08 22:43:43 +01:00
Tropical cff2fc5f44 refactor: unglob std::wstring 2026-03-08 22:43:43 +01:00
Tropical 8812c3967b refactor: unglob std::shared_ptr 2026-03-08 22:43:43 +01:00
JuiceyDev 3f489a4202 fixed a bunch of shit, might fix renderer ? 2026-03-06 20:09:37 +01:00
JuiceyDev d9184f1a99 screen size 2026-03-06 18:50:28 +01:00
JuiceyDev e7dfce35d4 feat: enhance Linux rendering support and clean up unused UI code 2026-03-05 13:31:12 +01:00
JuiceyDev d0e7106cdf fix: SIOF crash in ChatScreen/TextEditScreen, RemoveEntitiesPacket MAX_PER_PACKET on linux 2026-03-05 10:52:11 +01:00
ella love 2383fcee6e feat: move script & folder refactor 2026-03-05 03:29:23 -05:00