7642 Commits

Author SHA1 Message Date
Ian Giestas Pauli
7a84b04211 Translated using Weblate (Portuguese (Brazil))
Currently translated at 71.3% (617 of 865 strings)

This is a merger of two commits.
2016-05-01 01:13:21 +02:00
Jean-Patrick G
276d0593d4 Translated using Weblate (French)
Currently translated at 94.1% (814 of 865 strings)

This is a merger of two commits.
2016-04-30 23:52:11 +02:00
ShadowNinja
d5abbbce24 Fix POSIX C++11 build
I broke this in 46fd114e9a4e05b74576dce682e24357363298e7.
2016-04-30 13:41:04 -04:00
berkut
b1d9585438 Migrate to Gradle build system 2016-04-30 17:03:00 +03:00
Craig Robbins
abbf22dff8 Fix prepreprocessor error in thread.h (related to C++11 threads) 2016-04-30 12:29:52 +10:00
Maksim Gamarnik
798495681c CRLF fix 2016-04-29 11:47:13 +03:00
Maksim Gamarnik
d5854e5cf7 Merge minetest commits / WIP!
Java part WIP, pls, use prev commits!
2016-04-29 10:11:25 +03:00
Maksim Gamarnik
74a0372d33 Minor update 2016-04-29 09:17:11 +03:00
Maksim Gamarnik
4b54a4bd88 Update credits tab 2016-04-29 09:11:16 +03:00
paramat
2942a16393 Mapgen: Make 3D noise tunnels' width settable
Correct parameter names mg_valleys to mgvalleys
Remove biome NoiseParams from MapgenValleysParams
Improve format of parameter code
2016-04-28 23:36:19 -04:00
ShadowNinja
138f677812 Fix race on thread creation
This often broke the threading tests on OSX.
2016-04-28 13:21:46 -04:00
ShadowNinja
9459112457 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
tenplus1
0d64d63591 Avoid teleporting player if /teleport coords are out-of-range 2016-04-29 00:00:35 +10:00
kilbith
14c82f432b Android menu: Unified serverlist 2016-04-28 07:19:31 +01:00
rubenwardy
21e176b7a0 Builtin: Add basic_privs setting 2016-04-28 07:19:07 +01:00
SmallJoker
8cf828a818 Mainmenu: Standardize the menu button order and sizes 2016-04-28 07:16:58 +01:00
obneq
04af4425fb Handle particle spawners in env and delete expired ids
Rebased by Zeno (2016-04-2016)
2016-04-28 02:09:36 +10:00
Maksim Gamarnik
be391fde1a Android: Update dependencies, GMP was required as a dependency 2016-04-26 10:17:04 +01:00
Xunto
b96bde331f Inventory: Make ItemStack with different metadata not stackable 2016-04-26 10:16:20 +01:00
SmallJoker
6569e39099 tile.cpp: Automatically upscale lower resolution texture 2016-04-25 06:39:32 +01:00
gregorycu
c0b78e965e Make GUIEngine use pause_fps_max not fps_max 2016-04-24 17:40:16 +10:00
Ekdohibs
ce488ea7f4 Escape more strings: formspecs, item descriptions, infotexts...
Also, change the escape character to the more standard \x1b
Thus, it can be used in the future for translation or colored text,
for example.
2016-04-24 03:54:11 +10:00
Xunto
f3f23ad0de Fix bug that was leading to oversized tooltips containing multiline text when it have multiple lines 2016-04-23 21:12:53 +10:00
ubulem
508b7f0801 latest changes 2016-04-22 19:26:56 +03:00
Ekdohibs
1893eec3cc Fix mainmenu code downloading the public serverlist twice.
Also, fix a nil error that can happen sometimes in
menu_handle_key_up_down
2016-04-22 23:39:54 +10:00
est31
eea02e1119 CONTRIBUTING: disallow signed git commits
They break bzr-git, and bzr-git breaks the Minetest PPAs.
2016-04-22 00:46:07 +02:00
Maksim Gamarnik
335296e0e6 Merge 2016-04-21 13:20:11 +03:00
Ekdohibs
ed545595a8 Make logging use a fixed-length buffer to avoid race conditions.
Previously, race conditions occurred inside logging, that caused
segfaults because a thread was trying to use an old pointer that
was freed when the string was reallocated. Using a fixed-length buffer
avoids this, at the cost of cutting too long messages over seveal lines.
2016-04-21 10:15:17 +01:00
paramat
16b0d31a1f Biomes: Make dust fallback 'ignore' to fix y = 63 lighting
The shadow bug at y = 63 was caused by dark air being placed as dust,
when the biome dust was unspecified it was falling back to 'air'
In dustTopNodes only dust == 'ignore' will disable dust placement
2016-04-21 10:15:12 +01:00
paramat
96683969f2 Textures: Replace menu background fallback dirt_bg.png with empty sky texture 2016-04-21 10:15:05 +01:00
Auke Kok
447e6d4160 Fix timer initialization.
This fixes the problem that the first timer tick is an
overrun and causes all timers to expire immediately.

