Commit graph

82 commits

Author SHA1 Message Date
Loki Rautio d473f5d2ad Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
2026-03-02 02:05:46 -06:00
Loki Rautio 26760d2bf7 Merge remote-tracking branch 'origin/main' into dec-2014 2026-03-01 14:23:59 -06:00
void_17 a0da2512ea
Merge pull request #47 from KdotDevelopment/main
Crafting menu LB RB KBM fix
2026-03-02 03:21:48 +07:00
Loki Rautio 0f446dbf67 Merge remote-tracking branch 'origin/main' into dec-2014 2026-03-01 14:16:18 -06:00
Loki Rautio 97a4399472 Add DLC content and force Tutorial DLC 2026-03-01 14:15:54 -06:00
void_17 a2cf02cc38
Merge pull request #49 from izanthebestn1/increase-rendertarget-limit
Increase GDRAW_D3D11_RESOURCE_rendertarget limit from 32 MB to 64 MB (or more) …
2026-03-02 03:11:38 +07:00
void_17 6825d2ed52
Merge pull request #48 from simulpingus/main
Fix saves
2026-03-02 03:10:50 +07:00
Loki Rautio c63f565a6a Add sound to Windows64Media 2026-03-01 14:09:20 -06:00
Slenderman e7e32a5cd6
Merge branch 'smartcmd:main' into main 2026-03-01 15:07:15 -05:00
Slenderman 4b7a97f904 Update Minecraft.Client.vcxproj 2026-03-01 15:06:39 -05:00
Loki Rautio d07c892b91 Merge remote-tracking branch 'origin/main' into dec-2014 2026-03-01 14:04:21 -06:00
void_17 f580a6a603
Remove the word template from PR template
Looks like people don't change this field so the word `template` is not needed here.
2026-03-02 03:02:18 +07:00
void_17 1b6b973054
Merge pull request #41 from NEVARLeVrai/main
Added bug, and feature template for issues
2026-03-02 03:00:55 +07:00
Izan d1e8418a77 Increase GDRAW_D3D11_RESOURCE_rendertarget limit from 32 MB to 64 MB to prevent allocation warnings at high resolutions 2026-03-01 21:00:40 +01:00
NΞVΛR c48120dd35
Remove heart emoji from feature request template 2026-03-01 20:55:00 +01:00
NΞVΛR dc1e90fdc0
Removed emoji from feature request name for consistency. 2026-03-01 20:54:42 +01:00
NΞVΛR 47924e86fd
Rename bug report template to remove emoji 2026-03-01 20:54:18 +01:00
Ryan K 8048c793ed Crafting menu LB RB KBM fix 2026-03-01 14:54:15 -05:00
void_17 5037420311
Merge pull request #45 from simulpingus/main
Remove need for Durango folder, properly use Windows64Media, and add all DLC content
2026-03-02 02:40:01 +07:00
Loki Rautio 7cdcbeadd4 Merge remote-tracking branch 'origin/main' into dec-2014
# Conflicts:
#	.gitignore
#	Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
#	Minecraft.Client/LevelRenderer.h
2026-03-01 13:39:01 -06:00
void_17 9382049029
Merge pull request #44 from rtm516/cleanup/ignore
Remove GameHDD save data and update .gitignore
2026-03-02 02:37:10 +07:00
Slenderman 9691561693 Remove need for Durango folder 2026-03-01 14:33:30 -05:00
rtm516 8c79598b01
Remove GameHDD save data and update .gitignore 2026-03-01 19:32:26 +00:00
void_17 b06177599c
Merge pull request #43 from Foxify52/main
Increased max available memory beyond 512 mb for Xbox One/Windows build
2026-03-02 02:28:04 +07:00
Loki Rautio 1cb1fb5fce Fix compilation issues 2026-03-01 13:27:42 -06:00
void_17 d76650f333
Merge pull request #42 from simulpingus/main
fix my cast and put it into a separate function
2026-03-02 02:24:29 +07:00
Slenderman a2bcce6426 fix my cast and put it into a separate function 2026-03-01 14:22:01 -05:00
NΞVΛR 15e952d4cb added config for issues 2026-03-01 20:20:20 +01:00
Loki Rautio 630b2a2bdb Merge branch 'main' into dec-2014 2026-03-01 13:18:37 -06:00
Chris c1aebee5b9 Merge branch 'main' of https://github.com/Foxify52/MinecraftConsoles 2026-03-01 14:18:00 -05:00
Chris 5484b78eca Adjusted max memory usage for renderer 2026-03-01 14:17:45 -05:00
void_17 38b442b1e3
Merge pull request #37 from simulpingus/main
Unlock DLC, fix world names in load menu, fix dlc pack titles
2026-03-02 02:15:04 +07:00
Slenderman 6080c4ceac use C++ style cast instead of C-style cast 2026-03-01 14:12:39 -05:00
NΞVΛR c23dc98b67 added bug report template 2026-03-01 20:10:49 +01:00
NΞVΛR cde94faefa added feature request template 2026-03-01 20:07:49 +01:00
void_17 f5ebb5bfff
Merge pull request #38 from NEVARLeVrai/main
added Controls info (Keyboard & Mouse) to readme
2026-03-02 01:55:17 +07:00
void_17 6850c3b42c
Create pull_request_template.md 2026-03-02 01:54:47 +07:00
NΞVΛR 82fb9f4e33 added Controls info (Keyboard & Mouse) to readme 2026-03-01 19:50:45 +01:00
Slenderman 90504b1479 fix various things 2026-03-01 13:38:11 -05:00
void_17 99a8c53bc1
Merge pull request #33 from APAmk2/main
Windows: More proper shutdown
2026-03-02 01:28:47 +07:00
void_17 3bf5db9584
Merge pull request #34 from galenguyer/fix-release-assets
Copy release assets instead of changing working directory at runtime
2026-03-02 01:23:23 +07:00
Galen Guyer ec61d19d78 Revert "Merge pull request #25 from NEVARLeVrai/main"
This reverts commit 33e1b5ceb9, reversing
changes made to 44b68333a3.
This is a hacky way of doing it instead of just copying the assets that are needed
2026-03-01 13:14:36 -05:00
APAmk2 3db164d913 Windows: More proper shutdown 2026-03-01 22:13:44 +04:00
Galen Guyer bf24f709f9 Copy other folders needed for a standalone release asset 2026-03-01 13:13:11 -05:00
Loki Rautio 49dd522e01 Merge remote-tracking branch 'origin/main' into dec-2014
# Conflicts:
#	Minecraft.Client/Common/Consoles_App.cpp
2026-03-01 12:07:38 -06:00
Loki Rautio e4ed56eae8 Merge remote-tracking branch 'origin/main' into dec-2014
# Conflicts:
#	Minecraft.Client/LocalPlayer.cpp
2026-03-01 12:05:30 -06:00
Loki Rautio 425ea4df34 Working release build 2026-03-01 12:04:39 -06:00
void_17 b865228eed
Merge pull request #31 from yuri-kiss/main
fix: ps3 build error
2026-03-02 00:59:16 +07:00
Miyo Sho 0714be8b8d
fix: ps3 build error 2026-03-01 12:57:42 -05:00
void_17 33e1b5ceb9
Merge pull request #25 from NEVARLeVrai/main
Fix for exe not running, not founding the project directory
2026-03-02 00:50:22 +07:00