669a2fb029
Merge branch 'master' into dev
...
Conflicts:
CMakeLists.txt
2018-10-18 14:08:48 +02:00
0730eb4c49
Disable text input since this is on by default in SDL2.0
...
This has been causing some "jitter" I'm quite sure. Disabling text input
should help remedy this.
2018-10-17 21:56:04 +02:00
850aae34ee
Adds controller haptics
2018-10-13 00:01:44 +02:00
423ff733af
Fixes a leak and begins restructure of controller code
2018-10-13 00:01:44 +02:00
e6b5b761b0
Includes attempt to determine if PS3 controller aswell as PS4
2018-10-12 11:06:01 +02:00
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
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
3143236908
Completely untested controller mappings.
2018-10-11 15:20:28 +02:00
bb7f9effd3
A beginning to controller support
2018-10-10 23:28:24 +02:00
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
e845195823
Got this texture stuff working
2018-10-09 14:19:59 +02:00
3bbe9176b8
Merge branch 'master' into dev
2018-09-18 07:52:53 +02:00
ae44d5c2bc
Adds minimal Steam fiddling protection
2018-09-17 14:23:35 +02:00
083834d044
Maint: Remove CI compiler warnings
2018-09-14 13:09:06 +02:00
583a7d049d
Fixes some minor bugs caused by coding without testing
2018-09-13 23:45:33 +02:00
e1b3364d88
Maint: Even more cleanup
2018-09-13 13:12:43 +02:00
620a7e3ed5
Maint: Less complex main
2018-09-13 12:49:21 +02:00
983875d064
Maint: Cleaned up a complex function
2018-09-13 11:35:07 +02:00
c39f05d49e
Fixed the player menu
2018-09-13 08:05:17 +02:00
02a4407eb4
Got a bit further
2018-09-12 20:56:50 +02:00
5043a86377
Cleaned up main a bit and moved some code
2018-09-11 15:32:33 +02:00
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
07d7d6e58b
Added easteregg monsters and a funny achievement
2018-09-03 16:49:45 +02:00
37518c100d
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
1972b5b1df
Added kills leaderboard
...
- Restructured the code a bit to avoid c vs c++ conflicts.
2018-08-31 15:58:59 +02:00
26379535be
Fixes fullscreen centering on hirez screens
2018-08-30 14:08:34 +02:00
fbb63ba742
Adds information to player
...
- Fullscreen command is listed
- ESC to go back from views is listed
2018-08-30 11:32:09 +02:00
5a8c1ece14
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
f9556cbf59
Fixes nicer fullscreen rendering
...
Also solves some compiler warnings on linux
2018-08-30 08:54:21 +02:00
adb22fed8e
Passable fullscreen mode
...
- Centering is still a bit off
2018-08-30 00:09:55 +02:00
7b54e93893
Implemented leaderboard updates
2018-08-29 22:13:22 +02:00
3697e9b0b6
Adds hooks for all achievements
2018-08-29 14:31:20 +02:00
76d78600cb
Completed Steam api integration.
...
- Next step is to actually trigger the achievements in the right places.
2018-08-29 14:03:18 +02:00
f5a88fc10e
Introduces texture blending
...
- Makes indicator sprites transparent when the player is under them
2018-08-23 09:41:10 +02:00
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
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
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
6326a64111
Begins #42 Add boss 2 & 3
...
- Added "The cleric" for level 10.
2018-08-22 13:13:54 +02:00
f1b0045829
Introduces the "orc levels"
...
Also fixes some minor buggs.
2018-08-22 11:05:12 +02:00
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
bec9eb429d
Fixed a typo in skill tooltip
2018-08-21 16:21:22 +02:00
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
dbc36aab9f
Fixes #41 , Minimap
2018-08-21 15:44:12 +02:00
9ef97c0897
Fixes #38 , Artifact inventory
2018-08-21 12:42:23 +02:00
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
5f754d551a
Merge branch 'master' into dev
2018-08-19 20:26:28 +02:00
549f47ae0b
Minor code fixes and a slight tweak to the blue color
2018-08-16 14:09:54 +02:00
9a610d5f88
Adds window icon
...
- Fixes bug where you could move when falling.
2018-08-15 08:08:18 +02:00
6af8d9dd8f
Completes #8 First boss
...
- Adds "The Hell Hound" to level 5
2018-08-15 07:20:53 +02:00
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
Linus Probert