Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ xcuserdata/

# Ignore linux/mingw build artifacts.
/build*
/minecraftcpp
/minecraftcpp.exe

# Ignore wasm build artifacts.
/wasm
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
url = https://github.com/gzuidhof/coi-serviceworker.git
[submodule "thirdparty/SDL-src"]
path = thirdparty/SDL2/src
url = https://github.com/ReMinecraftPE/SDL.git
url = https://github.com/nbcraft-org/SDL.git
[submodule "thirdparty/stb_image/include"]
path = thirdparty/stb_image/include
url = https://github.com/nothings/stb.git
Expand Down
6 changes: 3 additions & 3 deletions game/readme.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
NOTE: This is only used as the working directory if you
are running from Visual Studio on MS Windows! If not, the
working directory will be the one you ran minecraftcpp from.
working directory will be the one you ran nbcraft from.

So for instance, if I ran it in a situation like

/home/pi/mcpe/game $ ../minecraftcpp
/home/pi/nbcraft/game $ ../nbcraft

the working directory will be /home/pi/mcpe/game.
the working directory will be /home/pi/nbcraft/game.

If you run it from the shell on windows, the working directory
will be the very one the executable is in.
2 changes: 1 addition & 1 deletion platforms/android/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ static std::string getExternalStorageDir(struct engine* engine)
// This returns a directory path that looks something like the following, which is still
// exposed to the user, therefore we get the benefits of having it exposed, aside from the
// fact that removing the app will delete all your worlds.
// /.../Android/data/com.minecraftcpp/files
// /.../Android/data/org.nbcraft/files
#ifndef USE_EXTERNAL_STORAGE

return std::string(engine->androidApp->activity->externalDataPath);
Expand Down
2 changes: 1 addition & 1 deletion source/client/gui/components/TextBox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef ORIGINAL_CODE

#ifdef USE_NATIVE_ANDROID
#define HANDLE_CHARS_SEPARATELY // faked though, see platforms/android/minecraftcpp/minecraftcpp.NativeActivity/main.cpp
#define HANDLE_CHARS_SEPARATELY // faked though, see platforms/android/main.cpp
#endif

static bool IsInvalidCharacter(char c)
Expand Down