Commit Graph

220 Commits

Author SHA1 Message Date
Renge
623b598b31 Merge remote-tracking branch 'github/master' 2022-04-21 13:32:38 -04:00
Kelly Peng
893d6950d8 adjust naming 2022-04-21 12:44:54 -04:00
Kelly Peng
e5d96ac554 add new icons 2022-04-21 12:43:53 -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
Kelly Peng
39a111903b add simple great wall tileset 2022-04-21 01:36:38 -04:00
Renge
94572c13a4 feat: testing code 2022-04-21 00:43:06 -04:00
Kelly Peng
ec639f17a8 update template 2022-04-20 21:41:41 -04:00
Kelly Peng
088fe27877 udpate porcelain tile color and update template 2022-04-20 20:27:10 -04:00
Kelly Peng
6d88885e13 update procelain template bg tiles and empty the entrance for entrance and exit 2022-04-20 20:11:56 -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
10238c96df Merge remote-tracking branch 'github/master' 2022-04-20 17:58:01 -04:00
Renge
ebabe03098 feat: implemented status bars for player 2022-04-20 17:57:14 -04:00
Kelly Peng
72acc6881b udpate porcelain tilemap exit 2022-04-20 17:49:22 -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
Kelly Peng
9e403a7185 add porcelain tileset 2022-04-20 01:56: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
dca4b275bb Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-16 23:03:22 -04:00
OfficialCHenry
6ffa74771f Capitalized file reference names 2022-04-16 23:01:54 -04:00
Renge
2e301b462a fix: case sensitive 2022-04-16 20:09:50 -04:00