79 Commits

Author SHA1 Message Date
Bektur Mambetov
210822e4bb unused timer have been removed 2015-06-02 15:25:52 +03:00
Maksim Gamarnik
6d8a181f19 Remove MtNativeActivity 2015-06-01 09:48:26 +03:00
Maksim Gamarnik
83da0cce6f rename java package 2015-06-01 00:20:48 +03:00
kwolekr
49087eab2f Split ObjDef/ObjDefManager out to objdef.cpp 2015-05-31 23:21:12 +10:00
ShadowNinja
794d3635d4 Add mod security
Due to compatibility concerns, this is temporarily disabled.
2015-05-31 23:17:44 +10:00
est31
48db412bd5 Fix libgmp for Android
Android terminated immediately after start since commit
181f7baa453c58d4070de7196fd74663110946a8
because library wasn't loaded, and libminetest.so required
libgmp.so.10 instead of libgmp.so.

The second issue has been solved by the linker flags.
2015-05-31 23:16:07 +10:00
est31
d39358f9d2 Make early protocol auth mechanism generic, and add SRP
Adds everything needed for SRP (and everything works too),
but still deactivated, as protocol v25 init packets aren't final yet.
Can be activated by changing the LATEST_PROTOCOL_VERSION header to 25
inside networkprotocol.h.
2015-05-31 23:14:05 +10:00
est31
8135f89e21 Add LibGMP
Uses system provided libgmp if found, if not it falls back to mini-gmp.

Conflicts:
	README.txt
	build/android/Makefile
2015-05-31 23:13:54 +10:00
Bektur Mambetov
6d9fe6e728 Optimization. Duplicate code in dialogs removed 2015-05-28 12:26:55 +03:00
berkut
456a0b4c26 instruction updated 2015-05-27 21:51:42 +03:00
Bektur Mambetov
3df382f825 transparent dialog. Some renaming. Preferene big optimization 2015-05-27 19:27:49 +03:00
Maksim Gamarnik
c7b69b0483 Small change 2015-05-23 14:40:31 +03:00
OttoLidenbrock
3df9f38901 Update android makefile 2015-05-23 21:08:43 +10:00
OttoLidenbrock
6a18586475 Fix previous Makefile commit (it didn't work) 2015-05-15 21:54:05 +10:00
Maksim Gamarnik
86720e755d New SQLite on Android build 2015-05-15 14:47:40 +03:00
OttoLidenbrock
47b38aa9c9 Only include files.zip in APK 2015-05-15 21:45:05 +10:00
OttoLidenbrock
14f92a18de add ver.txt 2015-05-15 21:16:20 +10:00
OttoLidenbrock
ff09365cd0 Remove usage of pushd/popd from android makefile so Debian can work (assuming zip is installed) 2015-05-15 20:49:54 +10:00
OttoLidenbrock
ca5f746c50 Update English in strings.xml 2015-05-15 19:06:20 +10:00
kwolekr
a33092eda6 Tests: Add schematic unittests
Improve schematic file-saving interface
Add ability to create temporary test files
2015-05-13 17:01:33 +10:00
kwolekr
ebbaba6907 Tests: Add NodeResolver unittests
Minor misc. NodeResolver cleanups
Prefix faux content type constants for testing with t_ to avoid
confusion or name collisions
2015-05-13 17:00:53 +10:00
Maksim Gamarnik
6d3dc6ce06 New MainMenu, update WversionManager, Makefile change
New MainMenu by 4aiman
WVersionManager - 1.3
Makefile - rename output apk
2015-05-12 10:59:17 +03:00
OttoLidenbrock
e8a7a9eb09 Get rid of PO files 2015-05-10 20:46:25 +10:00
OttoLidenbrock
9c43faae05 Fix bug with Zip file creation and extraction 2015-05-10 19:23:35 +10:00
OttoLidenbrock
a497e87a96 Fix bugs with package name directory and zip file 2015-05-10 19:00:55 +10:00
Maksim Gamarnik
102e9bea51 Wvm add 2015-05-10 18:03:54 +10:00
Maksim Gamarnik
0b51656f9b Fix merge java part 2015-05-10 18:03:54 +10:00
OttoLidenbrock
109b60c0c7 Merge java part 2015-05-10 18:03:54 +10:00
OttoLidenbrock
f369c99db4 Update makefile, default game and create Files.zip 2015-05-10 18:01:55 +10:00
kwolekr
273e1e28b0 Tests: Add ObjDef unittests 2015-05-04 16:52:10 +10:00
kwolekr
e01edfe9ef Fix MSVC compatibility
Make sure to include random unittests in android builds, too
Use SWAP() macro
Ensure that negative ranges are tested as well in random unittests
2015-05-04 16:51:51 +10:00
Maksim Gamarnik
d91f322e25 Update Makefile
Update CURL,
Change default game name
Min APP_PLATFORM = 16 (JB 4.1).
2015-05-01 14:32:08 +03:00
OttoLidenbrock
c842f924c3 Change version again 2015-05-01 20:51:51 +10:00
OttoLidenbrock
17a5ed31b2 Stop using broken github hash
Version is now MultiCraft 1.0.1
(ANDROID_VERSION_CODE 101)
2015-05-01 20:07:45 +10:00
OttoLidenbrock
d649afa044 Merge upstream
Conflicts:
	builtin/mainmenu/tab_simple_main.lua
	src/client/clientlauncher.cpp
	src/game.cpp
	src/guiEngine.cpp
2015-04-29 19:59:54 +10:00
kwolekr
7220ca906d Tests: Modularize unit testing
Split unit tests into separate files under src/unittest/
Give better unittest diagnostics
Clean up some code
2015-04-26 15:08:54 -04:00
OttoLidenbrock
8cf938c928 Change project name and version (not android yet)
Update package Vendor and Email and version number
Change version to 1.0.1

Partially change project name

Changed android version code to 1
2015-04-27 00:54:48 +10:00
Craig Robbins
9527984dbc Move globals from main.cpp to more sane locations
Move debug streams to log.cpp|h

Move GUI-related globals to clientlauncher

Move g_settings and g_settings_path to settings.cpp|h

Move g_menuclouds to clouds.cpp|h

Move g_profiler to profiler.cpp|h
2015-04-01 23:04:25 +10:00
Aaron Suen
6d61375cc7 Clean scaling pre-filter for formspec/HUD. 2015-04-01 00:01:05 -04:00
Craig Robbins
5ee0d8ac81 Fix Android build-related bugs
E.g. Sound and freetype always being disabled, redefinition of pre-processor directives
2015-03-29 22:27:01 +10:00
ShadowNinja
93fcab952b Clean up and tweak build system
* Combine client and server man pages.
  * Update unit test options and available databases in man page.
  * Add `--worldname` to man page.
  * Fix a bunch of places where `"Minetest"` was used directly instead of `PROJECT_NAME`.
  * Disable server build by default on all operating systems.
  * Make `ENABLE_FREETYPE` not fail if FreeType isn't found.
  * Enable LevelDB, Redis, and FreeType detection by default.
  * Remove the `VERSION_PATCH_ORIG` hack.
  * Add option to search for and use system JSONCPP.
  * Remove broken LuaJIT version detection.
  * Rename `DISABLE_LUAJIT` to `ENABLE_LUAJIT`.
  * Rename `minetest_*` variables in `version.{h,cpp}` to `g_*`.
  * Clean up style of CMake files.
2015-03-27 15:00:48 -04:00
est31
15d9cd3a6f Fix Android build on 32 bit
Remove the --system=linux-x86_64 which isn't neccessary on 64 bit,
as, when given no --system parameter, the standalone-toolchain.sh script
figures out the platform on itself. Naturally, the hardcoded setting broke
android building on 32 bit systems.
2015-03-23 14:11:39 +10:00
Loic Blot
94b3950958 Remove Android makefile ugly make -j hack 2015-03-17 15:48:48 +01:00
Loic Blot
ceac41ed6e Bump android version code 2015-03-16 20:37:31 +01:00
Loic Blot
b560294050 Rename packethandler/{client,server}.cpp to {client,server}packethandler.cpp
* Requested by @Zeno-
* Approved by @nerzhul
2015-03-16 10:19:19 +01:00
Loic Blot
2bc0165652 Android Makefile update backported from stable-0.4 with minor changes 2015-03-15 11:21:34 +01:00
Loic Blot
155116852a Android: Backport changes from stable-0.4 2015-03-14 19:59:14 +01:00
Loic Blot
aa085bf222 Android: fix package name in JAVA sources 2015-03-14 18:52:31 +01:00
Loic Blot
783e15f389 Fix package name in AndroidManifest.xml 2015-03-14 18:41:36 +01:00
Loic Blot
1488542968 AndroidManifest.xml version bump 2015-03-14 18:28:02 +01:00