314 Commits

Author SHA1 Message Date
TheBrokenRail
26b94524a9 Make ZLib A Submodule 2023-10-22 05:05:46 -04: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
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
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
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
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
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
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
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
iProgramInCpp
a35318fc7f one last horrible bug 2023-08-20 02:03:13 +03:00
iProgramInCpp
4a7be6918f nother horrible bug fix 2023-08-20 01:58:51 +03:00
iProgramInCpp
6719b151ab * Fix horrible bug with the mouse input code. 2023-08-20 01:56:51 +03:00
iProgramInCpp
f255209c84 * Fix VS2010 project. 2023-08-19 16:45:11 +03:00
iProgramInCpp
82770d3436 * Small clean ups to the project. 2023-08-19 16:12:32 +03:00
Brent Da Mage
d5ee7bfc08 Cleaned Up AppPlatform & Input Classes
* Cleaned up AppPlatform classes
* Documented & improved Keyboard & Mouse classes
* Improved input-handling code in the Windows & SDL main.cpp files
2023-08-19 15:57:50 +03:00
iProgramInCpp
30f35ef724 More updates to fix stuff... 2023-08-19 10:09:49 +03:00
iProgramInCpp
c01a627aee * Update the CMakeLists to reflect the changes 2023-08-19 10:07:10 +03:00
iProgramInCpp
919e4d8625 * Move client/common/ and client/network/ into common/ and network/ respectively. 2023-08-19 10:05:48 +03:00
iProgramInCpp
a689ee7365 Disable lighting once, globally 2023-08-18 22:41:51 +03:00
iProgramInCpp
53c586bec8 * Fix-inaccuracy: remove re-enable of GL_LIGHTING in LevelRenderer::render 2023-08-18 22:40:26 +03:00
iProgramInCpp
c4b8e48c6c * Move AABB, HitResult and Vec3 into world/phys 2023-08-18 22:33:05 +03:00
iProgramInCpp
ac0555c3fb * Move synth stuff into world/level/levelgen/synth 2023-08-18 22:29:03 +03:00
iProgramInCpp
0ed807eaf3 * Oops 2023-08-17 17:52:46 +03:00
iProgramInCpp
8a38dee562 * A couple of fixes for SDL/Emscripten build. 2023-08-17 17:49:52 +03:00
iProgramInCpp
5821a5d5ef * Final fixes for VS2010 build. 2023-08-17 16:21:42 +03:00
iProgramInCpp
acaf4aa614 * Fix WebGL build. 2023-08-17 14:26:35 +03:00
iProgramInCpp
a08478d527 * Slight refactor to the resize code. 2023-08-17 11:44:24 +03:00
iProgramInCpp
f14730d3f3 * Fix getDrawScale warning. 2023-08-17 11:21:47 +03:00
Brent
5ac3aa6d9e macOS Support & AppPlatform Cleanup (#57)
* macOS Support & Cleanup

* Fix malformed comments in build-wasm.bat

* Emscripten Fixes

* * Add shebang to the grabsounds.py script

Since it was changed from rw- to rwx, I'll add the shebang so that it actually runs properly.

* * Re-add the patch_data and readme files.

* * Remove sound data.

* Fix some more things.

* Think it's ready to pull now...

---------

Co-authored-by: BrentDaMage <BrentDaMage@users.noreply.github.com>
Co-authored-by: iProgramInCpp <iprogramincpp@gmail.com>
2023-08-17 11:20:59 +03:00
iProgramInCpp
906b96edd8 Add zlib to the web build, fix an error in CThread... 2023-08-17 10:28:01 +03:00
iProgramInCpp
242f6f904a * Get rid of the survivalmode remnants in CreativeMode. 2023-08-16 22:52:34 +03:00
iProgramInCpp
83c94f355e * Fix bad ordering in the PlaceBlockPacket. 2023-08-16 22:47:15 +03:00
iProgramInCpp
9a24abc603 Improve Survival Mode + others (#56)
* * Undo some of the changes done in the "* Work on survival mode." commit.
* TEST_SURVIVAL_MODE is now on by default.

* * Dying no longer crashes the game.

* * Death seems to work ok.

* * Improve some of the damage code.

* x

* work

* Fixed the Makefile (#54)

* * Finally fix the crack texture appearing to flicker/restart

* * Add VS2010 as an optional target.

Fix build with VS2010 (both windows_vs and xenon_vs).

* * Disable survival mode. Getting ready to merge now!

---------

Co-authored-by: Alexander Argentakis <38327951+MFDGaming@users.noreply.github.com>
2023-08-16 22:32:09 +03:00