Commit Graph

622 Commits

Author SHA1 Message Date
Linus Probert dff55a1978 Fixes some buggs
- Fixes mapbuilder pit loading nullpointer
- Fixes black main menu bg after return to main menu
- Fixes skill sparkling on new game start
2018-06-14 00:12:49 +02:00
Linus Probert be42981ff3 Fixed errors and adapted to new vim 8.1 2018-05-27 15:13:03 +02:00
Linus Probert 60052af7f5 Merge branch 'master' into dev 2018-05-25 13:46:55 +02:00
Linus Probert 4684e0409c Minor cleaning of lua scripts 2018-05-25 13:46:28 +02:00
Linus Probert 6a9a3bdbcf Removed some old debug output from pitlayouts. 2018-05-25 13:32:15 +02:00
Linus Probert ec6722106a Adds an idea for slash animations that didn't look very good. 2018-05-22 23:01:15 +02:00
Linus Probert cc229c8b00 Prepares pengine for more particle types.
Also fixed an invalid read bug.
2018-05-22 22:42:06 +02:00
Linus Probert bbe4526947 Fixes colors to use defines. 2018-05-22 15:48:09 +02:00
Linus Probert 2462e4cf33 Adds sentinel monster behaviour. 2018-05-21 21:03:59 +02:00
Linus Probert a66f16de79 Reintroduces the pointer and mouse menu operation. 2018-05-20 17:25:53 +02:00
Linus Probert 123ae90f59 Better mod key logic in input and mouse motion check. 2018-05-20 16:53:16 +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 186cc7b514 Replaced state logic with behaviours instead. 2018-05-19 17:55:10 +02:00
Linus Probert b905232d5e ....and once again... 2018-05-18 23:28:24 +02:00
Linus Probert 8573bad864 ...and include the SDL dll 2018-05-18 23:25:10 +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 2feeb5cbcf Attempts to fix appveyor build 2018-05-17 23:34:44 +02:00
Linus Probert f1206811d0 Fixed the releasenotes and the script for it 2018-05-17 23:18:35 +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 c4dc8382a9 Monsters now indicate their state with speech bubbles 2018-05-17 21:41:23 +02:00
Linus Probert f049d66219 Fixed releasenotes and script again 2018-05-17 10:06:58 +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 fa0dbe2933 Fixes miss in release script 2018-05-17 09:54:00 +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 644a0c1f45 Quick and dirty release script 2018-05-17 08:59:55 +02:00
Linus Probert a7822331f8 Hopefully handle the "event overflow exploit"
There was an exploit where a keyboard would fire events quicker then
they could be consumed. This would lock the main game loop in the
SDL_PollEvent loop and block rendering until the key in this case was
released. Combning this with an attack meant that you could "farm" one
NPC for multiple kills and massive XP gains. Leaving the player at level
8+ on dungeon level 1. This fix should mitigate such shenanigans.
2018-05-16 19:09:01 +02:00
Linus Probert bc0d194dce Additional fall sounds
Wilhelm scream
2018-05-16 15:52:39 +02:00
Linus Probert a9b71ce79f Coverity scan fix 2018-05-16 13:53:01 +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 79a840e820 Build both Release and Debug on travis 2018-05-15 23:27:33 +02:00
Linus Probert fa8797a20f Removed a memory leak and MACROD colors 2018-05-15 23:21:28 +02:00
Linus Probert 1e0034cd46 More travis fixes 2018-05-15 14:34:49 +02:00
Linus Probert 1a47065bf6 Fixed travis package error 2018-05-15 14:29:53 +02:00
Linus Probert 853d390427 Some create package dir in travis 2018-05-15 14:21:54 +02:00
Linus Probert 33324b6802 Less chance for pits 2018-05-15 14:15:51 +02:00
Linus Probert 6d5acc698e Nicer labels in many places. 2018-05-15 14:12:38 +02:00
Linus Probert b88318097f Render texts after particles. 2018-05-15 11:20:52 +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