49 Commits

Author SHA1 Message Date
Maksim Gamarnik
1fcb1f2fcc MultiCraft 1.0.2 2015-12-27 22:55:32 +02:00
Maksim Gamarnik
8a23d39647 Fix 2015-12-15 14:05:18 +02:00
Maksim Gamarnik
919be490f9 Update
Sync all Minetest commits
2015-11-10 13:49:24 +02:00
Maksim Gamarnik
9247f32e0e LGPL 2.1 to 3.0 on all files 2015-08-14 01:26:28 +03:00
kwolekr
a8e64001ff Replace instances of std::map<std::string, std::string> with StringMap
Also, clean up surrounding code style
Replace by-value parameter passing with const refs when possible
Fix post-increment of iterators
2015-05-31 23:21:19 +10:00
OttoLidenbrock
1d3362ff9e Remove version info top-left for main menu 2015-05-17 00:57:50 +10:00
OttoLidenbrock
4ffa72a2fd 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
sfan5
023fd295d5 Revert the upper-case PROJECT_NAME nonsense that was part of #2402 2015-04-27 16:24:49 +02:00
OttoLidenbrock
27bdbae42a 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
0731f9ed2a 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
e8d51554ae Clean scaling pre-filter for formspec/HUD. 2015-04-01 00:01:05 -04:00
ShadowNinja
2de60ae349 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
Craig Robbins
364c62fa2e Disable double-click -> ESC translation for main menu 2015-03-14 23:41:42 +10:00
Craig Robbins
27791ee1aa For usages of assert() that are meant to persist in Release builds (when NDEBUG is defined), replace those usages with persistent alternatives 2015-03-07 22:41:47 +10:00
Loic Blot
188c15c3d8 Replace std::list to std::vector into tile.cpp (m_texture_trash) and move tile.hpp to src/client/ 2015-03-05 11:59:40 +01:00
kwolekr
87330183bf Fix all warnings and remove -Wno-unused-but-set cflag 2015-01-18 23:29:19 -05:00
sapier
71a289a979 Make hud use fontengine too
Fix non coding style conforming glb_fontengine to g_fontengine
Fix fonts never been deleted due to grabbed to often
2014-11-30 18:06:54 +01:00
sapier
794909cbe8 Implement proper font handling 2014-11-30 17:50:09 +01:00
Kahrl
deeaa9687e Remove m_ext_ptr in GUIFormSpecMenu, replaced by refcount mechanism 2014-10-24 21:14:48 +02:00
ShadowNinja
dbf9e444b1 Split settings into seperate source and header files
This also cleans up settings a bit
2014-09-21 14:39:35 -04:00
BlockMen
f77a8a9408 Allow taking screenshots of formspecs and move message to chat 2014-09-21 19:15:48 +02:00
ShadowNinja
4359238906 Reduce indentation of HTTPFetchOngoing
Also clean up some related things.
2014-09-18 21:54:22 -04:00
sapier
268ff61168 Add support for Android 2.3+
There have been plenty of ppl involved in creating this version.
I don't wanna mention names as I'm sure I'd forget someone so I
just tell where help has been done:
- The partial android versions done by various ppl
- Testing on different android devices
- reviewing code (especially the in core changes)
- testing controls
- reviewing texts

