diff --git a/game/engines/default/engine/init.lua b/game/engines/default/engine/init.lua index a3b3afb8ec9e1cd455b63a390596c4b16df0f65d..133fa95342fafa367b9a26f56607fe061e75600c 100644 --- a/game/engines/default/engine/init.lua +++ b/game/engines/default/engine/init.lua @@ -139,6 +139,9 @@ core.display.setGamma(config.settings.gamma_correction / 100) if not config.settings.fbo_active then core.display.disableFBO() print("Disabling FBO") end if not config.settings.shaders_active then core.shader.disable() print("Disabling Shaders") end +-- Disable webcore if no fbo, it probably means the card wont handle will the huge buffers anyway +if not core.display.FBOActive() then core.webview = nil end + -- Webcore local request resolver dofile("/engine/webcore.lua") diff --git a/game/engines/default/modules/boot/dialogs/MainMenu.lua b/game/engines/default/modules/boot/dialogs/MainMenu.lua index 40dd4c9f522c7c964f53e6b1c463b6db78713e0a..b19d5e9d29bdfa49c21036abcc651ce9b402bd02 100644 --- a/game/engines/default/modules/boot/dialogs/MainMenu.lua +++ b/game/engines/default/modules/boot/dialogs/MainMenu.lua @@ -57,7 +57,19 @@ function _M:init() l[#l+1] = {name="Credits", fct=function() game:registerDialog(require("mod.dialogs.Credits").new()) end} l[#l+1] = {name="Exit", fct=function() game:onQuit() end} if config.settings.cheat then l[#l+1] = {name="Reboot", fct=function() util.showMainMenu() end} end - if config.settings.cheat then l[#l+1] = {name="webtest", fct=function() util.browserOpenUrl("http://tometips.github.io/#talents/") end} end + if config.settings.cheat then l[#l+1] = {name="webtest", fct=function() + local tween = require "tween" + local i = 1 + local function fct() + local d = Dialog:webPopup("http://google.com/") + d.__showup = nil + tween(1, {a=1}, {a=2}, 'linear', function() + game:unregisterDialog(d) + if i < 500 then i = i + 1 return fct() end + end) + end + fct() + end} end -- if config.settings.cheat then l[#l+1] = {name="webtest", fct=function() util.browserOpenUrl("asset://te4/html/test.html") end} end self.c_background = Button.new{text=game.stopped and "Enable background" or "Disable background", fct=function() self:switchBackground() end}