Compare commits

..

No commits in common. "9f8e9a9778c7a8bc13126729d863261d7cd5e568" and "99d3732d00c16a4ea26cfdd444adbefbb72213b1" have entirely different histories.

5 changed files with 2 additions and 5 deletions

View File

@ -61,7 +61,7 @@ function KeyConfigScene:render()
if self.input_state > table.getn(configurable_inputs) then if self.input_state > table.getn(configurable_inputs) then
love.graphics.print("press enter to confirm, delete/backspace to retry" .. (config.input and ", escape to cancel" or "")) love.graphics.print("press enter to confirm, delete/backspace to retry" .. (config.input and ", escape to cancel" or ""))
else else
love.graphics.print("press key input for " .. configurable_inputs[self.input_state] .. ", tab to skip, escape to cancel", 0, 0) love.graphics.print("press key input for " .. configurable_inputs[self.input_state] .. ", tab to skip" .. (config.input and ", escape to cancel" or ""), 0, 0)
love.graphics.print("function keys (F1, F2, etc.), escape, and tab can't be changed", 0, 20) love.graphics.print("function keys (F1, F2, etc.), escape, and tab can't be changed", 0, 20)
end end
end end

View File

@ -62,7 +62,7 @@ function StickConfigScene:render()
if self.input_state > table.getn(configurable_inputs) then if self.input_state > table.getn(configurable_inputs) then
love.graphics.print("press enter to confirm, delete/backspace to retry" .. (config.input and ", escape to cancel" or "")) love.graphics.print("press enter to confirm, delete/backspace to retry" .. (config.input and ", escape to cancel" or ""))
else else
love.graphics.print("press joystick input for " .. configurable_inputs[self.input_state] .. ", tab to skip, escape to cancel", 0, 0) love.graphics.print("press joystick input for " .. configurable_inputs[self.input_state] .. ", tab to skip" .. (config.input and ", escape to cancel" or ""), 0, 0)
end end
self.axis_timer = self.axis_timer + 1 self.axis_timer = self.axis_timer + 1

View File

@ -33,7 +33,6 @@ function MarathonA1Game:new()
self.randomizer = History4RollsRandomizer() self.randomizer = History4RollsRandomizer()
self.additive_gravity = false
self.lock_drop = false self.lock_drop = false
self.enable_hard_drop = false self.enable_hard_drop = false
self.enable_hold = false self.enable_hold = false

View File

@ -34,7 +34,6 @@ function MarathonA2Game:new()
"GM" "GM"
} }
self.additive_gravity = false
self.lock_drop = false self.lock_drop = false
self.lock_hard_drop = false self.lock_hard_drop = false
self.enable_hold = false self.enable_hold = false

View File

@ -39,7 +39,6 @@ self.SGnames = {
"GM" "GM"
} }
self.additive_gravity = false
self.lock_drop = true self.lock_drop = true
self.lock_hard_drop = true self.lock_hard_drop = true
self.enable_hold = true self.enable_hold = true