5f754d551a
Merge branch 'master' into dev
2018-08-19 20:26:28 +02:00
30058ea4e0
Creates gui_util and moves some code out from gui.c
2018-08-19 20:25:31 +02:00
549f47ae0b
Minor code fixes and a slight tweak to the blue color
2018-08-16 14:09:54 +02:00
3fabd039a4
Prevents artifacts before level 3
...
- Also fixes a potential segfault
2018-08-15 18:16:44 +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
915ea59ca3
Fixes a mistake in music loading.
2018-08-14 17:00:10 +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
1a09328793
Adds boss music and an additional attribution line per request.
2018-08-14 13:15:22 +02:00
6633db7aa4
Adds room objects and FIRE rooms.
2018-08-13 13:11:32 +02:00
292f549d57
Minor compiler warning fix
2018-08-12 19:48:14 +02:00
369cfda70b
Completes #33 Create score screen
2018-08-12 19:43:33 +02:00
254417271c
Began #33 Create score screen
...
Adds the backend (db) part of hiscores, next step is to create the
screen.
2018-08-12 16:14:07 +02:00
ffd777e055
Buggfixes
...
- Change credit screen font color
- Main menu monsters are back
2018-08-12 10:45:52 +02:00
3f1cdf8a12
Fixes : #5 Creates a creditscreen
2018-08-12 09:13:18 +02:00
2a80434547
Adds posibility for daggers hitting walls to be recoverable.
2018-08-11 23:35:16 +02:00
69e5ff99e0
Fixes #35
2018-08-11 20:16:23 +02:00
b4a6c4b46f
Fixes some render layer issues
...
- Chance for more daggers in containers
- Less health from meat
- Prevent exit from spawning under containers
2018-08-11 15:15:53 +02:00
4ba301769a
Fixes : #30
...
- Also fixes a bug with artifact generation
- Extends menu room with new features
- Adds more descriptive text to container openings
- Fixes bug with container loot generation
2018-08-10 22:31:06 +02:00
62d1bbd49d
Completes #31 Adds chests to game
2018-08-10 20:09:56 +02:00
1c7631cf52
Starts #31 Items: Chests
...
Lua gen code remains to do
2018-08-10 14:29:45 +02:00
83aa92943f
Don't open menu immidiately upon death.
2018-08-10 13:29:12 +02:00
5e3815a233
Fixes : #34 hopefully
2018-08-10 13:18:56 +02:00
71c1279ef7
Completes #2 artifacts
2018-08-10 13:00:23 +02:00
8dd774b308
Continues #2 Completed impl of INCREASED_STUN
...
- That should be all artifacts implemented. Last step is the random
generation and drop rate.
2018-08-09 16:18:34 +02:00
ba1d09ad51
Continues #2 completed impl of DAGGER_RECOVERY
2018-08-09 16:15:22 +02:00
19e7583f3e
Continues #2 FEAR_INDUCING impl
...
This required changes (improvements imo) to the monster state logic.
2018-08-09 16:09:47 +02:00
0aacdd2d84
Continues #2 Adds PUSH_BACK impl
2018-08-09 15:31:27 +02:00
ac7dada0d5
Fixes #23 possibly
2018-08-09 15:15:25 +02:00
a04f131c2d
Continues #2 : Adds charge skill impl
...
- Also adds an arti pickup sound
2018-08-09 13:58:16 +02:00
736eb79996
Continues #2 : Artifacts
...
- Adds sparkle effect on artifacts
- Implements TRAP_AVOIDANCE, IMPROVED_HEARING
2018-08-08 14:46:59 +02:00
095c93e5b2
Began #2 : Added artifacts and the PIERCING_DAGGERS modifier
...
Still need to add the rest of the artifact effects but that should be
simpler from this point.
2018-08-08 00:14:24 +02:00
611d8ef4d6
Fixes a minor bug in the guerilla behaviour
2018-08-06 19:38:27 +02:00
aaa8e8c36e
Makes stunned enemies "wobble" instead of having an indicator.
...
- Also adds more decorations to rooms.
2018-08-06 13:34:27 +02:00
ffde0793e5
Fixes : #4 Room stuff: Traps
...
- Adds traps
- Adds lua hooks for traps
- Fixes level exit in pit bug
2018-08-06 00:28:23 +02:00
a3c3c634d6
Adds the bash sound effect
2018-08-05 15:47:56 +02:00
41a902181a
Fixes a bunch of msvc warnings
2018-08-05 15:01:25 +02:00
484fb30a89
Changes the log to fill from the bottom
...
Looks more natural this way.
2018-08-05 12:48:56 +02:00
d8615b2f14
Changes stun icon and fixes some syntax reports from codacy
2018-08-05 11:00:43 +02:00
9fe2edee85
Fixes : #29 and #17 New skill: bash
...
Adds the bash skill and the stunned state.
Stunned enemies have disadvantage while stunned.
2018-08-04 23:52:52 +02:00
56af37edb0
Removing natural lighting debug.
...
After implementing line of sight light it did not look good at all with
this size of tiles. Keeping as is for now.
2018-08-04 14:07:17 +02:00
c16caf30b5
Comments out unused function
2018-08-03 11:08:44 +02:00
353b4ed1c5
Adds raycasting debug
...
Next step is to actually implement the Bresenham Line Algorithm to make
line of sight and object shadowing a reality.
2018-08-03 10:45:54 +02:00
68cf24ddf8
Dropps the particle line slash effect.
2018-08-03 10:44:30 +02:00
2aee3600e6
Merge branch 'master' into dev
2018-08-03 10:41:21 +02:00
1124e88df0
Minor fixes
...
- Make skills correctly turn the player
- Don't repopulate the matrix on every frame only on turn change
2018-07-31 23:45:09 +02:00
4819eda1dd
Adds "NEW GAME" menu option to game over menu
...
Also makes menu open when player dies
2018-07-31 23:13:30 +02:00
4612cabe00
Adds sword animation to flurry
...
And XP gain to charge skill.
2018-07-31 21:23:01 +02:00
b9a4a8002d
Fixes : #27 Suspicious code: sign conversion
2018-07-31 21:15:16 +02:00
58e9c7ed13
Fixes : #21 Complex method issue in monster.c
...
At least this is an attempt at a fix
2018-07-31 21:08:36 +02:00
b12e5d4f7a
Fixes : #26 Dagger kills should now give XP
2018-07-31 14:30:41 +02:00
18e70221fa
Restructured main game loop a bit. Reduced function size
2018-07-28 14:28:55 +02:00
252955bc8d
Removes "resume" option from menu when game over.
2018-07-09 22:53:52 +02:00
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
c96d0b6718
Removes bug that made it possible to move with daggers in air.
2018-07-06 22:30:28 +02:00
c6b643835b
Added codefactor badge and fixed blank line issue.
2018-07-06 12:12:27 +02:00
f36a9dd2ac
Sleeping state indicator is always visible.
2018-06-28 12:50:32 +02:00
53dc7e2fe6
Possibly more accurate scaling.
2018-06-23 14:30:29 +02:00
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
ec6722106a
Adds an idea for slash animations that didn't look very good.
2018-05-22 23:01:15 +02:00
cc229c8b00
Prepares pengine for more particle types.
...
Also fixed an invalid read bug.
2018-05-22 22:42:06 +02:00
bbe4526947
Fixes colors to use defines.
2018-05-22 15:48:09 +02:00
2462e4cf33
Adds sentinel monster behaviour.
2018-05-21 21:03:59 +02:00
a66f16de79
Reintroduces the pointer and mouse menu operation.
2018-05-20 17:25:53 +02:00
123ae90f59
Better mod key logic in input and mouse motion check.
2018-05-20 16:53:16 +02:00
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
186cc7b514
Replaced state logic with behaviours instead.
2018-05-19 17:55:10 +02:00
60114ed159
Hopefully fixes the build issues
2018-05-18 23:11:33 +02:00
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
138cba1400
Mock test for keyboardinput and fixed the found issues
2018-05-18 13:49:31 +02:00
2feeb5cbcf
Attempts to fix appveyor build
2018-05-17 23:34:44 +02:00
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
c4dc8382a9
Monsters now indicate their state with speech bubbles
2018-05-17 21:41:23 +02:00
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
bc0d194dce
Additional fall sounds
...
Wilhelm scream
2018-05-16 15:52:39 +02:00
fa8797a20f
Removed a memory leak and MACROD colors
2018-05-15 23:21:28 +02:00
853d390427
Some create package dir in travis
2018-05-15 14:21:54 +02:00
6d5acc698e
Nicer labels in many places.
2018-05-15 14:12:38 +02:00
b88318097f
Render texts after particles.
2018-05-15 11:20:52 +02:00
d6daf7b798
Nicer action texts
2018-05-15 11:16:56 +02:00
524e10ac8f
Adds camera shake.
...
Removed some old buildfiles that had accidentally made it into the repo.
2018-05-13 23:32:44 +02:00
0576c47bb2
Fixed the frame sprites
2018-05-12 10:47:06 +02:00
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
2122300f6e
Prepare for texture streaming and locking.
...
The intention is to static stream the gui areas into one big texture.
2018-05-08 16:34:22 +10:00
9d7669fd35
Some updates regarding asset management
...
Had an idea of self-cleaning the cache but it didn't hold. Leaving the
stuff I wrote that might not be useless in the future.
2018-05-06 13:27:29 +02:00
da75ccde23
Removed an unused timer on Projectiles
2018-05-06 07:33:00 +02:00
db21bb813f
Removed clang warnings
2018-05-06 06:19:59 +02:00
efe062993b
Always play sound when daggers hit/miss something
2018-05-05 21:36:16 +02:00
3665c7ff66
Rotate daggers instead of using spritesheet
...
Don't know if this is bad for performance but it does make things
simpler.
2018-05-05 21:29:08 +02:00
677a7d8b69
Changes to settings.c db queries
...
Sort of experimental. No harm but perhaps not an improvement.
2018-05-05 20:59:53 +02:00
f290a0dc1c
Prepared for more skills
2018-05-04 18:14:44 +02:00
fcf1f24547
Fixed log prints in release mode and some better fail handling.
2018-05-04 01:22:40 +10:00
5efef180a5
Fixes the release build
2018-04-28 19:10:49 +02:00
a350f66290
Removes some of the spammy logs.
...
Not as important now that there is an in game log.
2018-04-28 19:03:23 +02:00
6896308451
Use SDL to detect screen dimensions
...
Supports macOS, remove dependency on X11
2018-04-28 15:05:56 +10:00
8647eaa7a4
Coloured, file, function and line referenced debug output.
2018-04-21 22:58:53 +02:00
04a3691463
Removes some GCC warnings
2018-04-20 14:46:00 +02:00
cab3b501fc
Borke out some of the settings sqlite code to it's own module.
2018-04-16 21:19:26 +02:00
89e7f84870
Removes a minor warning
2018-03-29 20:32:44 +02:00
cee584832e
Fixed multiple pits in layout file
2018-03-26 13:53:45 +02:00
0a21a2d915
Adds falling into pits
...
Monsters also avoid pits. Still need more pit layouts and
prevent monsters from "spawning" in pits.
2018-03-25 23:30:26 +02:00
1206ec8a2d
Merge branch 'master' into feature/pits
2018-03-24 12:53:43 +01:00
9a3dd410ab
Particle sparcle when skill unlocks
...
Minor modification to dagger damage
2018-03-24 12:46:23 +01:00
7386b3d582
Adds levelcaps to skills
...
Still need to add the sparkles when they activate
2018-03-23 22:03:34 +01:00
fa20d2a689
Merge branch 'master' into pit_implementation
2018-03-22 16:03:12 +01:00
2204c7bade
Safety fixes
2018-03-22 12:52:27 +01:00
9feed28357
Initial addition of pits
...
Need more options, tile type to handle damage and death.
Prevent monsters from spawning in pits etc.
2018-03-20 21:54:57 +01:00
38a05e099d
Removed coverity_scan badge. Fixed a warning
2018-03-20 07:33:02 +01:00
c8386ee719
Adds prevention from passive monsters being "dodgy"
...
When player gets close to passive monsters they will stop moving now.
This should prevent annoying behaviour when trying to line up a strike.
2018-03-19 10:25:32 +01:00
9b4de91e13
Toggle sound and music from everywhere
2018-03-17 09:03:29 +01:00
a53c8fe525
Don't commit the settings file
2018-03-17 00:21:46 +01:00
2ca2a4f98c
Added persistent settings
2018-03-17 00:04:26 +01:00
8a2cb3b446
Embed sqlite3
2018-03-16 19:46:28 +01:00
42fd246185
Add direction to windy rooms in lua
2018-03-16 10:04:43 +01:00
2393608682
Removed a lint error
2018-03-15 17:00:11 +01:00
07136c70f9
Windy rooms affect player
...
Left a possibility to make it affect projectiles.
2018-03-15 16:30:41 +01:00
eb345cfc25
Adds the windy room effect
2018-03-15 11:30:18 +01:00
1bea221369
Smooths out some glitches
...
Don't move dead monsters. Don't run player and monster turn in one frame. Fixes a bad "position_in_room" check.
2018-03-13 23:36:39 +01:00
d983318453
Better linkedlist clearing
...
Fixed a projectile update bug due to invalid map pointer. Cleaned up some of the "clear stuff from linkedlist" functions to a nicer implementation. Perhaps not as efficient but certainly nicer.
2018-03-13 21:47:49 +01:00
d6c21745cd
Add possibility to retrieve thrown daggers.
2018-03-13 16:51:08 +01:00
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
bd2cce6447
Removed mingw warning
2018-03-13 09:37:51 +01:00
2c803da0cd
Faster dagger rotation and skill direction change
2018-03-12 12:35:28 +01:00
5f4140fb6f
Increases dagger speed, Adds charge pickup and dagger sound.
2018-03-12 09:09:03 +01:00
ca83fa38fe
Better dagger throw hits and new skill graphics.
2018-03-11 21:06:46 +01:00
c360aa75ee
Added dagger throw skill
...
There are still some quirks that could need some love surrounding this
skill. Check the reset countdown for example.
2018-03-10 22:04:03 +01:00
be8677cb39
Adds projectiles
...
Collisions still need implementing and an underlying skill + some drawing.
2018-03-08 00:58:26 +01:00
d564a559dc
Adds essentially nothing. Some convenience functions. That is all
2018-03-07 19:15:08 +01:00
5e0bbe423d
Added nice info messages across the screen
2018-03-07 16:02:56 +01:00
cc2b659020
Removes a memory leak
2018-03-06 13:50:43 +01:00
bac0c62a10
Remove some memory leaks
2018-03-06 10:27:25 +01:00
c5abf71735
Fixed the builds.
2018-03-03 13:33:14 +01:00
e41e560219
Aggressive monster now path a lot better
2018-03-03 12:56:53 +01:00
0b98cad726
Fix bug with player hit text and prevent fight pickups
2018-03-03 00:54:50 +01:00
f9a91c0922
Removes codacy issue
2018-03-02 17:07:15 +01:00
f7ec1195f4
Adds skill return countdown.
...
Also removes ability to wall-bonk exploit the countdowns.
2018-03-02 17:05:13 +01:00
b6c5edbd92
Adds swoosh sound to charge skill
2018-03-01 19:46:23 +01:00
b05f9333dc
Adds "speed lines" to charge skill
2018-03-01 19:37:57 +01:00
7e596a251e
Adds the charge skill
2018-03-01 13:48:03 +01:00
06cdebc3b3
Better flurry sounds
2018-03-01 06:47:16 +01:00
da2ec32981
Removes some duplicate code in player.c
2018-03-01 06:14:01 +01:00
c42e6fa621
Removed all the warnings from gcc
2018-03-01 06:04:12 +01:00
2253479532
Adds skills, 'flurry' skill and sip_potion skill.
...
Removes shift-h sipping.
2018-02-28 22:31:38 +01:00
20cb94b529
Skill ideas. Not sure I like them.
2018-02-28 15:28:45 +01:00
727e1f5dd3
Minor message change
2018-02-28 09:32:37 +01:00
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
e161d6becb
Just some code cleaning that i stumbled upon
2018-02-24 21:47:09 +01:00
ce2bb2ff43
Removed mingw warning.
2018-02-24 21:24:19 +01:00
71c7345c78
Weight monster loot according to player health.
...
More health in flesh and more flesh sprites.
2018-02-24 21:15:13 +01:00
462a22f7a0
Starts an idea for skills. Not sure I like it.
2018-02-24 07:13:28 +01:00
Linus Probert
Linus Probert
Cong
Linus_Probert