Commit graph

25 commits

Author SHA1 Message Date
Adrian Hedqvist 1505a13c99 Merge branch 'master' of github.com:tollyx/dungeon 2018-04-03 08:18:44 +02:00
Adrian Hedqvist bb40711f84 Too big of a commit again
* Add and started using a proper state machine class
  * Uses a "StateResult" struct to handle state switches
* Add timers
* Move imgui to its own folder
* Add logger (not used yet)
2018-04-02 22:24:54 +02:00
Adrian Hedqvist 6a6ea6dd64 Merge branch 'master' of github.com:tollyx/dungeon 2018-03-29 10:38:12 +02:00
Adrian Hedqvist 8ffe61ba5f I have returned! 2018-03-26 22:16:10 +02:00
Adrian Hedqvist edb5cece7f Use the shader class 2018-01-18 22:29:58 +01:00
Adrian Hedqvist 1ace1cf300 Refactorings, only update a single actor per turn, support multiple player-controlled actors 2017-12-30 20:15:39 +01:00
Adrian Hedqvist 39ad8c3b34 Add background color uniform, remove current color state 2017-12-30 13:40:09 +01:00
Adrian Hedqvist 469dccfd48 Fix cmake things... Works on linux again. 2017-12-28 10:01:38 +01:00
Adrian Hedqvist 09730c4101 Switched from GLEW to glbinding, vcpkg is fucking amazing, cmake works on windows again 2017-12-27 21:54:11 +01:00
Adrian Hedqvist 999ea5bd71 Cleanup 2017-12-27 17:50:44 +01:00
Adrian Hedqvist ec131d8bda Too much stuff
* Implemented lua using kaguya, only for config files for now
* Moved color struct to its own header
* statically link glew instead of including the source in the project
* Other stuff that I don't remember
2017-10-18 12:25:25 +02:00
Adrian Hedqvist 7ccb4422b8 Plenty of minor stuff 2017-09-24 00:15:28 +02:00
Adrian Hedqvist d0b4c74690 Rename a bunch of functions 2017-09-21 22:44:05 +02:00
Adrian Hedqvist 328fd40a55 New bmp fixed it??? 2017-09-18 18:18:04 +02:00
Adrian Hedqvist 2b11af11b3 Let's try reexporting that texture again 2017-09-18 18:06:33 +02:00
Adrian Hedqvist a2e68da071 LOGGING!? 2017-09-18 10:39:23 +02:00
Adrian Hedqvist 96c4d4bc04 Failure 2017-09-18 10:37:03 +02:00
Adrian Hedqvist 53e564ecbe Segfault fix test... 2017-09-17 22:31:48 +02:00
Adrian Hedqvist b9a26bfe5a Fixed a bad log 2017-09-17 22:16:23 +02:00
Adrian Hedqvist 4d7754ac77 More logging 2017-09-17 22:14:12 +02:00
Adrian Hedqvist cb7f0263d8 Bunch of logging 2017-09-17 22:09:14 +02:00
Adrian Hedqvist ec3be3c285 Print SDL error when texture load fails 2017-09-17 21:14:24 +02:00
Adrian Hedqvist c4997823ed Now compiles with CLion+MinGW 2017-09-17 20:24:57 +02:00
Adrian Hedqvist 6a31952257 Builds but opengl linking errors on windows 2017-09-17 15:59:32 +02:00
Adrian Hedqvist 60fe53ff06 Initial commit 2017-09-17 14:45:57 +02:00