82 Commits

Author SHA1 Message Date
Maksim Gamarnik
51cb15bc45 Merge minetest commits / WIP!
Java part WIP, pls, use prev commits!
2016-04-29 10:11:25 +03:00
Maksim Gamarnik
83f9b13d84 Minor update 2016-04-29 09:17:11 +03:00
ShadowNinja
e41673820f Upgrade Android build to Gradle build system
The old Ant build system has been deprecated for a while and new development is focused on Gradle.
I also removed a hardcoded string that lint caught and moved the patch files to a subdirectory.
I left the JNI files in the root directory.
2016-04-28 12:28:42 -04:00
Maksim Gamarnik
efcd9ec28f Part I 2016-04-18 22:40:42 +03:00
Maksim Gamarnik
44f98aa061 ver. 1.1.2.3 2016-04-08 20:43:15 +03:00
Maksim Gamarnik
66d9352586 Remove ogg and item_drop improve 2016-04-01 00:26:03 +03:00
Maksim Gamarnik
758af96b60 Merge release 2016-03-28 20:08:34 +03:00
Maksim Gamarnik
2d64ccab9a Minor update Android, light, remove pageflip, other 2016-03-21 01:38:25 +02:00
Maksim Gamarnik
7039222ef9 ver. 1.2.1.1 2016-03-19 00:16:30 +02:00
Maksim Gamarnik
363afe5a55 Merge branch 'upstream/master' 2016-03-14 11:44:17 +02:00
ShadowNinja
0079887b64 Move AreaStore to util 2016-03-07 16:33:20 -05:00
Maksim Gamarnik
096a01ffef Update Android dependencies, -O3 optimization, remove old ARMv5 config
* Update OpenSSL (thanks @sapier, i use his patch!), Curl and SQLite3.
* Remove old arm config. Almost all phones that use ARMv5 have 1 core and 256-512 RAM, it's about 2-5 FPS.
* Do -O3 optimization for libs and remove -fexpensive-optimizations for Minetest (-O3 includes this! Read gcc docs).
* OpenSSL fix - thanks @sapier, again.
2016-03-05 05:52:45 +01:00
Maksim Gamarnik
25d909bfdc Merge 2016-03-04 15:14:34 +02:00
Maksim Gamarnik
92dff0178a build2 2016-02-24 04:27:46 +02:00
est31
f3f4af3fb9 Fix android build
Android had a linker error since commit:

31e0667a4a53a238d0321194b57b083bd74c0a5b "Add Lua interface to HTTPFetchRequest"

Fixes #3766. Thanks to @MoNTE48 for reporting the bug.
2016-02-23 01:48:52 +01:00
Maksim Gamarnik
7420584c5d test 2016-02-23 02:31:19 +02:00
Maksim Gamarnik
108b5aa536 Fix 2016-02-17 20:34:20 +02:00
Maksim Gamarnik
1f7f17458e Android: final optimization! 2016-02-17 10:16:41 +02:00
Maksim Gamarnik
7b5d77084e Android: SPEEEEED! 2016-02-17 07:13:12 +02:00
Maksim Gamarnik
9abdf23879 Not Minetest, MultiCraft!
Change Minetest on MultiCraft. =)
2016-02-12 05:52:43 +02:00
Maksim Gamarnik
4a1647fcf4 Revert2 2016-02-12 05:10:44 +02:00
Maksim Gamarnik
6f0ffee2d9 revert 2016-02-12 04:35:46 +02:00
grigoriis
98f5e59321 vorbis OK 2016-02-09 22:18:41 +02:00
grigoriis
8abae4e924 add ogg, vorbis 2016-02-09 21:26:55 +02:00
grigoriis
a8c0bedc4f success openal 2016-02-09 16:29:53 +02:00
grigoriis
b84eaceb66 Freetype 2016-02-09 14:58:21 +02:00
Maksim Gamarnik
1ac7f0dbc5 Very big update! MultiCraft 1.1 | Part 1/3
Joystick.
environment.cpp improve (thanks @Bremaweb)
Improving the management interface.
The new font.
Settings to improve performance.
Improvements ellementov size on larger phones.
A lot of small fixes and improvements.
2016-02-07 03:11:12 +02:00
Maksim Gamarnik
af41a0321c Pre-release 2016-02-01 18:11:26 +02:00
Maksim Gamarnik
18c6b747b6 Merge branch 'master' of https://github.com/minetest/minetest 2016-01-31 20:57:03 +02:00
Duane Robertson
3c6b2ffb10 Add Valleys mapgen. 2016-01-14 05:04:29 +00:00
est31
6133b2bc45 Fix android build
Fix android build since commit

