epervier/epervier-old
1
0
Fork 0
Code Issues 30 Pull requests Releases Wiki Activity

Rebase on Radiance #71

Merged
kazhnuz merged 20 commits from wip/radiance-rebase into master 2022-08-12 10:37:35 +02:00
Conversation 0 Commits 20 Files changed 145 +16 -16
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2974d94df4 - Show all commits

3
.vscode/settings.json vendored
View file

@ -8,5 +8,8 @@
"core", "core",
"scenes", "scenes",
"game" "game"
],
"Lua.diagnostics.disable": [
"redundant-parameter"
] ]
} }

8
examples/scenes/basic/test_menus/init.lua
View file

@ -24,10 +24,10 @@
local Scene = require "birb.modules.scenes" local Scene = require "birb.modules.scenes"
local TestScene = Scene:extend() local TestScene = Scene:extend()
local MenuType = require "birb.modules.menusystem.menus.listbox" local MenuType = require "birb.modules.gui.menus.listbox"
local MenuType2 = require "birb.modules.menusystem.menus.flowbox" local MenuType2 = require "birb.modules.gui.menus.flowbox"
local MenuType3 = require "birb.modules.menusystem.menus.grid" local MenuType3 = require "birb.modules.gui.menus.grid"
local Widget = require "birb.modules.menusystem.menus.widgets" local Widget = require "birb.modules.gui.menus.widgets"
local MenuWidget = Widget.Text:extend() local MenuWidget = Widget.Text:extend()

4
examples/scenes/gameplay/plateform/pause.lua
View file

@ -1,5 +1,5 @@
local ListMenu = require "birb.modules.menusystem.menus.listbox" local ListMenu = require "birb.modules.gui.menus.listbox"
local Widget = require "birb.modules.menusystem.menus.widgets" local Widget = require "birb.modules.gui.menus.widgets"
local PauseMenu = ListMenu:extend() local PauseMenu = ListMenu:extend()

5
examples/scenes/mainmenu/init.lua
View file

@ -24,10 +24,7 @@
local Scene = require "birb.modules.scenes" local Scene = require "birb.modules.scenes"
local MainMenu = Scene:extend() local MainMenu = Scene:extend()
local ListBox = require "birb.modules.menusystem.menus.listbox" local TextMenu = require "birb.modules.gui.textmenu"
local Widget = require "birb.modules.menusystem.menus.widgets"
local TextMenu = require "birb.modules.menusystem.textmenu"
local SceneWidget = TextMenu.baseWidgets.Base:extend() local SceneWidget = TextMenu.baseWidgets.Base:extend()
local ExitWidget = TextMenu.baseWidgets.Base:extend() local ExitWidget = TextMenu.baseWidgets.Base:extend()

6
examples/scenes/menus/inventory/init.lua
View file

@ -24,9 +24,9 @@
local Scene = require "birb.modules.scenes" local Scene = require "birb.modules.scenes"
local Inventory = Scene:extend() local Inventory = Scene:extend()
local HListBox = require "birb.modules.menusystem.menus.hlistbox" local HListBox = require "birb.modules.gui.menus.hlistbox"
local FloxBox = require "birb.modules.menusystem.menus.flowbox" local FloxBox = require "birb.modules.gui.menus.flowbox"
local Widget = require "birb.modules.menusystem.menus.widgets" local Widget = require "birb.modules.gui.menus.widgets"
local InventoryWidget = Widget.Text:extend() local InventoryWidget = Widget.Text:extend()
local ItemWidget = Widget.Text:extend() local ItemWidget = Widget.Text:extend()

4
examples/scenes/menus/options/menu.lua
View file

@ -1,7 +1,7 @@
local TextMenu = require "birb.modules.menusystem.textmenu" local TextMenu = require "birb.modules.gui.textmenu"
local OptionMenu = TextMenu:extend() local OptionMenu = TextMenu:extend()
local consts = require "examples.scenes.menus.options.consts" local consts = require "scenes.menus.options.consts"
function OptionMenu:new(font) function OptionMenu:new(font)
local screenWidth, _ = core.screen:getDimensions() local screenWidth, _ = core.screen:getDimensions()

2
examples/scenes/menus/options/widgets.lua
View file

@ -23,7 +23,7 @@
local widgets = {} local widgets = {}
local Widget = require "birb.modules.menusystem.textmenu.widgets.basic" local Widget = require "birb.modules.gui.textmenu.widgets.basic"
local DoubleTextWidget = Widget:extend() local DoubleTextWidget = Widget:extend()
widgets.SubMenu = DoubleTextWidget:extend() widgets.SubMenu = DoubleTextWidget:extend()