Commit Graph

295 Commits

Author SHA1 Message Date
OfficialCHenry
faa106c5ca added regular and special buffs, modified weapon atk and cooldown 2022-04-25 21:10:49 -04:00
Renge
59a41ed468 Merge remote-tracking branch 'github/master' 2022-04-25 21:06:48 -04:00
Renge
bc625b9530 fix: slime don't have a charge state 2022-04-25 21:06:27 -04:00
Kelly Peng
1d56c21a96 update porcelain map and button position in the level menu 2022-04-25 21:01:27 -04:00
Renge
76ac59ac9c fix: replace dying with charge animation 2022-04-25 21:00:50 -04:00
Kelly Peng
c6f5a46ff0 add great wall to level menu + update tilemap 2022-04-25 19:31:33 -04:00
Renge
1d73a39bad feat: add damage timer to stop enemy when it takes damage 2022-04-24 23:25:57 -04:00
Renge
17f4b00488 feat&fix: implement TigerAI and fix attack bugs 2022-04-24 23:11:45 -04:00
Renge
b2adaaa1db feat&fix: added collideWithPlayer to handle collision and fix attack bug 2022-04-24 22:46:34 -04:00
Renge
51be51916b feat: make SnakeAttack extend Attack 2022-04-24 22:29:15 -04:00
Renge
da99dc9883 feat: implemented snake ai 2022-04-24 22:26:35 -04:00
Renge
6f995ae005 fix: bug 2022-04-24 21:49:00 -04:00
Renge
35a7067f55 fix: remove weapons 2022-04-24 21:46:41 -04:00
Renge
50b3b4a7d7 feat: add type to addEnemy 2022-04-24 21:45:40 -04:00
Renge
6f4bbeb885 feat: implementing attack 2022-04-24 21:25:32 -04:00
Renge
42b58824cc fix: pause timer when not in gaming state 2022-04-24 21:12:15 -04:00
Renge
58ef5cb59f feat: add distance limitation to isPlayerVisible 2022-04-24 20:49:57 -04:00
Renge
94da5fef26 fix: enemy play walk animation 2022-04-24 20:47:24 -04:00
Renge
1726ba3653 fix: enemy fall out of map 2022-04-24 20:35:41 -04:00
Renge
7478f4bb1f feat: implemented alert 2022-04-24 20:15:34 -04:00
Renge
7c63a7957b fix: make EnemyAI StateMachineAI and fix patrol bug 2022-04-24 19:51:23 -04:00
Renge
7550a4381c fix: stop music when level ends 2022-04-24 18:47:33 -04:00
Renge
b1028611f2 feat: add dash animation 2022-04-24 18:41:17 -04:00
Renge
201bfccd85 Merge remote-tracking branch 'github/master' 2022-04-24 18:19:01 -04:00
Renge
afb7d2bac5 fix: reset timer in mainmenu 2022-04-24 18:18:36 -04:00
OfficialCHenry
45596fdbc0 added background music 2022-04-24 16:53:18 -04:00
OfficialCHenry
da1f86628d took out enemies before forest start checkpoint, fixed empty buff object 2022-04-24 16:13:32 -04:00
OfficialCHenry
a65873c349 Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-24 15:15:33 -04:00
OfficialCHenry
502af9c7eb removed attack from enemyAI 2022-04-24 15:15:20 -04:00
Renge
b59dc3e585 feat: added keys for buff 2022-04-23 22:34:17 -04:00
Renge
3b0de4b789 fix: playerLevelLabel size and position 2022-04-23 22:24:24 -04:00
Renge
12d8aa97e4 fix: remove player position updating 2022-04-23 22:18:15 -04:00
Renge
c5e40103a2 fix: bugs in GameOver 2022-04-23 22:06:52 -04:00
Renge
17afceee47 fix: timer 2022-04-23 21:54:28 -04:00
Renge
8e68d60dba fix: zoomLevel issue 2022-04-23 21:48:12 -04:00
Renge
5277697af6 feat: implement goToNextLevel(very buggy) 2022-04-23 21:17:43 -04:00
Renge
797d571b76 feat: added checkpoints generator and timer 2022-04-23 20:45:17 -04:00
OfficialCHenry
a05c0a1721 changed some enemy collision sizes, added slice outlines, fixed enemy attack times, added damage multiplier instead of def 2022-04-23 18:53:29 -04:00
OfficialCHenry
6f66b9666c Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-23 17:24:46 -04:00
OfficialCHenry
75e70a00ba added lives label, player level label, level up sound 2022-04-23 17:23:53 -04:00
Renge
9ea4c888e7 fix: change some UI locations 2022-04-23 16:25:37 -04:00
Renge
aedb50f0ad fix: many UI bugs 2022-04-23 16:21:25 -04:00
Renge
de822a8111 fix: storytextLabel 2022-04-23 15:51:57 -04:00
Renge
92bec39248 fix: UIs 2022-04-23 15:36:15 -04:00
Renge
721b4544ac feat: change canvassize to 720p and modify the buff button to fit the new size 2022-04-23 15:18:39 -04:00
Renge
301a290ebb fix: remove nodes in debug mode 2022-04-23 15:05:14 -04:00
Renge
832e42affa feat: implemented checkpoint 2022-04-22 15:56:12 -04:00
qndydyhm
2bf59346f7
fix: game node undefined 2022-04-23 00:56:49 +08:00
OfficialCHenry
d4e69bb3ff fixed shield generation, fixed addhealth 2022-04-22 12:37:35 -04:00
Renge
858a8bbfd4 fix: destroy uis after enemy died 2022-04-21 15:53:05 -04:00
Renge
845dcb8132 fix: keymapping 2022-04-21 15:38:59 -04:00
Renge
e0bf851843 feat: added google form 2022-04-21 15:34:15 -04:00
Renge
fc2e00f50c fix: remove extra rooms 2022-04-21 15:07:06 -04:00
Renge
d1b32642d5 Merge remote-tracking branch 'github/master' 2022-04-21 14:50:47 -04:00
Renge
936fda06ea fix: bug in RandomMapGenerator 2022-04-21 14:50:29 -04:00
OfficialCHenry
b9b3accff2 Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-21 14:34:23 -04:00
OfficialCHenry
67c9a89f82 added jump and hurt sound 2022-04-21 14:34:14 -04:00
Renge
60c18a4765 feat: added check point 2022-04-21 14:31:03 -04:00
OfficialCHenry
2cd51cdbbd change snake spawn chance 2022-04-21 14:04:04 -04:00
OfficialCHenry
5d9d43e4a4 increased dot icon size, moved snake falling to just tutorial 2022-04-21 14:01:44 -04:00
OfficialCHenry
d79d00370b moved snaksspawn to tutorial only 2022-04-21 13:46:09 -04:00
Renge
623b598b31 Merge remote-tracking branch 'github/master' 2022-04-21 13:32:38 -04:00
OfficialCHenry
1fce158301 added bufflabels 2022-04-21 12:42:08 -04:00
Renge
660d212ef2 fix: ui for buff 2022-04-21 11:49:33 -04:00
OfficialCHenry
81499d0fd8 Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-21 11:46:04 -04:00
OfficialCHenry
5e33b8a71f quick fix 2022-04-21 11:44:45 -04:00
Renge
b245e2a426 feat: implement dot status 2022-04-21 11:36:58 -04:00
OfficialCHenry
a334e94886 Merge remote-tracking branch 'origin/master' 2022-04-21 04:56:58 -04:00
OfficialCHenry
d4cdfa82f4 added snakes falling, buggy enemy attacks, GOAP not working correclty 2022-04-21 04:51:56 -04:00
Renge
94572c13a4 feat: testing code 2022-04-21 00:43:06 -04:00
Renge
da1e053033 fix: some bugs in rmg 2022-04-20 19:57:26 -04:00
Renge
86e5a5b7b4 fix: somebugs in rmg 2022-04-20 19:26:21 -04:00
Renge
bee0a4264a feat: implemented healthbar for enemies 2022-04-20 18:31:53 -04:00
Renge
ebabe03098 feat: implemented status bars for player 2022-04-20 17:57:14 -04:00
OfficialCHenry
07665e0e6f added buff strings, quick bugfix 2022-04-20 17:07:50 -04:00
OfficialCHenry
c1a00694f6 added dot effects
need to add dot dmg buff
2022-04-20 15:11:30 -04:00
OfficialCHenry
e0b399af43 changed invincibility logic + fixed merge errors 2022-04-20 14:27:18 -04:00
OfficialCHenry
5618e95940 Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-20 14:04:35 -04:00
OfficialCHenry
f8a87027b9 added some new buffs - still need to implement them 2022-04-20 14:03:13 -04:00
Renge
3e40298d4c feat: add invincibility to dash 2022-04-20 13:57:11 -04:00
Renge
abebaf2615 fix: hurt animation 2022-04-20 13:53:55 -04:00
Renge
f72d2968d1 refactor: refactor GameLevel and Tutorial 2022-04-20 12:49:59 -04:00
Renge
7fdf9622e9 fix: pause player sprites 2022-04-20 12:33:43 -04:00
Renge
4b01a69440 feat: beautify UIs 2022-04-20 12:19:17 -04:00
Renge
3b449273a3 feat: added gray background to pause, story and buff layer 2022-04-19 20:49:16 -04:00
Renge
176157866d feat: implemented pause layer and cheat code 2022-04-19 13:50:48 -04:00
Renge
cc3b005ae7 feat: game pause 2022-04-19 12:25:01 -04:00
Renge
61ba24da75 fix: add invicibility to shield 2022-04-19 12:10:21 -04:00
Renge
fc8f313dcc fix: hard code the size of game to 1080p and set background color to black 2022-04-19 12:05:52 -04:00
OfficialCHenry
e6f1cbcf39 added gaining shield on hit 2022-04-19 02:16:29 -04:00
OfficialCHenry
a0271d7a97 added collisions damage and i-frame when taking damage 2022-04-19 01:32:58 -04:00
OfficialCHenry
c87c5d9af0 added player shield and exp 2022-04-18 23:52:25 -04:00
Renge
5520e91336 feat: update player position 2022-04-17 20:23:54 -04:00
Renge
1a05c73f8e fix: remove storytester and freeze gravity when pausing 2022-04-17 19:52:01 -04:00
Renge
9e979b6fe7 feat: integrated story into GameLevel 2022-04-17 19:46:10 -04:00
Renge
d3bcb0df79 fix&feat: make dash smother and make it available for all states 2022-04-17 19:22:09 -04:00
Renge
88535c4529 feat: pause animation 2022-04-17 16:27:47 -04:00
Renge
7a1d6c668e feat: enemy pause 2022-04-17 15:47:55 -04:00
Renge
f584280f50 feat: implemented InputWrapper and replace Input 2022-04-17 15:42:12 -04:00
OfficialCHenry
6ffa74771f Capitalized file reference names 2022-04-16 23:01:54 -04:00