696148e29889b2923f926b27f76979454676506d "Fix Event implementation"

by @ShadowNinja.

Fixes #3444. Thanks @kwolekr for pointing out the fix.
2015-12-11 11:24:26 +01:00
Maksim Gamarnik
9251e980f8 Merge and Fix 2015-12-11 11:18:54 +02:00
Maksim Gamarnik
e150219b9d Merge last minetest commits 2015-11-27 12:57:52 +02:00
paramat
76c9abe4c8 Mapgen: Add flat mapgen in hidden form 2015-11-11 09:37:54 +00:00
Maksim Gamarnik
9012ac8f22 Update
Sync all Minetest commits
2015-11-10 13:49:24 +02:00
paramat
d152b55971 Android/Mapgen: Add fractal mapgen file to android makefiles 2015-10-06 22:32:13 +01:00
ShadowNinja
32e4f4b32d Fix Android build of threading sources 2015-08-24 11:20:53 -04:00
ShadowNinja
e4bff8be94 Clean up threading
* Rename everything.
    * Strip J prefix.
    * Change UpperCamelCase functions to lowerCamelCase.
  * Remove global (!) semaphore count mutex on OSX.
  * Remove semaphore count getter (unused, unsafe, depended on internal
    API functions on Windows, and used a hack on OSX).
  * Add `Atomic<type>`.
  * Make `Thread` handle thread names.
  * Add support for C++11 multi-threading.
  * Combine pthread and win32 sources.
  * Remove `ThreadStarted` (unused, unneeded).
  * Move some includes from the headers to the sources.
  * Move all of `Event` into its header (allows inlining with no new includes).
  * Make `Event` use `Semaphore` (except on Windows).
  * Move some porting functions into `Thread`.
  * Integrate logging with `Thread`.
  * Add threading test.
2015-08-23 22:04:06 -04:00
est31
eb3aac20c8 Android: fix horrible libiconv build
Before, our libiconv build was a joke. We first called configure for our own build host system,
then called make, before we executed a Android.mk script we provided as patch. The first "native make"
always failed, and the LIBICONV_LIB file setting in our Makefile didn't match the built one,
resulting in an always-rebuild of iconv.

This commit cleans up this total mess, removes the double-build, and the Android.mk, and properly calls
./configure with the according target platform, and uses a built toolchain.

As we have to deal with the android bug "NDK: Support for prebuild libs with full sonames"
https://code.google.com/p/android/issues/detail?id=55868
as the 2013 patch
https://lists.gnu.org/archive/html/libtool-patches/2013-06/msg00002.html
by Google's David Turner wasn't inside the 2011 libtool, we pass -avoid-version to
libtool.

Thanks to the proper build, wide_to_utf8 works for android now, removing us of the need to disable it.
2015-07-29 15:59:06 +02:00
est31
c30a2d6854 Add AreaStore data structure 2015-07-27 06:42:56 +02:00
RealBadAngel
ffd16e3fec Add minimap feature 2015-06-27 03:42:01 +02:00
est31
572990dcd3 Add utf-8 conversion utilities and re-add intlGUIEditBox 2015-06-13 19:49:55 +02: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
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
Maksim Gamarnik
c7b69b0483 Small change 2015-05-23 14:40:31 +03:00
kwolekr
6c5a6967ec Split ObjDef/ObjDefManager out to objdef.cpp 2015-05-18 22:30:25 -04:00
ShadowNinja
3a8c788880 Add mod security
Due to compatibility concerns, this is temporarily disabled.
2015-05-16 18:32:31 -04: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