]> git.lizzy.rs Git - nothing.git/commit
Merge branch 'master' into memory
authorrexim <reximkut@gmail.com>
Sun, 8 Dec 2019 22:26:43 +0000 (05:26 +0700)
committerrexim <reximkut@gmail.com>
Sun, 8 Dec 2019 22:27:05 +0000 (05:27 +0700)
commit75a3de6bf2dd030368ed0e6e6d5cbd49cecf01cf
tree40e423fab1e189203edec1aa35493108516bdbce
parent4953896b0da59df483e865a7b8601a7daaab6c36
parent8861a0ca26775563c826edb10a1aff40233846e3
Merge branch 'master' into memory

- Camera struct used to contain pointer to Sprite_font, but we changed
  to the value
- In camera.h we removed camera_font() and added effective_scale()
src/game.c
src/game/camera.c
src/game/camera.h
src/ui/console.c