Skip to content
Snippets Groups Projects
Commit c258d2f5 authored by DarkGod's avatar DarkGod
Browse files

Increased font size on main menu

parent 4e2d1a4c
No related branches found
No related tags found
No related merge requests found
......@@ -142,6 +142,22 @@ Now go and have some fun!]]
-- Setup FPS
core.game.setFPS(config.settings.display_fps)
self:triggerHook{"Boot:runEnd"}
if not config.settings.upgrades or not config.settings.upgrades.v1_0_5 then
if not config.settings.background_saves or config.settings.tome.save_zone_levels then
Dialog:simpleLongPopup("Upgrade to 1.0.5", [[The way the engine manages saving has been reworked for v1.0.5.
The background saves should no longer lag horribly and as such it is highly recommended that you use the option. The upgrade turned it on for you.
For the same reason the save per level option should not be used unless you have severe memory problems. The upgrade turned it off for you.
]], 400)
end
self:saveSettings("upgrades", "upgrades.v1_0_5 = true\n")
self:saveSettings("background_saves", "background_saves = true\n")
self:saveSettings("tome.save_zone_levels", "tome.save_zone_levels = false\n")
config.settings.background_saves = true
config.settings.tome.save_zone_levels = false
end
end
function _M:newGame()
......
......@@ -89,8 +89,8 @@ end
function _M:uiLogin(uis)
local str = Textzone.new{auto_width=true, auto_height=true, text="#GOLD#Online Profile"}
local bt = Button.new{text="Login", width=50, fct=function() self:login() end}
self.c_login = Textbox.new{title="Username: ", text="", chars=20, max_len=20, fct=function(text) self:login() end}
self.c_pass = Textbox.new{title="Password: ", size_title=self.c_login.title, text="", chars=20, max_len=20, hide=true, fct=function(text) self:login() end}
self.c_login = Textbox.new{title="Username: ", text="", chars=16, max_len=20, fct=function(text) self:login() end}
self.c_pass = Textbox.new{title="Password: ", size_title=self.c_login.title, text="", chars=16, max_len=20, hide=true, fct=function(text) self:login() end}
uis[#uis+1] = {left=10, bottom=bt.h + self.c_login.h + self.c_pass.h + str.h, ui=Separator.new{dir="vertical", size=self.iw - 20}}
uis[#uis+1] = {hcenter=0, bottom=bt.h + self.c_login.h + self.c_pass.h, ui=str}
......@@ -102,7 +102,7 @@ end
function _M:uiStats(uis)
self.logged_url = "http://te4.org/users/"..profile.auth.page
local str1 = Textzone.new{auto_width=true, auto_height=true, text="#GOLD#Online Profile#WHITE#"}
local str2 = Textzone.new{auto_width=true, auto_height=true, text="View online: #LIGHT_BLUE##{underline}#"..self.logged_url.."#LAST##{normal}#", fct=function() util.browserOpenUrl(self.logged_url) end}
local str2 = Textzone.new{auto_width=true, auto_height=true, text="#LIGHT_BLUE##{underline}#"..self.logged_url.."#LAST##{normal}#", fct=function() util.browserOpenUrl(self.logged_url) end}
local logoff = Textzone.new{text="#LIGHT_BLUE##{underline}#Logout", auto_height=true, width=50, fct=function() self:logout() end}
......
......@@ -29,6 +29,15 @@ local ActorTemporaryEffects = require "engine.interface.ActorTemporaryEffects"
local Birther = require "engine.Birther"
local UIBase = require "engine.ui.Base"
UIBase.font = core.display.newFont("/data/font/DroidSans.ttf", 16)
UIBase.font_bold = core.display.newFont("/data/font/DroidSans.ttf", 16)
UIBase.font_mono = core.display.newFont("/data/font/DroidSansMono.ttf", 16)
UIBase.font_bold:setStyle("bold")
UIBase.font_h = UIBase.font:lineSkip()
UIBase.font_bold_h = UIBase.font_bold:lineSkip()
UIBase.font_mono_w = UIBase.font_mono:size(" ")
UIBase.font_mono_h = UIBase.font_mono:lineSkip()+2
local n = core.noise.new(2)
_2DNoise = n:makeTexture2D(64, 64)
......
......@@ -121,7 +121,7 @@ vec2 snoise2(vec3 pos)
float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
{
//firewall
float delta = 0;
float delta = 0.0;
// pos.y += (1.0 - pos.y) * 0.5;
//pos.y += 0.5;
pos.y /= stretchMult;
......
......@@ -393,7 +393,7 @@ function _M:generateListMisc()
local list = {}
local i = 0
local zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=string.toTString"Saves in the background, allowing you to continue playing. If disabled you will have to wait until the saving is done, but it will be faster.#WHITE#"}
local zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=string.toTString"Saves in the background, allowing you to continue playing.\n#LIGHT_RED#Disabling it is not recommended.#WHITE#"}
list[#list+1] = { zone=zone, name=string.toTString"#GOLD##{bold}#Save in the background#WHITE##{normal}#", status=function(item)
return tostring(config.settings.background_saves and "enabled" or "disabled")
end, fct=function(item)
......@@ -402,7 +402,7 @@ function _M:generateListMisc()
self.c_list:drawItem(item)
end,}
local zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=string.toTString"Forces the game to save each level instead of each zone.\nThis makes it save more often but the game will use less memory when deep in a dungeon.\n\n#LIGHT_RED#Changing this option will not affect already visited zones.\n*THIS DOES NOT MAKE A FULL SAVE EACH LEVEL*.#WHITE#"}
local zone = Textzone.new{width=self.c_desc.w, height=self.c_desc.h, text=string.toTString"Forces the game to save each level instead of each zone.\nThis makes it save more often but the game will use less memory when deep in a dungeon.\n\n#LIGHT_RED#Changing this option will not affect already visited zones.\n*THIS DOES NOT MAKE A FULL SAVE EACH LEVEL*.\n#LIGHT_RED#Disabling it is not recommended#WHITE#"}
list[#list+1] = { zone=zone, name=string.toTString"#GOLD##{bold}#Zone save per level#WHITE##{normal}#", status=function(item)
return tostring(config.settings.tome.save_zone_levels and "enabled" or "disabled")
end, fct=function(item)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment