walkero
/
breakhack
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity
772 Commits 7 Branches 40 Tags 19 MiB
Commit Graph

772 Commits

Author SHA1 Message Date
Linus Probert 94ec8cfba1 Removed bad options in .clang_complete 2018-10-18 15:21:03 +02:00
Linus Probert 669a2fb029 Merge branch 'master' into dev 
Conflicts:
	CMakeLists.txt
 2018-10-18 14:08:48 +02:00
Linus Probert a90321e377 Patch version raised to 2018-10-17 21:57:27 +02:00
Linus Probert 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
Linus Probert feed0e29fa Completes crumbling rooms. 2018-10-15 22:42:08 +02:00
Linus Probert 6e6f28dd8e Prevent tiles with chests from falling. 2018-10-15 22:42:08 +02:00
Linus Probert fd8799f36b Prevent tiles with objects on them from falling. 2018-10-15 22:42:08 +02:00
Linus Probert ee56143d0d Initial implementation of the falling tiles room modifier. 
Incomplete and always on right now.
 2018-10-15 22:42:08 +02:00
Linus Probert f65bdd0f13 Add license header to gamecontroller files 2018-10-14 22:43:45 +02:00
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 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