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

..

common.lua

'New' menu

2015-04-23 22:55:42 +03:00

dlg_config_world.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

dlg_create_world.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

dlg_delete_mod.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

dlg_delete_world.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

dlg_rename_modpack.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

gamemgr.lua

Add notice when only minimal is installed

2014-10-28 13:17:14 -04:00

init_old.lua

'New' menu

2015-04-23 22:55:42 +03:00

init_simple.lua

Re-add lost way to debug simple menu on PC

2015-01-04 17:19:25 +01:00

init.lua

debug bulid

2015-04-28 21:50:06 +03:00

modmgr.lua

Save creative_mode and enable_damage setting for each world in world.mt

2015-03-18 09:53:24 +01:00

store.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

tab_credits.lua

Update credits

2015-03-29 21:31:13 +10:00

tab_mods.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

tab_multiplayer.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

tab_server.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

tab_settings.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

tab_simple_main.lua

Merge upstream

2015-04-29 19:59:54 +10:00

tab_singleplayer.lua

main menu tweaks

2015-04-27 22:03:59 +03:00

tab_texturepacks.lua

Remove vertlabels from main menu and relayout a bit

2014-12-13 00:33:38 +01:00

textures.lua

Fix regression dirt texture not beeing default in non cloud menu

2014-06-14 20:51:57 +02:00