Commit Graph

426 Commits

Author SHA1 Message Date
Linus Probert a803578bc0 Fixes a gcc warning 2018-10-14 21:38:56 +02:00
Linus Probert 87925041fe Adds the backstab skill icon 2018-10-13 01:09:02 +02:00
Linus Probert da3ff1a222 Small thumbstick tweak 2018-10-13 00:01:44 +02:00
Linus Probert 850aae34ee Adds controller haptics 2018-10-13 00:01:44 +02:00
Linus Probert 423ff733af Fixes a leak and begins restructure of controller code 2018-10-13 00:01:44 +02:00
Linus Probert 2e0a88e5e3 Switches the old MapTile texture system to use sprites instead
This is hardly tested at the moment.
2018-10-12 12:46:36 +02:00
Linus Probert 53151b6ee0 Adds the phase skill icon 2018-10-12 12:28:25 +02:00
Linus Probert e6b5b761b0 Includes attempt to determine if PS3 controller aswell as PS4 2018-10-12 11:06:01 +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 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 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 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 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 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
Linus Probert dbf9fe3931 Maint: Removed duplicate code 2018-09-13 13:46:29 +02:00
Linus Probert 0fc1fed278 Maint: Clean up monster.c 2018-09-13 13:36:38 +02:00
Linus Probert e1b3364d88 Maint: Even more cleanup 2018-09-13 13:12:43 +02:00
Linus Probert 620a7e3ed5 Maint: Less complex main 2018-09-13 12:49:21 +02:00
Linus Probert 983875d064 Maint: Cleaned up a complex function 2018-09-13 11:35:07 +02:00
Linus Probert e293c21908 Rogue preparation 2018-09-13 10:48:35 +02:00
Linus Probert 0ca70c7376 Add the dagger skill to the rogue 2018-09-13 08:16:59 +02:00
Linus Probert c39f05d49e Fixed the player menu 2018-09-13 08:05:17 +02:00
Linus Probert 02a4407eb4 Got a bit further 2018-09-12 20:56:50 +02:00
Linus Probert f246c5751a Broken commit 2018-09-12 14:45:09 +02:00
Linus Probert 367be69852 Buggfix: Prevent clip switching on falling sprite
- This was a forgotten effect when the falling was implemented on the
player struct.
2018-09-12 08:03:28 +02:00
Linus Probert 988b53a4fa Outline the rogue skillset 2018-09-11 15:49:58 +02:00
Linus Probert 03b60f6140 Merge branch 'master' into dev 2018-09-11 15:49:43 +02:00
Linus Probert cc627dc0c3 Take damage if ending charge on a damaging object
- Currently, ending charge in fire or smoke doesn't damage the player
2018-09-11 15:47:14 +02:00
Linus Probert 5043a86377 Cleaned up main a bit and moved some code 2018-09-11 15:32:33 +02:00
Linus Probert cb732a80ec Adds possibility to push monsters into pits and traps. 2018-09-10 22:27:26 +02:00
Linus Probert 2316d24942 Fixes falling sound choice bug 2018-09-10 22:23:45 +02:00
Linus Probert b3724afe49 Make the game a bit more actionfilled
- Level 1 is reduced in size
- More monsters spawn
- Maps are more 'messy' and less linear
- Introduces 'space' to hold your turn
2018-09-09 12:46:15 +02:00
Linus Probert c52f6c9f97 Fixed a stupid error 2018-09-09 01:25:32 +02:00
Linus Probert 321dc4f3af Remove a warning and some useless compilations
- Removes lua install from CI
2018-09-08 23:25:10 +02:00
Linus Probert 9e6325905f Switched eastereggs and logic, added last achievement 2018-09-06 20:12:37 +02:00
Linus Probert 280b073a8c Prevents kill achievments from being granted on first hit. 2018-09-03 20:27:34 +02:00
Linus Probert 07d7d6e58b Added easteregg monsters and a funny achievement 2018-09-03 16:49:45 +02:00
Linus Probert 6e7ce815fd Removes useless transfer function 2018-09-03 12:53:12 +02:00
Linus Probert 4a6422fc09 Fixes non-existant treasure bug 2018-09-03 08:43:05 +02:00
Linus Probert 9bcb398f94 Includes player and dungeon level in steam leaderboards.
- Intended for use in the in game leaderboard view once I make that.
2018-09-02 23:44:48 +02:00
Linus Probert ef0e418e96 Fixes infinite loop issue in trapgen
Vertical coridoors before level 4 wouldn't leave enough space to place
4 traps since there is only 10 rows of tiles eligible for a trap and
every trap ocupies 3 rows and requires at least 2 spare rows. This could
cause an infinite loop situation.

* Also fixes linux build warnings and other stuff.
2018-09-02 06:04:24 +02:00
Linus Probert 0ca64fb882 Added kills leaderboard
- Restructured the code a bit to avoid c vs c++ conflicts.
2018-08-31 15:58:59 +02:00
Linus Probert 41a2b1b8f8 Fixes fullscreen centering on hirez screens 2018-08-30 14:08:34 +02:00
Linus Probert 0ae8849323 Removed a stupid mistake 2018-08-30 14:01:28 +02:00
Linus Probert 4013449878 Adds information to player
- Fullscreen command is listed
- ESC to go back from views is listed
2018-08-30 11:32:09 +02:00
Linus Probert e1c154fc1c Fixed charge
- Prevent click sound from triggering
- Prevent hovering on pits if you end charge on them
- Trigger traps if you end charge on them
2018-08-30 11:13:50 +02:00
Linus Probert ee8274038f Prevent stunned monsters from getting scared by player 2018-08-30 09:55:04 +02:00
Linus Probert 5dc25c1e79 Fixed some more fullscreen
There is still a slight offset. I need to practice maths I think
2018-08-30 09:12:05 +02:00
Linus Probert a75a0d9331 Fixes nicer fullscreen rendering
Also solves some compiler warnings on linux
2018-08-30 08:54:21 +02:00
Linus Probert 0d1836a8ba Passable fullscreen mode
- Centering is still a bit off
2018-08-30 00:09:55 +02:00
Linus Probert 316325b98d Implemented leaderboard updates 2018-08-29 22:13:22 +02:00
Linus Probert d2ced6cef1 Adds hooks for all achievements 2018-08-29 14:31:20 +02:00
Linus Probert 28b3980fe6 Fixed non-steam build, because I broke it :D 2018-08-29 14:11:36 +02:00
Linus Probert 8cdc87c299 Completed Steam api integration.
- Next step is to actually trigger the achievements in the right places.
2018-08-29 14:03:18 +02:00
Linus Probert f5a88fc10e Introduces texture blending
- Makes indicator sprites transparent when the player is under them
2018-08-23 09:41:10 +02:00
Linus Probert 52913af237 Completes #42 Add boss 2 & 3
- Adds "The Shadow"
- Adds the "assassin" behaviour
- Adds some assassins to levels > 15
2018-08-23 09:11:13 +02:00
Linus Probert 449cc362a0 Fixes some minor buggs
- Monsters now drop loot as soon as they die
    (not after the dagger has stopped moving)
- Artifacts keep correct alignment even after a level switch.
2018-08-23 08:41:47 +02:00
Linus Probert f67aab0b37 Completes #43 Add win state
Game now ends if you reach depth level 20

Also fixed:
    - Funky bug with stats with 0 dmg
    - Wonky speed = 2 on monsters behaviour
    - Some other minor stuff
2018-08-22 20:54:39 +02:00
Linus Probert 8c261fd59f Added the undead monsters for level > 10
- Fixed a double damage bug
- Prevent player from getting killed when in DEBUG mode
   - This can cause really weird behaviour if you fall into a pit.
2018-08-22 14:02:55 +02:00
Linus Probert 6326a64111 Begins #42 Add boss 2 & 3
- Added "The cleric" for level 10.
2018-08-22 13:13:54 +02:00
Linus Probert f1b0045829 Introduces the "orc levels"
Also fixes some minor buggs.
2018-08-22 11:05:12 +02:00
Linus Probert ffe1736792 Minor buggfixes and typos
- Mention level in "new skill tooltip"
- Fix a msvc compiler warning
- Prevent level 2 artifact first pickup from bugging rendering
2018-08-21 22:27:45 +02:00
Linus Probert 8c25693d6d Moves sqlite3 files to separate dir
Only intention is to separate my code from 3rd party code.
2018-08-21 16:32:26 +02:00
Linus Probert bec9eb429d Fixed a typo in skill tooltip 2018-08-21 16:21:22 +02:00
Linus Probert 43f021a997 Created an FPS counter for debug mode
- Also moves the "sword pointer" to debug mode only.
2018-08-21 16:18:11 +02:00
Linus Probert dbc36aab9f Fixes #41, Minimap 2018-08-21 15:44:12 +02:00
Linus Probert 9ef97c0897 Fixes #38, Artifact inventory 2018-08-21 12:42:23 +02:00
Linus Probert 358c0c7ddc Fixes #37 and #39 Adds tooltips to everything
- A tooltip on first play will explain how it works
- A tooltip on levelup will display skill info
- A setting is introduced to disable tooltips
2018-08-20 14:32:38 +02:00
Linus Probert 5f754d551a Merge branch 'master' into dev 2018-08-19 20:26:28 +02:00
Linus Probert 30058ea4e0 Creates gui_util and moves some code out from gui.c 2018-08-19 20:25:31 +02:00
Linus Probert 549f47ae0b Minor code fixes and a slight tweak to the blue color 2018-08-16 14:09:54 +02:00
Linus Probert 3fabd039a4 Prevents artifacts before level 3
- Also fixes a potential segfault
2018-08-15 18:16:44 +02:00
Linus Probert 9a610d5f88 Adds window icon
- Fixes bug where you could move when falling.
2018-08-15 08:08:18 +02:00
Linus Probert 6af8d9dd8f Completes #8 First boss
- Adds "The Hell Hound" to level 5
2018-08-15 07:20:53 +02:00
Linus Probert 915ea59ca3 Fixes a mistake in music loading. 2018-08-14 17:00:10 +02:00
Linus Probert 6cc96a954d Begins #8 First boss
- Introduces FIRE_DEMON behaviour
- Just need to pick a sprite and adapt the lua code
2018-08-14 13:28:10 +02:00
Linus Probert 1a09328793 Adds boss music and an additional attribution line per request. 2018-08-14 13:15:22 +02:00
Linus Probert 6633db7aa4 Adds room objects and FIRE rooms. 2018-08-13 13:11:32 +02:00
Linus Probert 292f549d57 Minor compiler warning fix 2018-08-12 19:48:14 +02:00