Commit Graph

805 Commits

Author SHA1 Message Date
Linus Probert 894e3ba551 Merge branch 'master' into dev 2018-10-12 09:24:51 +02:00
Linus Probert c8900e8ddf Controller button rendering based on controller type
Also added in the last button textures that I'd left out previously.
2018-10-11 20:12:11 +02:00
Linus Probert 06d2da164a Controllers are working
Still needs some tweaks and some gui changes.
Also stumbled upon a bug.
2018-10-11 18:54:02 +02:00
Linus Probert 3143236908 Completely untested controller mappings. 2018-10-11 15:20:28 +02:00
Linus Probert 7333d3d62d Update issue templates 2018-10-10 23:53:42 +02:00
Linus Probert 70cc79fc9f
Merge pull request #47 from Oliveshark/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2018-10-10 23:48:56 +02:00
Linus Probert bdbb10be04
Create CODE_OF_CONDUCT.md 2018-10-10 23:48:24 +02:00
Linus Probert 75660a5288 Update to readme. 2018-10-10 23:40:36 +02:00
Linus Probert bb7f9effd3 A beginning to controller support 2018-10-10 23:28:24 +02:00
Linus Probert 2919ebf97f Adds controller button support for skillbar 2018-10-10 22:54:43 +02:00
Linus Probert c3b2b6f214 Fixed a typo and made controller layout toggleable. 2018-10-10 22:38:54 +02:00
Linus Probert e526c037e8 Completed the button implementation for the help tooltips
Still need to fix the buttons in the panel
2018-10-10 22:34:41 +02:00
Linus Probert e845195823 Got this texture stuff working 2018-10-09 14:19:59 +02:00
Linus Probert 0723f62559 New approach where we render button textures in tooltips. 2018-10-05 13:08:38 +02:00
Linus Probert a162646177 More font modifications 2018-10-04 12:57:11 +02:00
Linus Probert 60374c93ad Font updates 2018-10-04 09:11:57 +02:00
Linus Probert 2b02ae569e An attempt to group files in msvc
- Mostly to get the header files listed nicely
2018-10-03 16:49:06 +02:00
Linus Probert a4cb234075 Re-aligned the credits file 2018-10-03 16:31:26 +02:00
Linus Probert e59f04b525 Merge branch 'dev' into feature/phase-skill 2018-10-02 23:35:24 +02:00
Linus Probert 2d25e42b40 Merge branch 'master' into dev 2018-10-02 23:35:02 +02:00
Linus Probert 5d1490b14e Another README badge fix 2018-10-02 23:34:02 +02:00
Linus Probert aefbd9586b Update readme to match new github url 2018-10-02 23:27:24 +02:00
Linus Probert c7c5346afc Completes testing of phase and fixes some errors
- Fixes some information in skill tooltips
- Fixes a bug with menu mouse selections
2018-10-02 22:42:29 +02:00
Linus Probert 97ad1ddd23 Introduced the phase artifact 2018-10-02 13:08:32 +02:00
Linus Probert 0dcb658076 Merge branch 'dev' into feature/phase-skill 2018-10-02 12:50:44 +02:00
Linus Probert 961060901c Attempt to bring the mouse menu click back 2018-10-02 12:49:19 +02:00
Linus Probert ee5ed1421f Implementd the skill. Still not tested. 2018-10-02 10:29:32 +02:00
Linus Probert b4fd2cb8b4 Added the phase tooltip. 2018-09-29 06:44:33 +02:00
Linus Probert 742d6e2363 Untested phase code. Needs more work 2018-09-28 14:57:43 +02:00
Linus Probert 90603b4ebe Fix what my bad build script broke 2018-09-25 14:28:03 +02:00
Linus Probert bc452a3fb6 Patch version raised to 2018-09-25 14:26:50 +02:00
Linus Probert 6811c42667 Patch version raised to 2018-09-25 14:24:11 +02:00
Linus Probert e796fffc7c Prepare release script for real versions 2018-09-25 14:23:47 +02:00
Linus Probert 35c3be45e0 Removed a type warning 2018-09-21 12:39:45 +02:00
Linus Probert 3bbe9176b8 Merge branch 'master' into dev 2018-09-18 07:52:53 +02:00
Linus Probert ae44d5c2bc Adds minimal Steam fiddling protection 2018-09-17 14:23:35 +02:00
Linus Probert c97688a690 Incorporate artifacts in rogue skills 2018-09-17 10:10:25 +02:00
Linus Probert 47082daac3 Build env changes 2018-09-15 15:54:05 +02:00
Linus Probert 3301437b8f Tuned the backstab skill slightly 2018-09-15 15:53:02 +02:00
Linus Probert 743e4a3bac Implemented the backstab skill 2018-09-15 11:01:35 +02:00
Linus Probert 81ccf8a730 Fixed a windy room issue 2018-09-14 18:54:48 +02:00
Linus Probert 083834d044 Maint: Remove CI compiler warnings 2018-09-14 13:09:06 +02:00
Linus Probert dc6b816a4a Add slash animation to trip skill 2018-09-14 13:07:20 +02:00
Linus Probert 87b2b9d2c9 Fix pits added to room
-  Prevent pits and wind from being combined too early
2018-09-14 09:33:08 +02:00
Linus Probert 5648be4982 Merge branch 'master' into dev 2018-09-14 08:48:56 +02:00
Linus Probert 6e3343aa3b License stuff and README updates 2018-09-14 08:47:41 +02:00
Linus Probert 5d5170cb0b Version bump for future release 2018-09-14 08:30:20 +02:00
Linus Probert 899d2e5d76 Update to build env 2018-09-13 23:50:33 +02:00
Linus Probert 583a7d049d Fixes some minor bugs caused by coding without testing 2018-09-13 23:45:33 +02:00
Linus Probert 60359d8e9c Untested implementation of the TRIP skill 2018-09-13 15:28:03 +02:00