Commit Graph

305 Commits

Author SHA1 Message Date
TheBrokenRail
bba3099b71 Clean Up CMake Build System 2023-11-01 21:48:41 -04:00
iProgramInCpp
4ff68d1f87 * Fix CMake build issues.
* Remove accidentally packed in binary.
2023-11-02 01:30:46 +02:00
iProgramInCpp
60b21356a1 Integrate touch related development. (#90)
* * Add BuildActionIntention crap

* * Set Client and World projects to use MP compilation

* asd

* * Use the new BuildActionIntention to break and place blocks.

* * Reverse engineer the IArea system.

* * Copy break logic from survival into creative conditionally

* * Reverse IBuildInput and MouseHandler
* Replace the new relative paths in the client project with $(MC_ROOT) again

* * Reverse Multitouch, MouseDevice

* * Reverse a bunch of auxiliary classes for input.

* * Use CustomInputHolder instead of holding inputs manually.

* * Reverse a whole BUNCH of things!

* * Add feedback textures to the gitignore.

* * D-pad now renders! Also loads of other work.

* * More Stuff

* * Finish touch control bug fixing.

* * Finalize work.

* * One last thing..

* * Add a "cramped" mode to the options screen and start menu.

* * Oh, forgot to do something
2023-11-02 00:49:11 +02:00
iProgramInCpp
98d6b4e5e8 * Add an option for block outlines instead of highlights.
Fixes #83.
2023-10-22 12:17:11 +03:00
iProgramInCpp
436d9d50f4 Update gles-compatibility-layer 2023-10-22 12:03:25 +03:00
iProgramInCpp
2a9e12f314 * Disable sponges.
They appear to be oddly unperformant for some reason. Need to look into it.
2023-10-22 11:57:52 +03:00
iProgramInCpp
6761e348ec * Remove PlatformDefinitions.hpp 2023-10-22 10:56:21 +03: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
iProgramInCpp
7e0bd02111 * Remove source include from RakNet.
I don't remember why I added it.
But it breaks build on some platforms (not mine weirdly for some reason though?!), so I'll just remove it.
2023-10-22 10:17:37 +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
iProgramInCpp
8b0eb798cd * Fix a small issue with getQuickSlotItem 2023-10-07 09:53:46 +03:00
iProgramInCpp
4ada245c06 * Remove testing code. 2023-09-17 14:44:00 +03:00
iProgramInCpp
6cafc1b379 * Disable survival mode for now. 2023-09-17 12:47:25 +03:00
iProgramInCpp
350100ac48 Merge devel into master (#78)
* * Turn survival back on for now.

* * Add TP command.

* * Fix fall damage reset.

* * Mob hitting works.

I've disabled entity shading though. Will get back to it at some point, promise!

* * Knockback

* * Mobs now rotate when they die.

* * Fire fix
2023-09-17 12:47:09 +03:00
iProgramInCpp
e9b00e6ba1 * Fix duplication of world items when resizing. 2023-09-04 12:38:57 +03:00
iProgramInCpp
e44520c25c * Add note about the DirectX SDK. 2023-09-04 12:35:02 +03:00
iProgramInCpp
c67d8dc3c6 * Add DXSDK include and lib directories to the project.
DXSDK_DIR is a standard path that the DirectX SDK (June 2010) installer adds.
2023-09-04 12:23:31 +03:00
iProgramInCpp
22dc8e0338 * Fix bad options deref in sound engine init 2023-09-04 12:15:39 +03:00
Brent
23bc51f23b Xcode project fixes (#77)
* Compiles for Snow Leopard Again

* Fix Build on Xcode 14

* Fixed Xcode Universal Build

* Update Xcode Schemas

---------

Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com>
2023-09-04 12:13:31 +03:00
Brent
3fa70ad387 vcxproj file fixes (#75)
* vcxproj file fixes
* Platform version is now 8.1
* Platform toolset is now v141_xp
* Fixed IncludePath not inheriting default paths
* Disabled ConformanceMode since it causes the "IUnknown" issue on v141_xp

* Update README.md

* Update README.md
* Includes screenshots

* Update README.md

---------

Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com>
2023-09-04 12:11:56 +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
cd4c469571 * Move the loggers into the proper filters 2023-08-28 22:04:47 +03:00
iProgramInCpp
f7b1e69e51 * Actually remove the debug console 2023-08-28 21:45:30 +03:00
iProgramInCpp
73b5aded1b * Use concrete log levels instead of prefixing the log string.
* Remove the "info" tag.
2023-08-28 21:44:47 +03:00
iProgramInCpp
d88e0a7643 * Remove debug console - it's now behind a GameMod
* Remove log counter.
2023-08-28 20:45:05 +03:00
iProgramInCpp
08aadb8535 * Fix broken replacement of unordered_map -> map.
TODO: find a hash table implementation for pre-C++11 and restore it!
2023-08-28 11:20:44 +03:00
iProgramInCpp
6e2fffdd68 * Rename Logger_windows -> LoggerWindows
* Add logger support for SDL base
2023-08-28 11:13:57 +03:00
iProgramInCpp
8fe86fccb5 * Rename StandardOut -> Logger. 2023-08-28 11:01:12 +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
iProgramInCpp
4d5f087ae5 I am going insane 2023-08-25 20:21:26 +03:00
iProgramInCpp
6798c7a6a5 dswgaadgssdg3t22t135 2023-08-25 20:17:09 +03:00
iProgramInCpp
71d7f00f30 asdasdasdasd 2023-08-25 20:09:03 +03:00
iProgramInCpp
c177af0ad0 * fix 2023-08-25 20:08:46 +03:00
iProgramInCpp
cbe1853144 * Add options.txt saving and loading to SDL target. 2023-08-25 19:58:18 +03:00
iProgramInCpp
5985e0d83b * Update the readme slightly
-- Add clarification on build steps for linux
-- Uniformize line widths to a maximum of 125 chars.
2023-08-23 23:20:01 +03:00
iProgramInCpp
3388c773f9 * Fix linux build 2023-08-23 21:45:20 +03:00
iProgramInCpp
b9373e3c03 * Fix big bad init bug in regards to window icons. 2023-08-23 20:15:47 +03:00
iProgramInCpp
73b051cb9e * Fix #63. 2023-08-23 12:40:05 +03:00
iProgramInCpp
d8f900edbd * Add semi transparent glass as patch. 2023-08-22 22:48:46 +03:00
iProgramInCpp
282ecf85d4 * Replace the hardcoded SLASH define with an actual keybind.
This was a thing in released Minecraft
2023-08-22 19:31:15 +03:00
iProgramInCpp
bf5114e684 * Also fix support for SDL again... 2023-08-22 18:23:31 +03:00
iProgramInCpp
d3ef629471 Big leap for key rebinding and crossplatform-ness. 2023-08-22 17:25:24 +03:00
iProgramInCpp
f3fc78e151 * Slight revamp of the options keymappings menu. 2023-08-22 13:30:13 +03:00
iProgramInCpp
b129fd7434 Add mccpp.vcxproj.user, so the working dir is safe 2023-08-21 11:12:20 +03:00
Brent
74038329f1 Move Windows projects into platforms folders (#65)
Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com>
2023-08-21 10:31:20 +03:00
iProgramInCpp
01e13dcef7 * Remove inappropriate debug code. 2023-08-20 22:35:26 +03:00
Vruk
9c2a5c43c8 Added Hide GUI Keybind (#62)
F1 to hide gui
Also renamed the field for hiding the GUI to m_bDontRenderGui

I would have named it m_bRenderGui and flipped the default values and checks but I assumed that changing the least amount of stuff would be desired.
2023-08-20 21:19:24 +03:00
Alexander Argentakis
a6d05eb6f3 Added field names for Timer (#64)
* Update Timer.hpp

* Update Timer.cpp

* Fixed member names & replaced all references
2023-08-20 21:19:04 +03:00