Commit Graph
100 Commits
Author SHA1 Message Date
Tropical ce57edff9d fix strings, includes, the usual 2026-03-22 02:28:46 -05:00
Tropical a30330f1d0 exclude unused GameMode implementations, format Platform/Common/Tutorial 2026-03-22 02:11:47 -05:00
Tropical 3fa28df4da TU19: merge Minecraft.Client/Platform/Common/GameRules 2026-03-22 01:27:23 -05:00
Tropical 87b4af678b format .Client/Common/GameRules 2026-03-22 01:15:44 -05:00
Tropical 6c92bc0be8 more build fixes 2026-03-22 01:14:52 -05:00
Tropical 195d82340a merge Consoles_App.h 2026-03-22 01:03:39 -05:00
Tropical fb2faecf33 format Consoles_app 2026-03-22 00:12:31 -05:00
Tropical 330ce54cda build fixes 2026-03-22 00:10:15 -05:00
Tropical ab2efa87e4 merge App_enums.h 2026-03-22 00:00:40 -05:00
Tropical e444bef081 implement DebugArtToolsOn, fix strings and includes 2026-03-21 23:50:56 -05:00
Tropical d230a1e4e4 add temp missing strings 2026-03-21 23:37:46 -05:00
Tropical fa4eb9cdf9 fix missing include and Minecraft.h errors 2026-03-21 23:33:30 -05:00
Tropical 371c734719 merge toplevel Minecraft.Client folders 2026-03-21 23:21:19 -05:00
Tropical 6e09aa7600 add BossMobGuiInfo to UI 2026-03-21 22:58:00 -05:00
Tropical 362a43ddee TU19: merge Minecraft.Client/Textures 2026-03-21 22:46:45 -05:00
Tropical 8f90088611 TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
Tropical a493e42532 TU19: merge Minecraft.Client/Player 2026-03-21 22:03:18 -05:00
Tropical 3f143811e3 TU19: merge Minecraft.Client/Network 2026-03-21 21:54:07 -05:00
Tropical 92fbafe432 ahhhhhhh 2026-03-21 21:13:21 -05:00
Tropical 2e9cdf773b Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2 2026-03-21 20:50:37 -05:00
Tropical b319cb3cea TU19: merge Minecraft.Client/Level 2026-03-21 20:29:13 -05:00
Tropical 1c12bedc86 TU19: merge Minecraft.Client/GameState 2026-03-21 20:25:32 -05:00
Tropical d9aa793075 build fixes 2026-03-21 19:19:31 -05:00
Tropical 401a19ad67 fix bad std::string replacements 2026-03-21 18:52:06 -05:00
Tropical 8df2c2bb47 TU19: update NBT library 2026-03-21 18:43:44 -05:00
Tropical 11a0440998 TU19: merge Minecraft.World/Network 2026-03-21 18:09:02 -05:00
Tropical 0f280b5ed3 TU19: merge Minecraft.World/WorldGen 2026-03-21 17:45:10 -05:00
Tropical eb23fc1a83 TU19: merge Minecraft.World/Util 2026-03-21 17:37:16 -05:00
Tropical a1e4726296 TU19: merge Minecraft.World/Stats 2026-03-21 17:30:42 -05:00
Tropical 3b52fd1369 TU19: add Minecraft.World/Scores 2026-03-21 17:28:02 -05:00
Tropical 75a4897381 TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
Tropical 19026c057b TU19: merge Minecraft.World/Player 2026-03-21 17:26:42 -05:00
Tropical fdf5b8f8b9 merge Minecraft.World.cpp 2026-03-21 17:14:48 -05:00
Tropical e7bafb17d0 missed some 2026-03-21 17:12:22 -05:00
Tropical 357fca24aa refactor: nuke __int64/__uint64 in Minecraft.World 2026-03-21 17:10:36 -05:00
Tropical 8036565022 missed these two 2026-03-21 17:08:54 -05:00
Tropical 86e08af338 TU19: merge Minecraft.World/Level 2026-03-21 17:07:51 -05:00
Tropical 29522d1ac9 TU19: merge Minecraft.World/Items 2026-03-21 16:39:12 -05:00
Tropical 3d3fa566c7 TU19: merge Minecraft.World/Entities 2026-03-21 16:29:02 -05:00
Tropical 405a87e078 TU19: merge Minecraft.World/Enchantments 2026-03-21 15:55:35 -05:00
Tropical 7d05b36f85 TU19: add Minecraft.World/Core 2026-03-21 15:54:53 -05:00
Tropical 9b6046cb83 TU19: merge Minecraft.World/Blocks 2026-03-21 15:52:50 -05:00
Tropical f25cd66f4d TU19: merge Minecraft.World/Containers
keeping virtual destructors where possible
2026-03-21 15:18:52 -05:00
Tropical db0a6b2e6a TU19: merge Minecraft.World/Commands 2026-03-21 15:14:17 -05:00
Tropical 36ca1d912e TU19: merge Minecraft.World/Headers 2026-03-21 15:13:02 -05:00
Tropical 7973172ae8 TU19: merge Minecraft.World/AI 2026-03-21 15:10:07 -05:00
Tropical 4c30ef1e62 Merge pull request #297 from realffqq/dev
(java ui) remap creative inventory to C and ensure serverside unpausing in all scenarios
2026-03-20 19:19:47 -05:00
Tropical f0b898b75d Merge pull request #291 from realffqq/dev
Java GUI tune-up (+ pause fix for iggy)
2026-03-19 11:41:31 -05:00
Tropical a222e7d886 Merge pull request #266 from Project516/patch-1
fix doxygen workflow
2026-03-18 15:01:35 -05:00
Tropical f7d8b057f2 Merge pull request #285 from realffqq/dev
fix: re-enable death screen on java gui
2026-03-18 14:46:06 -05:00
Tropical ee96c204de Merge pull request #279 from urzuline/dev
move Discord invite below Scope & platform in the README.md
2026-03-17 19:05:12 -05:00
Tropical 20a5835e48 Merge pull request #276 from WildBirdDog27/dev
4jcraft placeholder title image
2026-03-16 22:30:07 -05:00
Tropical 22d814ccaf Merge pull request #275 from swedishsplidney/tutorial-look-softlock-fix
Fix how ControllerTask checks for camera input
2026-03-16 22:29:42 -05:00
Tropical a904a8ebf4 Merge pull request #272 from Arcanecaster/patch-1
Update README.md
2026-03-16 19:11:59 -05:00
Tropical f88a211c08 Merge pull request #271 from nikita-edel/fix/clang-format-workflow
fix: clang-format workflow
2026-03-16 17:05:21 -05:00
Tropical 3b256041f3 Merge pull request #269 from realffqq/dev
fix(i18n): convert and correct format specifiers
2026-03-16 15:50:45 -05:00
Tropical ef734f1ffd Merge pull request #268 from MatthewBeshay/chore/cpp26
Use C++23 as the project default
2026-03-16 14:05:18 -05:00
Tropical 36f99f56ef Merge pull request #265 from realffqq/dev
fix(lighting): use gamma value from java UI options for brightness
2026-03-16 11:54:16 -05:00
Tropical dcf6189246 Remove GCC version requirement from README
Removed note about GCC version requirement for building.
2026-03-16 09:06:22 -05:00
Tropical d5bdd6a608 Merge pull request #261 from Project516/patch-1
fix docker build failing
2026-03-16 09:05:45 -05:00
Tropical 9748827f72 Merge pull request #257 from TheComputerGuy96/fix/iggy-check
Minecraft::run_middle: Don't use non-Iggy codepath on Iggy
2026-03-15 23:50:14 -05:00
Tropical 32580ab761 Merge pull request #255 from lotaviods/window_size
Window GUI resizing
2026-03-15 23:36:48 -05:00
Tropical ea02cdb4ed Merge pull request #253 from MatthewBeshay/issue/251-profile-stub-merge
Improve shared 4J.Profile stub state
2026-03-15 17:09:23 -05:00
Tropical ec87b5c424 chore: add back emergencySave 2026-03-15 16:35:57 -05:00
Tropical 61a3afcca3 fix: re-enable automatic LoadTrial when iggy is disabled, fmt 2026-03-15 16:32:33 -05:00
Tropical e076d76684 fix: provide fallback implementations of iggy GDraw functions 2026-03-15 16:19:27 -05:00
Tropical 731e7e05c9 fix: use Linux iggy headers in iggy_stubs 2026-03-15 16:16:46 -05:00
Tropical d1ac89c6ca fix: use iggy_stubs. if iggy is disbaled 2026-03-15 16:15:16 -05:00
Tropical 1bad0a3048 Merge branch 'dev' into feat/iggy-dev 2026-03-15 15:30:59 -05:00
Tropical 0835dcb768 Merge pull request #244 from jerryjhird/staging
added brightness and FOV sliders to graphics settings
2026-03-15 15:30:14 -05:00
Tropical 20d0679f91 Merge pull request #249 from MatthewBeshay/issue/64-remove-winapi-primitives-clean
Issue/64 remove winapi primitives clean
2026-03-15 15:29:05 -05:00
Tropical c19b31ddff feat: parity between Z/X and Escape/Return 2026-03-15 15:00:07 -05:00
Tropical 2e206bc97b fix: more menu logo sizing fixes 2026-03-15 14:53:29 -05:00
Tropical e3f520b063 fix: dont change asset size 2026-03-15 14:26:37 -05:00
Tropical e67e226084 feat: temporary branding changes 2026-03-15 14:15:17 -05:00
Tropical 97caf8ec9d Merge pull request #247 from MatthewBeshay/fix/linux-dlc-install-callback
Fix Linux DLC install callback flow on feat/iggy-dev
2026-03-15 12:15:19 -05:00
Tropical 84b0767c62 Merge branch 'dev' into feat/iggy-dev 2026-03-15 11:03:56 -05:00
Tropical 7873136185 Merge pull request #246 from realffqq/feat/restore-java-gui
feat(jui): new multiline container item tooltips
2026-03-15 10:42:28 -05:00
Tropical ff3d515776 Merge pull request #245 from TheComputerGuy96/fix/doxygen-name
CI: Use a descriptive name for Doxygen workflow
2026-03-15 10:35:10 -05:00
Tropical 09ac8336a3 fix: only link libshiggy if enable_shiggy is true 2026-03-15 01:02:42 -05:00
Tropical 649bc00fe4 feat: allow disabling iggy from meson.options 2026-03-15 00:59:21 -05:00
Tropical 7bef36fb2e Merge branch 'dev' into feat/iggy-dev 2026-03-15 00:49:59 -05:00
Tropical 21591c328b Merge branch 'dev' into feat/iggy-dev 2026-03-15 00:49:28 -05:00
Tropical 816cdcc312 Merge pull request #230 from MatthewBeshay/issue/64-remove-winapi-primitives
Issue/64 remove winapi primitives
2026-03-15 00:45:22 -05:00
Tropical 7dacd17e62 refactor: use uint8_t for m_rotateTick in XUI skin preview 2026-03-15 00:44:43 -05:00
Tropical e197fbcde6 Merge pull request #229 from Liriosha/dev
Add Doxygen
2026-03-15 00:26:57 -05:00
Tropical 31f3df0095 Update .gitignore 2026-03-14 22:47:44 -05:00
Tropical 1928c8b662 chore: fmt, remove subprojects 2026-03-14 22:46:47 -05:00
Tropical ab0ad12521 feat: use shiggy 2026-03-14 22:40:31 -05:00
Tropical 2a71525b5e Merge pull request #239 from realffqq/feat/iggy-dev
(IGGY) fix(gui): resolve transparency, lighting, and culling issues in item rendering
2026-03-14 21:03:22 -05:00
Tropical 5672035c6c docs: add readme buttons 2026-03-14 16:10:24 -05:00
Tropical e45d3cb587 Merge pull request #236 from MatthewBeshay/fix/linux-iggy-ui-gl-state
Restore Linux fixed-function GL state after Iggy UI
2026-03-14 15:05:12 -05:00
Tropical 89e87d874b Merge pull request #234 from MatthewBeshay/fix/linux-iggy-customdraw-matrix
Fix Linux Iggy custom draw matrix layout
2026-03-14 11:44:19 -05:00
Tropical 00c78bccbb Merge pull request #232 from MatthewBeshay/fix/linux-iggy-intro-black-screen
Fix/linux iggy intro black screen
2026-03-14 09:32:47 -05:00
Tropical f66b293e33 Merge branch 'dev' into feat/iggy-dev 2026-03-14 03:25:09 -05:00
Tropical 2d0450e578 fix: remove all linux-specific hacks for iggy
breaks title sequence, some menu rendering. need to do root-cause analysis to find out why
2026-03-14 02:47:00 -05:00
Tropical b27c76a696 Merge pull request #227 from 4jcraft/chore/fmt
chore: fmt
2026-03-13 21:12:55 -05:00
Tropical fed5385527 Merge pull request #223 from 4jcraft/readme-android-support
update readme for android port start.
2026-03-13 17:39:03 -05:00
Tropical b8759847a6 move LinuxGL.h to Platform/Linux 2026-03-13 17:15:44 -05:00
Tropical a0e6f0dddd add a blamignore for the last 3 commits 2026-03-13 17:12:26 -05:00