replaces #4003
2016-04-21 10:14:59 +01:00
Maksim Gamarnik
52abfb0219 Part III 2016-04-21 01:53:17 +03:00
kilbith
9c4e903fe8 Mainmenu: Code cleaning 2016-04-20 21:31:40 +10:00
kilbith
1a4731e806 Mainmenu: Unify favorite servers with main serverlist 2016-04-20 21:31:40 +10:00
paramat
40574a3bac Mgv7: Combine mountain terrain generation with base terrain generation
Previous mountain terrain generation was by necessity placing
stone in air, this was removing air from any overgenerated
structures such as tunnels, dungeons and large caves
Moving it into the base terrain generation loop ensures that
only 'ignore' is replaced

generateRidgeTerrain: only return if node_max.Y < water_level - 16
Previously, if water level was set a few nodes above a mapchunk
border the river channel was only partially excavated
2016-04-20 06:51:20 +01:00
Auke Kok
43673c52ad falling: walk 4 additional diagonally down directions.
This seems very little cost and matches the old behavior more
closely. This will cause some more falling nodes to get added
to falling clusters. With the efficiency of the algorithm, this
really doesn't do much damage.
2016-04-20 06:51:11 +01:00
Maksim Gamarnik
05b9ece1c3 Part II 2016-04-18 23:16:34 +03:00
Maksim Gamarnik
2bc88a95a4 Part I 2016-04-18 22:40:42 +03:00
Maksim Gamarnik
37fc3dbe6a Merge remote-tracking branch 'upstream1/master' 2016-04-16 14:56:15 +03:00
Maksim Gamarnik
6dce059ec6 . 2016-04-16 13:36:34 +03:00
Maksim Gamarnik
193a60e3c9 Fix 2016-04-16 13:35:47 +03:00
est31
ca4f6936ec Mainmenu: Still support favorites if send_pre_v25_init is disabled
@SmallJoker has noted a bug that servers from the (local) main menu
favorites list can't be opened.

This commit fixes the bug by disabling any main menu based protocol
checks for servers from the favorite list.

Also, it fixes a second bug that happens when a server from the
public serverlist doesn't send its supported protocol versions,
most likely because its running a minetest older than commit [1].
Then we have shown an error msg that the server has enforced
one specific protocol version. This was most likely not the case.

Of course, we can't do anything better than do an assumption on
the protocol versions if they are not known. That assumption
should however be closest to the most often occuring case as
possible.

Also, some little cleanups.

[1]: 5a0ed780f56a5225b3d7c5f64099586e390e5f39 "Server: announce MIN/MAX protocol version supported to serverlist. Client: check serverlist"
2016-04-15 14:40:31 +02:00
SmallJoker
638c2c543d mainmenu: Tidy up logic in is_server_protocol_compat() (#3997)
Apply de morgan to simplify the logic.
2016-04-15 14:37:09 +02:00
TriBlade9
b560d502ed Add option to disable entity selectionboxes. (#3992)
Setting only loaded once, default value is to enable them.
2016-04-14 11:20:11 +02:00
Maksim Gamarnik
cca8bb00b0 Ok, test @asl97 idea 2016-04-12 21:32:43 +03:00
Maksim Gamarnik
6d3bdc5a7d Merge 2016-04-12 21:28:50 +03:00
rubenwardy
3f47cc7f5d Fix inventory hud scaling 2016-04-12 23:10:28 +10:00
paramat
362430e603 Mgv7, mgflat, mgfractal: Tunnel generation code optimisation 2016-04-12 06:58:04 +01:00
paramat
b7c9ca4488 Mgv5: Optimise tunnels, add biome material in entrances
Place biome top node on tunnel entrance floor
Instead of doing nothing at node_max.Y + 1 use 1-down
overgeneration for tunnel generation and noisemaps
2016-04-12 04:16:15 +01:00
paramat
7aba3ffde3 Mgvalleys: Don't let cavegen place biome nodes everywhere
Fix use of 'air_above' bool so that biome
nodes are only placed in tunnel floors
Minor code improvements
'Continue' when massive cave air is placed
2016-04-12 04:16:08 +01:00