aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Mapgen: Combine generateBiomes, dustTopNodes, and generateCaveskwolekr2016-05-27
| | | | | This commit condenses the above methods into a single implementation used by V7, V5, Flat, Fractal, and Valleys mapgens and introduces MapgenBasic.
* Move biome calculation to BiomeGenkwolekr2016-05-27
| | | | | | | BiomeGen defines an interface that, given a set of BiomeParams, computes biomes for a given area using the algorithm implemented by that specific BiomeGen. This abstracts away the old system where each mapgen supplied the noises required for biome generation.
* Tell irrlicht if we handle a key or not.est312016-05-26
| | | | | | | | | We can remove the function in MtNativeActivity now as it serves precisely that purpose: to tell irrlicht that we handled the esc key. TODO for later: * Perhaps try to find a more performant container than KeyList
* Fix rollback.txt migrationShadowNinja2016-05-23
| | | | | Broken by b1965ac20922e3722392114bd63a22b403dcbe98. This also prepares the begin and commit statements only once.
* Fix irrlicht version checking macro for tooltip_height calculationCraig Robbins2016-05-24
|
* Move updateTextures and fillTileAttribs to ContentFeaturesEkdohibs2016-05-23
|
* Tolerate packet reordering in the early init processest312016-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where packet reordering made the server give the client two peer ids instead of one. This in turn confused reliable packet sending and made connecting to the server fail. The client usually sends three packets at init: one "dummy" packet consisting of two 0 bytes, and the init packet as well as its legacy counterpart. The last one can be turned off since commit af30183124d40a969040d7de4b3a487feec466e4, but this is of lower relevance for the bug. The relevant part here is that network packet reorder (which is a normal occurence) can make the packets reach the server in different order. If reorder puts the dummy packet further behind, the following would happen before the patch: 1. The server will get one of the init packets on channel 1 and assign the client a peer id, as the packet will have zero as peer id. 2. The server sends a CONTROLTYPE_SET_PEER_ID packet to inform the client of the peer id. 3. The next packet from the client will contain the peer id set by the server. 4. The server sets the m_has_sent_with_id member for the client's peer structure to true. 5. Now the dummy packet arrives. It has a peer id of zero, therefore the server searches whether it already has a peer id for the address the packet was sent from. The search fails because m_has_sent_with_id was set to true and the server only searched for peers with m_has_sent_with_id set to false. 6. In a working setup, the server would assign the dummy packet to the correct peer id. However the server instead now assigns a second peer id and peer structure to the peer, and assign the packet to that new peer. 7. In order to inform the peer of its peer id, the server sends a CONTROLTYPE_SET_PEER_ID command packet, reliably, to the peer. This packet uses the new peer id. 8. The client sends an ack to that packet, not with the new peer id but with the peer id sent in 2. 9. This packet reaches the server, but it drops the ACK as the peer id does not map to any un-ACK-ed packets with that seqnum. The same time, the server still waits for an ACK with the new peer id, which of course won't come. This causes the server to periodically re-try sending that packet, and the client ACKing it each time. Steps 7-9 cause annoyances and erroneous output, but don't cause the connection failure itself. The actual mistake that causes the connection failure happens in 6: The server does not assign the dummy packet to the correct peer, but to a newly created one. Therefore, all further packets sent by the client on channel 0 are now buffered by the server as it waits for the dummy packet to reach the peer, which of course doesn't happen as the server assigned that packet to the second peer it created for the client. This makes the connection code indefinitely buffer the TOSERVER_CLIENT_READY packet, not passing it to higher level code, which stalls the continuation of the further init process indefinitely and causes the actual bug. Maybe this can be caused by reordered init packets as well, the only studied case was where network has reliably reordered the dummy packet to get sent after the init packets. The patch fixes the bug by not ignoring peers where m_has_sent_with_id has been set anymore. The other changes of the patch are just cleanups of unused methods and fields and additional explanatory comments. One could think of alternate ways to fix the bug: * The client could simply take the new peer id and continue communicating with that. This is however worse than the fix as it requires the peer id set command to be sent reliably (which currently happens, but it cant be changed anymore). Also, such a change would require both server and client to be patched in order for the bug to be fixed, as right now the client ignores peer id set commands after the peer id is different from PEER_ID_INEXISTENT and the server requires modification too to change the peer id internally. And, most importantly, right now we guarantee higher level server code that the peer id for a certain peer does not change. This guarantee would have to be broken, and it would require much larger changes to the server than this patch means. * One could stop sending the dummy packet. One may be unsure whether this is a good idea, as the meaning of the dummy packet is not known (it might be there for something important), and as it is possible that the init packets may cause this problem as well (although it may be possible too that they can't cause this). Thanks to @auouymous who had originally reported this bug and who has helped patiently in finding its cause.
* Fix a m_camera not used warning fix pointed by clangLoic Blot2016-05-22
|
* Implement a PostgreSQL backendLoic Blot2016-05-22
|
* Gitignore: ignore idea and ninja filesHybridDog2016-05-22
|
* Item entities: Don't show description as infotextparamat2016-05-22
| | | | | Partially reverts #3547 Infotext remains optional for objects, empty by default
* Fix tooltip height for versions of irrlicht < 1.8.2Craig Robbins2016-05-21
| | | | | | Version 1.8.2 of irrlicht changed the way that IGUIStaticText::getTextHeight() works and since that release properly deals with newlines. From irrlicht changes.txt for 1.8.2, "IGUIStaticText::getTextHeight returns now the correct height for texts with newlines even WordWrap is not set."
* Implement DatabaseException for databasesnerzhul2016-05-17
|
* Add on_punchnode callbackWayward One2016-05-17
|
* DB::loadBlock copy removal & DB backend cleanupLoic Blot2016-05-17
| | | | | * Remove the copy from db::loadBlock by using a pointer to the destination * cleanup db backend, the child backend doesn't have to set their functions as virtual
* Really fix ncurses lookup on Arch Linuxsfan52016-05-16
| | | | | Commit 27ee8d8943080a5dd735c9faa47c726604bafdff forgot to add the paths without ncursesw/ to the find_path() call
* Android: enable parallelism for main target tooest312016-05-16
| | | | | | | | | This adds to the changes that commit 98d16e0d9a945f5f48462c05f26ae4bde2db5731 "Android: Tell make about sub-makes to speed up build" did, and enables parallel builds for minetest itself as well.
* Documentation: Remove incorrect and excessive mapgen flags textparamat2016-05-16
|
* Continue with 0.4.14-devsfan52016-05-15
|
* Bump version to 0.4.14sfan52016-05-15
|
* Android: Re-add button to remove singleplayer worldest312016-05-14
| | | | Fixes #4120.
* Fix android build by fixing patch line endingsest312016-05-14
|
* Fix locked hardware buttons on AndroidMaksim Gamarnik2016-05-14
| | | | | | | | | | | | | | | | | Fixes #2122 Fixes #1454 Addendum (est31) According from its docs in android_native_app_glue.h (from the NDK), the onInputEvent should "Return 1 if you have handled the event, 0 for any default dispatching". Before, we always returned 1, meaning we blocked all hardware keys to be given to the OS. This broke the volume keys and has caused #2122 and #1454. Although it bases on lots of guesswork, it can probably safely be said that CGUIEnvironment::postEventFromUser returns true if the event was handled, and false if not. Therefore, set the status variable depending on what postEventFromUser returned.
* Mainmenu: don't show change keys dialog on androidest312016-05-13
| | | | | | | | | | | | The change keys dialog can't be left. It doesn't make much sense to show it on Android in the first place, therefore disable it, just like commit aed70cb0b652d6cb2272e7b94cd56671b3df6239 'Disable sound and key binding settings in "pause" menu on android' has disabled it for the esc menu. Fixes #4115.
* Fix #4111 ("Provided world path doesn't exist" if choosing singleplayer on ↵Rui2016-05-13
| | | | | | first run") Bug and whitespace error fixed (Zeno)
* Android: download deps using httpsest312016-05-12
| | | | Its more secure, and some pages even redirect to the https version.
* Android: update openssl to 1.0.2hest312016-05-12
|
* Fix typo in the info printed by --versionCraig Robbins2016-05-11
|
* Add platform name to --version informationCraig Robbins2016-05-11
|
* Mapgen V6: Synchronize spflags with defaultsettingskwolekr2016-05-10
| | | | | This fixes an issue where trees are omitted from Mapgen V6 maps on configurations that explicitly defined the mgv6_spflags setting.
* README: Update Fedora dependencies listJohnny2016-05-11
| | | | Edited packages to reflect correct packages
* Translated using Weblate (Spanish)Diego Martínez2016-05-10
| | | | | | Currently translated at 56.8% (504 of 887 strings) This is a merger of two commits.
* Translated using Weblate (Spanish)Lucas Montenegro2016-05-10
| | | | | | Currently translated at 51.5% (457 of 887 strings) This is a merger of two commits.
* Translated using Weblate (Spanish)ShadowNinja2016-05-10
| | | | Currently translated at 51.5% (457 of 887 strings)
* Translated using Weblate (Ukrainian)Fixer2016-05-10
| | | | | | Currently translated at 38.4% (341 of 887 strings) This is a merger of two commits.
* Translated using Weblate (Lojban)senpi2016-05-10
| | | | Currently translated at 10.5% (94 of 887 strings)
* Translated using Weblate (Italian)Emon Omen2016-05-10
| | | | | | Currently translated at 100.0% (887 of 887 strings) This is a merger of three commits.
* Translated using Weblate (Japanese)BreadW2016-05-10
| | | | Currently translated at 51.5% (457 of 887 strings)
* Translated using Weblate (French)Yvan YR2016-05-10
| | | | Currently translated at 90.7% (805 of 887 strings)
* Translated using Weblate (Japanese)BreadW2016-05-10
| | | | Currently translated at 50.6% (449 of 887 strings)
* Translated using Weblate (Hungarian)Kisbenedek Márton2016-05-10
| | | | Currently translated at 75.7% (672 of 887 strings)
* Translated using Weblate (Danish)Thomas Wagner Nielsen2016-05-10
| | | | | | Currently translated at 27.6% (245 of 887 strings) This is a merger of two commits.
* Translated using Weblate (Chinese (China))Claybiokiller2016-05-10
| | | | Currently translated at 73.9% (656 of 887 strings)
* Translated using Weblate (German)Wuzzy2016-05-10
| | | | | | Currently translated at 100.0% (887 of 887 strings) This is a merger of three commits.
* Translated using Weblate (Dutch)Auke Kok2016-05-10
| | | | | | Currently translated at 89.6% (795 of 887 strings) This is a merger of three commits.
* Translated using Weblate (Dutch)Tobyplowy2016-05-10
| | | | Currently translated at 85.6% (760 of 887 strings)
* Lua_api.txt: Fix documentation for facedir rotationparamat2016-05-10
|
* Add [resize texture modifier Resizes the texture to the given dimensions.SmallJoker2016-05-09
|
* Update credits tabest312016-05-09
|
* Defaultsettings/Android: Increase 'max block generate distance' to 3paramat2016-05-08
|