Merge branch 'master' of https://github.com/Coeuvre/rust-2048
Conflicts: src/app.rs
This commit is contained in:
commit
a758b2efd4
1 changed files with 0 additions and 2 deletions
|
|
@ -38,9 +38,7 @@ impl<'a> App<'a> {
|
||||||
gl: Gl::new(),
|
gl: Gl::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> App<'a> {
|
|
||||||
fn render_ui(&mut self, c: &Context) {
|
fn render_ui(&mut self, c: &Context) {
|
||||||
// logo
|
// logo
|
||||||
c.trans(self.settings.board_padding, self.settings.board_padding)
|
c.trans(self.settings.board_padding, self.settings.board_padding)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue