75 Commits

Author SHA1 Message Date
Er2
2fc4fb3d68 CI: Try to fix build 2024-04-07 19:31:55 +03:00
Er2
b8c01e085f Misc patches 2024-03-28 14:39:40 +03:00
Brent
afe875e4fa iOS Support (#113)
undefined
2024-01-22 17:22:41 +02:00
iProgramInCpp
7eae466865 * Fixes to fancy pants grass detection, etc. 2023-12-26 01:18:54 +02:00
TheBrokenRail
e8696ae0eb Use ES 2 2023-12-19 19:38:17 +02:00
TheBrokenRail
433b1532d9 Fix Texture Detection 2023-12-19 19:38:17 +02:00
TheBrokenRail
ec12755632 Fix Immersive Mode On Older Android 2023-12-19 19:38:17 +02:00
TheBrokenRail
5bb20dae24 Ignore .idea 2023-12-19 19:38:17 +02:00
TheBrokenRail
20790755d1 Fix Text Auto-Complete On Android 2023-12-19 19:38:17 +02:00
TheBrokenRail
d4a100825b Remove MCPE Icon 2023-12-19 19:38:17 +02:00
TheBrokenRail
93dc4e934e OpenAL + Android 2023-12-19 19:38:17 +02:00
TheBrokenRail
4ca50c0fd8 Friendship Ended With LibPNG 2023-12-19 19:38:17 +02:00
TheBrokenRail
3776dc26f5 Fix Building On Windows 2023-12-19 19:38:17 +02:00
TheBrokenRail
8d3abda2fe Last Minute Changes 2023-12-19 19:38:17 +02:00
TheBrokenRail
06c69d3cc8 AppPlatform Fixes 2023-12-19 19:38:17 +02:00
TheBrokenRail
2356757730 Better Back Button Behavior On SDL Android 2023-12-19 19:38:17 +02:00
TheBrokenRail
6e9ccf7b49 Fix Non-GLES SDL Build 2023-12-19 19:38:17 +02:00
TheBrokenRail
23ec46f266 Simplify Android SDL Build 2023-12-19 19:38:17 +02:00
TheBrokenRail
e9ddb5ab61 Use Host ZLib In CMake Builds
The vendored ZLib is still in the repo for VS builds.
2023-12-19 19:38:17 +02:00
TheBrokenRail
fdf3106d7e Fix Some Indentation Errors 2023-12-19 19:38:17 +02:00
TheBrokenRail
c989ffa721 Allow Changing Input Mode 2023-12-19 19:38:17 +02:00
TheBrokenRail
7771bc20a7 Small Tweaks 2023-12-19 19:38:17 +02:00
TheBrokenRail
118d28910d Better Android Immersive Mode 2023-12-19 19:38:17 +02:00
TheBrokenRail
91f3b5a5d5 Use "External" Storage 2023-12-19 19:38:17 +02:00
TheBrokenRail
0721741564 Update AGP 2023-12-19 19:38:17 +02:00
TheBrokenRail
f9b07014d2 On-screen keyboard support! 2023-12-19 19:38:17 +02:00
TheBrokenRail
0559f66102 WIP Android SDL 2023-12-19 19:38:17 +02:00
SanyaSho
b055b37b02 HaikuOS port (#97)
* ExternalFileLevelStorageSource: add workaround for d_type on Haiku

* raknet: FileList: do not include io.h on Haiku

* raknet: SocketLayer: add sockio.h for Haiku

* cmake: link -lnetwork on Haiku

* readme: add Haiku build dependencies

* cmake: use link_libraries instead of add_link_options

* ExternalFileLevelStorageSource: use scary stdstring instead of char
2023-11-05 21:33:57 +02:00
iProgramInCpp
3b60855ad0 * Android: Determine feature availability at compile time.
Since assets are baked in to the APK, we can simply check for the existence of assets at compile time using CMake.
2023-11-05 21:30:33 +02:00
jonkadelic
e6ab1214af Biome colour and grass side tint options (#98)
* Added biome colour and grass side tint options

* Moved GrassColor and FoliageColor to client/renderer/

* * Fix some build issues.

* * Add the new files to the CMakeLists.txt

---------

Co-authored-by: iProgramInCpp <iprogramincpp@gmail.com>
2023-11-05 18:19:41 +02:00
iProgramInCpp
8e69df37bb * Fix SDL build. 2023-11-03 14:54:16 +02:00
f
f83ead9f8d WIP Android Port (#79)
* WIP Android Port

Android port. Still needs touch controls and mouse turning (if that's even possible on android) and file saving and SoundSystemSL
You control the camera and movement with your controller for now. You can navigate the gui using touch.
Options.cpp,LocalPlayer.cpp,Minecraft.cpp is configured to use controller.
Blocked out some code in ControllerTurnInput.cpp,Controller.cpp that didn't make sense.

* Fix glClear

glClear is supossed to use GL_DEPTH_BUFFER_BIT (thx TheBrokenRail)

* * Fix build.

* * Ignore assets.

* * More stuff

* * Fix more build errors.

* * It finally built

What I needed to do is rebuild the debug keystore because apparently android studio created it with sha1 digest alg which isn't supported by ant

* * Clean up filters.

* * Add cramped mode to the pause screen.

* * Fix a bug with the hotbar

* * In NinecraftApp::handleBack, pause the game if there is no screen.

* * AppPlatform_android: Add placeholder SoundSystem instance till we get SoundSystemSL working

* * Add properly working touch code.

* * Oh, remove some testing things

* * Fix state resetting when going in background and back in foreground
* Fix bug where the sky isn't being regenerated on graphics reset
* Fix bug where the m_currBoundTex isn't reset in Textures::clear potentially leaving a texture with that ID unassigned and corrupted
* Fix bug in CThread where the thread is detached and then also joined.
* Don't log anything if the program isn't in debug mode.

* * Add virtual keyboard support.

The screen instance slides so that the focused text box is kept visible.

* Rename from com.minecraftcpp to com.reminecraftpe

---------

Co-authored-by: iProgramInCpp <iprogramincpp@gmail.com>
2023-11-03 12:54:39 +02:00
iProgramInCpp
8c6c5a0b39 Merge pull request #91 into master 2023-11-03 03:17:28 +02:00
iProgramInCpp
eba8f1b467 Merge pull request #82 into master 2023-11-03 03:01:59 +02:00
TheBrokenRail
f62fd3e7f5 Fix Touch In WASM 2023-11-03 02:48:47 +02:00
iProgramInCpp
65be786140 * Fix SDL related touch issues. 2023-11-03 02:47:08 +02:00
TheBrokenRail
5bf7fae0b1 Fix DoesAssetExist 2023-11-02 13:31:24 -04:00
TheBrokenRail
3b580eeed3 Reduce Number Of CMake Projects 2023-11-01 21:59:13 -04:00
TheBrokenRail
100dd1db5d Some Code Clean Up 2023-11-01 21:53:23 -04:00
TheBrokenRail
8278e2993d More CMake Clean Up 2023-11-01 21:53:23 -04:00
TheBrokenRail
bba3099b71 Clean Up CMake Build System 2023-11-01 21:48:41 -04:00
TheBrokenRail
4830a6fcab SDL Multitouch! 2023-11-01 20:54:56 -04:00
iProgramInCpp
4ff68d1f87 * Fix CMake build issues.
* Remove accidentally packed in binary.
2023-11-02 01:30:46 +02:00
iProgramInCpp
c503eccd9d * Move AppPlatform_emscripten to the sdl directory
As pointed out by #82, the behavior before this commit is unintuitive.
2023-10-22 10:52:38 +03:00
Brent
f12a3c1c61 Visual Studio Project Overhaul + Cleanup (#80)
* Visual Studio Project Overhaul + Cleanup
* SDL2 project for Windows
* Re-added game client icon to SDL2 code
* Renamed "AppPlatform_windows" to "AppPlatform_win32" (this is the name of the Windows API and is not representative of the architecture type)
* Renamed "LoggerWindows" to "LoggerWin32"
* Renamed "SoundSystemWindows to "SoundSystemDS" (DirectSound). This may be used for the 360, so it wouldn't really be Windows-specific then.
* Moved "ClientSideNetworkHandler" from "network" to "client/network". We don't need it being compiled for the server if the client's the only thing that needs it.
* I wonder if this still works on macOS...

* Bugfixes & Fixed for macOS

* Options::savePropertiesToFile Logging Bugfix

* Silence Winsock Deprecation Warnings in RakNet

* VS Project Improvements
- Replaced 50 billion relative paths with $(MC_ROOT)
- Added $(RAKNET_PATH) variable to override RakNet location
- Re-added gitignore for .vcxproj.user files
- Added debugging config to Directory.Builds.props
- Slimmed down project configurations for SDL2

* VS Project Config Bugfixes
- Fixed RakNet header path for additional includes

* RakNet Target for XCode

* XCode Project Config Fixes

* Packet logging

* Network VS Project Filter Fix

* Fix RakNet Packet ID Length
We previously didn't have consistency between old and new C++ regarding PacketType enum length. Now we do. This is required or else it completely breaks networking between the versions.

* Additional RakNet Error Handling

* Disable packet logging

* * Fix CMakeLists.txt

This reflects the relocation of ClientSideNetworkHandler.cpp.

* * Also add renderer/GL/GL.cpp to the CMakeLists.txt

* * Replace libpng with stb_image

* * Fix buggy water behavior.

* * Put the CMakeLists of the SDL project in debug mode

* Visual Studio 2010 Support

* * Change the SdlIoCallbacks from an array to a single member.

This fixes compilation of the sdl2 target on VS.

* * Fix missing _error label.

* Revert "* Fix missing _error label."

This reverts commit 99a057fc84049a16c864bd840fb439a008af5c74.

* Revert "* Replace libpng with stb_image"

* info_updateGame Tiles

---------

Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com>
Co-authored-by: iProgramInCpp <iprogramincpp@gmail.com>
2023-10-22 10:08:59 +03:00
Brent
2e55f99a54 Options Logic Cleanup (#71)
* Output/Logging Overhaul
* Added StandardOut class
* Renamed LOGX macros to LOG_X
* Removed LogMsg macros in favor of LOG_X
* Added console window for debug Windows builds

* Options Refactor
* Moved options loading code from AppPlatform classes to Options class
* Added AppPlatform::singleton()
* Minecraft::m_options is now only accessible via Minecraft::getOptions() (as it should be)
* Making this work with SDL2 next

* Options Cleanup for SDL2

* Added AppPlatform::hasFileSystemAccess()
* Options won't try to load if hasFileSystemAccess returns false. Emscripten build will be happy.

---------

Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com>
2023-09-04 12:11:36 +03:00
iProgramInCpp
6e2fffdd68 * Rename Logger_windows -> LoggerWindows
* Add logger support for SDL base
2023-08-28 11:13:57 +03:00
Brent
5c1ea03747 Logging cleanup (#69)
* Mac OS X 10.6 & More C++03 Support

* Fix SDL2 options.txt loading for C++03

* Output/Logging Overhaul
* Added StandardOut class
* Renamed LOGX macros to LOG_X
* Removed LogMsg macros in favor of LOG_X
* Added console window for debug Windows builds

* Updated Xcode Project
+ StandardOut.hpp
+ StandardOut.cpp

* StandardOut_windows
* Replaced the Windows #ifdefs in StandardOut with StandardOut_windows

---------

Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com>
2023-08-28 10:55:41 +03:00
Brent
f7915a1dab Mac OS X 10.6 & More C++03 Support (#68)
* Mac OS X 10.6 & More C++03 Support

* Fix SDL2 options.txt loading for C++03

---------

Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com>
2023-08-27 11:46:15 +03:00
iProgramInCpp
0c38c01c28 * Add option saving to main.cpp when exiting.. 2023-08-25 20:35:26 +03:00