Commit Graph

45 Commits

Author SHA1 Message Date
a6cc2b230c Merge remote-tracking branch 'origin/leveldesign' 2020-04-14 19:09:29 +02:00
74ce5a3af9 Deleted test levels and disabled debug menu 2020-04-14 18:59:58 +02:00
127b35f770 Merge branch 'master' of https://gitea.arnweb.nl/Hecc-inc./caa-game 2020-04-14 17:51:30 +02:00
63d61da310 Added pixel font 2020-04-14 17:51:10 +02:00
237dc36a62 Styled logo, title, tutorial and gameover screens 2020-04-14 17:50:53 +02:00
683c19569f [builds]: Removed electron-packager and initialized electron-builder 2020-04-14 15:38:21 +02:00
082dca9bd4 Fixed key checking on portal 2020-04-13 22:46:02 +02:00
643ca24bad [sounds]: Linked obtain sound to chest opening 2020-04-13 13:18:24 +02:00
4e2928bd7f [sounds]: Added obtain sound and Sonic Pi files 2020-04-13 13:08:31 +02:00
286d289750 [levels]: Updated 1-1 2020-04-13 11:50:25 +02:00
8bae2ac12f Reorganised assets and added gamescreens 2020-04-13 11:48:48 +02:00
7db584f46f [assets]: Updated tilemap to include assets for Door_s 2020-04-12 16:17:01 +02:00
79df435fd2 Merge branch 'master' into leveldesign 2020-04-12 11:58:51 +02:00
b8bc078694 [level]: Added 1-1 and 1-2 2020-04-12 11:21:30 +02:00
0b508af1df Fixed an issue with the stats when level switching 2020-04-12 11:20:03 +02:00
a57dab97ce Fixed some merge conflicts and moved some files 2020-04-11 21:12:44 +02:00
c530aff539 Added interaction pointers and shooting mages 2020-04-11 20:58:55 +02:00
68d2f862d5 [fix]: Fixed level switching bug. 2020-04-11 17:48:51 +02:00
0b07ff3f2a [code]: Added stats bar. 2020-04-11 17:47:15 +02:00
edba1ebfc6 [README] Added sections Installation and Building 2020-04-09 12:52:10 +02:00
feabc407f9 [builds]: Added build scripts to package.json. 2020-04-09 12:44:39 +02:00
20ca882cb6 Added more keys and doors 2020-04-08 16:59:49 +02:00
4f3468ed96 Fixed some issues with level switching and items 2020-04-08 12:36:03 +02:00
5a7573d9ae Added level switching 2020-04-08 10:14:24 +02:00
7832563728 Merge branch 'master' of https://gitea.arnweb.nl/Hecc-inc./caa-game 2020-04-07 12:14:27 +02:00
353d548771 Added keys, repellant and started level switching 2020-04-07 12:14:22 +02:00
e6984483c1 [assets]: Added pill, heart, key, stamina and fireball. 2020-04-07 12:01:47 +02:00
67ffda0154 Merge branch 'master' of https://gitea.arnweb.nl/Hecc-inc./caa-game 2020-04-06 22:51:58 +02:00
fe5e8cf993 Added portals and doors 2020-04-06 22:49:32 +02:00
2ad36e52e9 [assets]: Made tilemap more legible 2020-04-06 12:25:12 +02:00
02c8e5587c Added chests, variable levels and extra controls. 2020-03-31 10:33:44 +02:00
c86f2ed370 Added mages, stamina and improved running/walking 2020-03-29 15:40:57 +02:00
730bfbe568 Attempting to add some light 2020-03-26 20:09:30 +01:00
1bb9448408 Updated assets
Doubled the size of the tiles (tilemap.png, tilemap.min.js, level.js).
Doubled the size of the player (player.js).
Added the source files of the tilemap (res/aseprite).
2020-03-25 17:06:26 +01:00
ae4d53dc9a Added colission detection but the game is 2 small 2020-03-23 20:55:39 +01:00
61f7a91cca Updated movement and added textures by Job 2020-03-22 15:54:55 +01:00
98462b4c3f Initialized eslint and fixed linting issues 2020-03-15 17:31:32 +01:00
1f055471d3 Added simple main menu 2020-03-15 17:23:01 +01:00
40129ee818 Updated electron-reload so that it reloads the electron process when needed 2020-03-15 17:21:29 +01:00
ee365d4c1c Added settings menu 2020-03-04 10:20:00 +01:00
e0f25a25f4 Added electron-reload for hot reloading the renderer process. 2020-03-04 08:38:11 +01:00
1bf8fb648b Added level class and player movement 2020-03-02 22:06:16 +01:00
33ab4a4624 Added player entity and added some gfx for testing 2020-03-02 17:13:27 +01:00
2690ea0fdd Updated npm packages 2020-03-02 13:04:17 +01:00
f80b3c7522 First commit 2020-02-29 14:05:19 +01:00