Commit Graph

155 Commits

Author SHA1 Message Date
Linus Probert 988d6c5cac Implemented the sword swing effect.
This adds the animation type for future use.
Not super happy with the animation png. Will look over it in the future.
2018-07-09 19:26:06 +02:00
Linus Probert a30d501e86 Patch version raised to 7 2018-06-28 12:54:15 +02:00
Linus Probert 821cac2fbd Completely separates input handling and game logic.
This commit disables mouse support in menus. This needs to be rethought
to be more stable.
2018-05-20 00:03:17 +02:00
Linus Probert 8c58c6ee2f And once again for windows! 2018-05-18 23:20:28 +02:00
Linus Probert 6788e3cd29 Another trywq 2018-05-18 23:13:56 +02:00
Linus Probert 60114ed159 Hopefully fixes the build issues 2018-05-18 23:11:33 +02:00
Linus Probert e222e51a0e Don't test on clang and fix include problem in appveyor
Clang doesn't have the same --wrap linker flag that GCC has. Just ignore
it for now.
2018-05-18 14:17:29 +02:00
Linus Probert 138cba1400 Mock test for keyboardinput and fixed the found issues 2018-05-18 13:49:31 +02:00
Linus Probert 998501ae42 Patch version raised to 6 2018-05-17 23:15:53 +02:00
Linus Probert 2813a571e4 Separate player movement from input event loop.
Wrote a keyboardinput object but decided against using it for the time
being. I'll leave it in if I change my mind.
2018-05-17 23:14:42 +02:00
Linus Probert 769a659bfe Patch version raised to 5 2018-05-17 10:00:25 +02:00
Linus Probert 0fcc1d2dc4 Last time now 2018-05-17 10:00:09 +02:00
Linus Probert 60750d73b9 Patch version raised to 5 2018-05-17 09:58:30 +02:00
Linus Probert a551c52394 More trickery 2018-05-17 09:58:18 +02:00
Linus Probert beb2e79351 Patch version raised to 5 2018-05-17 09:50:13 +02:00
Linus Probert 7f09fbda8d Fiddled some more with release script 2018-05-17 09:49:03 +02:00
Linus Probert d4f2514e7e Patch version raised to 5 2018-05-17 09:00:27 +02:00
Linus Probert 6ef52b694c Upped the patch version. 2018-05-15 23:46:25 +02:00
Linus Probert e087fbd7eb Minor win install change 2018-05-15 23:34:38 +02:00
Linus Probert d6daf7b798 Nicer action texts 2018-05-15 11:16:56 +02:00
Linus Probert 4e5e3e515c Update readme and apple build 2018-05-13 23:46:27 +02:00
Linus Probert 0cf05f039e Travis ci update with OSX build 2018-05-13 18:12:40 +02:00
Linus Probert fb7e1710ab Differentiate Release and Debug builds 2018-05-12 10:36:04 +02:00
Linus Probert 4a71f8a02b Don't need to include libphysfs.dll when we link staticly 2018-05-11 23:13:12 +02:00
Linus Probert aaeabb30da Fiddle with windows linking 2018-05-11 22:56:03 +02:00
Linus Probert 179eb4c36b Static link gcc properly 2018-05-11 22:02:30 +02:00
Linus Probert 55d2da1737 Static link gcc libs 2018-05-11 19:53:22 +02:00
Linus Probert 3c1fbfaa2e Another attempt at appveyor packaging 2018-05-11 19:41:49 +02:00
Linus Probert addf1474de Diable the tests on CI and fix the appveyor artifacts 2018-05-11 19:37:10 +02:00
Linus Probert 5b44ee7cf3 Migrated from check to cmocka
Intention is to get tests running on appveyor
2018-05-11 19:09:34 +02:00
Linus Probert 610c7eed8e Appveyor artifacts added 2018-05-09 22:30:22 +02:00
Linus Probert 3e6976d2cc Adds texture creation of gui frames to reduce render time
Also enables leakchecking and removes leaks from hashtable tests and
some other leaks that were obvious. There are some X11 leaks still
present but I don't think these are caused by me.
2018-05-09 00:21:38 +02:00
Linus Probert f3c83606e2 Check for check again 2018-05-05 22:17:02 +02:00
Linus Probert b219c76e81 Fixed issues with MSVC/CMake build macros 2018-05-01 13:18:05 +02:00
Linus Probert 5efef180a5 Fixes the release build 2018-04-28 19:10:49 +02:00
Cong 6896308451 Use SDL to detect screen dimensions
Supports macOS, remove dependency on X11
2018-04-28 15:05:56 +10:00
Linus Probert d77166b3fe The env variable was missplaced 2018-04-23 09:24:09 +02:00
Linus Probert 657bf2f6b8 Attempt to remove travis+clang+ccache warnings. 2018-04-23 09:15:43 +02:00
Linus Probert 8647eaa7a4 Coloured, file, function and line referenced debug output. 2018-04-21 22:58:53 +02:00
Linus Probert 04a3691463 Removes some GCC warnings 2018-04-20 14:46:00 +02:00
Linus Probert cab3b501fc Borke out some of the settings sqlite code to it's own module. 2018-04-16 21:19:26 +02:00
Linus Probert 2ca2a4f98c Added persistent settings 2018-03-17 00:04:26 +01:00
Linus Probert 8a2cb3b446 Embed sqlite3 2018-03-16 19:46:28 +01:00
Linus_Probert 07136c70f9 Windy rooms affect player
Left a possibility to make it affect projectiles.
2018-03-15 16:30:41 +01:00
Linus_Probert ac180d1efb Limit the number of daggers carried.
There is a "dagger count" on the player now. Also added the "dagger"
item that can be dropped by monsters.
2018-03-13 16:13:54 +01:00
Linus_Probert 8e7b23e687 Add better lint checking 2018-03-13 09:35:44 +01:00
Linus_Probert f025a478b2 Added cppcheck to travis 2018-03-12 14:55:09 +01:00
Linus Probert be8677cb39 Adds projectiles
Collisions still need implementing and an underlying skill + some drawing.
2018-03-08 00:58:26 +01:00
Linus Probert d564a559dc Adds essentially nothing. Some convenience functions. That is all 2018-03-07 19:15:08 +01:00
Linus Probert 2253479532 Adds skills, 'flurry' skill and sip_potion skill.
Removes shift-h sipping.
2018-02-28 22:31:38 +01:00
Linus Probert 0f323589f9 New redist cmake stuff for MSVC 2018-02-28 07:10:35 +01:00
Linus Probert 8ce5200601 Some new msvc build rules. Not tested 2018-02-28 06:32:16 +01:00
Linus Probert 94e7857dc7 Added stupid msvc dll:s for release builds.
No clue if this is the right way to do it. But it worked so what the hell.
2018-02-27 20:54:17 +01:00
Linus Probert 22bed2948f Fixed CPack and made lua work from .pack file
Adds a custom searcher to the lua table package.searcher.
2018-02-27 19:59:51 +01:00
Linus Probert 462a22f7a0 Starts an idea for skills. Not sure I like it. 2018-02-24 07:13:28 +01:00
Linus Probert 131c0caa4e Memory usage improvements
Adds a texturecache to prevent multiple loads of the same texture. Texture
dimension is now only intended for the actual texture dimension. Sprite
should hold the "rendering dimension". Music songs now load and unload
when switching songs. Standardized a lot of dimensions.
2018-02-23 23:58:29 +01:00
Linus_Probert 738102b6e6 Adds basic skillbar rendering, now we need skills 2018-02-23 11:01:25 +01:00
Linus Probert 988d0138b9 Another swing at cpack 2018-02-23 07:17:55 +01:00
Linus Probert 8a30895cae Disabled CPACK on linux for now 2018-02-22 23:40:01 +01:00
Linus Probert 7f449e7ef3 An attempt at CPACK, not going great. 2018-02-22 23:19:33 +01:00
Linus Probert 7fb34bf9e8 Package assets depending on build mode 2018-02-22 19:17:57 +01:00
Linus Probert 4f75378a73 Include SDL2MAIN_LIBRARY in build
This should prevent manual intervention when building in MSVC17
2018-02-22 13:12:59 +01:00
Linus Probert d7020f1547 Fixes a minor mistake 2018-02-22 13:08:57 +01:00
Linus Probert b209774f7b Optional physfs compile, removed deprectaions. 2018-02-22 13:02:40 +01:00
Linus Probert 2a3f5aaa6a Added physfs for file loading and safety. 2018-02-22 12:36:24 +01:00
Linus Probert 9fec8fcb1f Enabled conversion warnings in GCC 2018-02-22 09:44:27 +01:00
Linus_Probert a4df4c6079 Adds ccache to build
This is mostly for fun and because I want to see how it works in travis.
2018-02-16 10:13:16 +01:00
Linus_Probert b502e78dd9 Introduced a mixer and one click sound. 2018-02-14 16:04:40 +01:00
Linus_Probert b2b0103b4f Introduced centralized keyboard handling 2018-02-12 10:55:36 +01:00
Linus Probert 31e006b69f Working on menus. Still pretty broken game. 2018-02-09 06:53:06 +01:00
Linus_Probert 3fe549e6fe Started writing menus
Everything is pretty broken right now.
2018-02-08 17:01:38 +01:00
Linus Probert 93c0623fe4 Implemented a simple particle engine. 2018-02-03 23:39:49 +01:00
Linus Probert e7e412cc33 Nicer gui and stored potions. 2018-02-03 13:02:39 +01:00
Linus_Probert c2266b892d Implemented a button. Not quite usable yet though. 2018-02-02 16:16:55 +01:00
Linus Probert f3269436e0 Added a mousepointer for later use. 2018-01-31 09:15:33 +01:00
Linus Probert 417cb78f31 Added items, so far only health that always drops. 2018-01-24 21:14:34 +01:00
Linus Probert 8e2d6b0fd4 I fixed it wrong, this should work 2018-01-23 23:09:12 +01:00
Linus Probert 147496ba7a Fixed the CMake tests now that util is used 2018-01-23 23:07:51 +01:00
Linus Probert c4b8766a01 Began designing/writing gui. Added states. 2017-12-22 15:15:40 +01:00
Linus Probert 42aa1cbe86 Fixed some mingw warnings. 2017-12-21 11:57:12 +01:00
Linus Probert 70444c2299 We don't use mixer so don't include it.
Also an attempt to download lua with appveyor
2017-12-20 20:26:57 +01:00
Linus Probert 4bbe82a705 More windows stuff 2017-12-19 22:51:00 +01:00
Linus Probert faad866c8b Fixed a lot of stuff to help cross platform compilation 2017-12-19 21:00:02 +01:00
Linus Probert 7f6507d30c Fixed for windows 2017-12-19 19:42:05 +01:00
Linus Probert b269abd0f7 Moved hashtabl and linkedlist into source. 2017-12-19 09:06:21 +01:00
Linus Probert c88c64f4b8 Implemented stupid agressive and coward pathing. 2017-12-18 09:59:01 +01:00
Linus Probert 3a464d8ea6 Added some more undead and fixed the random function. 2017-12-18 09:11:00 +01:00
Linus Probert 6007976d23 Roaming monsters. 2017-12-17 13:43:41 +01:00
Linus Probert 7389c2d588 Hit and miss information. 2017-12-15 15:03:29 +01:00
Linus Probert 916193ecb3 Simple Player vs. Enemy hits 2017-12-15 08:08:45 +01:00
Linus Probert 17c3b817a0 Better hashtable destruction. Monsters prepared. 2017-12-13 14:30:12 +01:00
Linus Probert f90a7c735e Attempt to fix test-build on travis 2017-12-13 12:18:20 +01:00
Linus Probert b5ddc344c4 More cmake logic to improve the build 2017-12-13 12:09:04 +01:00
Linus Probert 86eb3aee01 Wrote a naive hashtable.
Be careful regarding memeory handling using this table. It takes
pointers as values. Deletes the pointers on occasion and destruction but
doesn't copy the original pointer. So pointers inserted should be left
to be handled by the table.
2017-12-12 13:06:01 +01:00
Linus Probert 31ca087a1e Removed check tests from travis for the time being 2017-12-07 13:50:56 +01:00
Linus Probert bdc5b6d629 Added a room matrix that deals with movement and collisions. 2017-12-05 15:03:20 +01:00
Linus Probert 2a88233e82 Compile flag for check unit tests 2017-12-05 13:40:52 +01:00
Linus Probert cfd0e5ce4c Removed Xrandr lib 2017-12-05 12:54:41 +01:00
Linus Probert 8245a0b37b Bad lua include dir 2017-12-05 12:51:09 +01:00
Linus Probert fdb92ef24f Better cmake 2017-12-05 12:40:37 +01:00