Commit graph

53 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 d437c2c571 Merge branch 'master' of github.com:tollyx/dungeon 2018-03-26 22:25:50 +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 e0d1bcad3a Minor tweaks 2018-01-17 10:17:07 +01:00
Adrian Hedqvist 68d85c5eae fixes 2018-01-10 10:10:43 +01:00
Adrian Hedqvist d5f2a52731 Merge branch 'master' of github.com:tollyx/dungeon 2018-01-10 09:57:46 +01:00
Adrian Hedqvist 6bbca15092 blargh 2018-01-10 09:53:40 +01:00
Adrian Hedqvist 05e8f3d0a3 Too much stuff once again 2018-01-09 21:59:05 +01:00
Adrian Hedqvist 1cf3ec5fc0 Rename Tileset to SpriteAtlas 2017-12-31 21:51:57 +01:00
Adrian Hedqvist a12e3b53f2 Cleanup 2017-12-30 23:02:21 +01:00
Adrian Hedqvist 2a1ccfe3a8 Add wip shader class 2017-12-30 20:16:00 +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 6dab039298 Fixed maze cleanup, improved door placement 2017-12-30 13:39:11 +01:00
Adrian Hedqvist a83a60de0c Add Rng class, lots of progress on mapgen 2017-12-30 00:08:09 +01:00
Adrian Hedqvist 469dccfd48 Fix cmake things... Works on linux again. 2017-12-28 10:01:38 +01:00
Adrian Hedqvist 71794eb68e Fix some things 2017-12-27 22:53:48 +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 231833fb26 Remove some usage of raw pointers, fixes some segfaults 2017-12-27 14:35:45 +01:00
Adrian Hedqvist 79ff797cfd mapgen wip 2017-12-27 12:43:38 +01:00
Adrian Hedqvist 70feced202 Fix building with sdl2main.lib on windows 2017-11-16 21:07:34 +01:00
Adrian Hedqvist 6052c41376 Add git version/tag/commit to window title 2017-11-16 20:53:33 +01:00
Adrian Hedqvist 1809dafb73 Fix healcounter 2017-11-16 20:18:13 +01:00
Adrian Hedqvist ff799185fb Fixed build on linux 2017-10-18 14:05:14 +02: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 d32d448f31 Bunch of stuff, preparing for items 2017-09-26 15:49:11 +02:00
Adrian Hedqvist 97189fc442 Add strength to actor debug ui 2017-09-24 22:29:54 +02:00
Adrian Hedqvist 7ccb4422b8 Plenty of minor stuff 2017-09-24 00:15:28 +02:00
Adrian Hedqvist a2e3b4efda Optimizations for AI and map rendering 2017-09-23 22:06:36 +02:00
Adrian Hedqvist abc1c8fbce Make the hero controllable 2017-09-23 18:55:41 +02:00
Adrian Hedqvist d0b4c74690 Rename a bunch of functions 2017-09-21 22:44:05 +02:00
Adrian Hedqvist e15d225346 Remove fov debug printing 2017-09-21 22:17:42 +02:00
Adrian Hedqvist 6122f1d31d Moved fov to its own class, removed it from Actor 2017-09-21 22:17:06 +02:00
Adrian Hedqvist 35a5a74c97 Centered the map to the window, view follows hero 2017-09-21 19:20:09 +02:00
Adrian Hedqvist 2e299dbcfa Big refactor, FSM for game state, input event callbacks 2017-09-21 18:57:12 +02:00
Adrian Hedqvist 328fd40a55 New bmp fixed it??? 2017-09-18 18:18:04 +02:00
Adrian Hedqvist b6fb433457 Merge branch 'master' of github.com:tollyx/dungeon 2017-09-18 18:07:01 +02:00
Adrian Hedqvist 2b11af11b3 Let's try reexporting that texture again 2017-09-18 18:06:33 +02:00
Adrian Hedqvist 2a6c7c31e8 More debugging ;_; 2017-09-18 14:20:00 +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