A big thank you to everyone helping this to be completed!
2014-06-29 18:17:56 +02:00
sapier
3cb1cd6cb5 Add separate download timeout to allow download of bigger files or on low bandwidth lines 2014-06-26 20:57:17 +02:00
sapier
c2bc32f83b Fix small memory leaks on shutdown 2014-06-20 19:50:47 +02:00
sapier
ef23657860 Remove ugly curl struct pointer from jsonFetchValue signature 2014-06-19 21:24:53 +02:00
sapier
bb33052a28 Fix regression dirt texture not beeing default in non cloud menu 2014-06-14 20:51:57 +02:00
ShadowNinja
6001210df6 Organize builtin into subdirectories 2014-05-07 17:14:23 -04:00
ShadowNinja
e414ce7d7d Fix code style of async API 2014-04-27 16:15:53 -04:00
ShadowNinja
5805a3dc4c Remove dependency on marshal and many other async changes
This makes a number of changes:
  * Remove the dependency on marshal by using string.dump and loadstring.
  * Use lua_tolstring rather than having Lua functions pass string lengths to C++.
  * Move lua_api/l_async_events.* to cpp_api/s_async.*, where it belongs.
  * Make AsyncWorkerThread a child of ScriptApiBase, this removes some duplicate functionality.
  * Don't wait for async threads to shut down.  (Is this safe?  Might result in corruption if the thread is writing to a file.)
  * Pop more unused items from the stack
  * Code style fixes
  * Other misc changes
2014-04-27 16:15:53 -04:00
sapier
b444ffd39a Fix formspec replacement handling for in game formspecs 2014-04-22 20:59:01 +02:00
sapier
0a7994d3a6 Bunch of small fixes (coding style, very unlikely errors, warning messages) 2014-04-19 11:56:19 +02:00
proller
3116d1d531 Send long announce as POST, show OS in useragent
Add lag reporting to masterserver (average dtime)
StyledWriter  -> FastWriter in masterserver announce
2014-01-07 02:50:45 +04:00
sapier
656c7f2683 Replace any direct curl usage by httpfetch 2013-12-13 18:05:46 +01:00
sapier
723f6e156a Implement search tab and version picker 2013-12-11 23:07:38 +01:00
sapier
b1a9e58d6a Fix modstore/favourites hang by adding asynchronous lua job support 2013-11-29 22:09:14 +01:00
proller
faa3e90283 Correct useragent in http queries
Net struct init
2013-11-06 00:50:32 +04:00
sapier
6e0a806c0c Fix invalid usage of texture->getSize() where actually texture->getOriginalSize() was meant 2013-11-03 23:00:54 +01:00
Kahrl
99ae783310 Show git hash in version string at top left corner of window 2013-09-28 21:30:17 +02:00
Kahrl
fb1f510c3f Change mainmenu texture handling + small misc changes
Texture names must now be escaped in formspec elements image[],
background[], image_button[], image_button_exit[].

Instead of special-case handling of texture loading (and unloading
which was missing) in guiFormSpecMenu.cpp, use the newly created
ISimpleTextureSource interface which is a minimal subset of
ITextureSource. There is an implementation of this interface
used by GUIEngine (MenuTextureSource).

Fix an off-by-one bug in unescape_string; it caused requests for a
texture called "\0".
2013-09-11 00:08:56 +02:00
Kahrl
416531bf72 Allow SIGINT to kill mainmenu again 2013-08-19 15:49:36 +02:00
sapier
281dc6a502 Add translation for main menu
Add engine.gettext() and remove gettext() calls in guiFormspecMenu.cpp
2013-08-17 16:01:43 +02:00
Kahrl
ee90d438b8 Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenu 2013-08-14 21:03:33 +02:00
PilzAdam
448530d6b0 Play sounds/main_menu.ogg in menu 2013-07-28 23:29:03 +02:00
sapier
392d7fbc74 merge mainmenu_helper.lua to misc_helpers.lua 2013-07-22 18:10:00 +02:00
proller
cb3e7ca3b7 Masterserver mods announse, ipv6, better curl errors 2013-07-13 00:19:05 +04:00
sapier
4f7abcbafa Fix many formspec menu bugs 2013-07-07 19:49:52 -04:00
kwolekr
9b0a30f4ea Lua main menu: Fix crash on init lua error, mapgen dropdown index, and new worlds not saving index 2013-07-03 01:25:26 -04:00
sapier
62794622d6 Replace C++ mainmenu by formspec powered one 2013-07-02 19:58:20 -04:00