Commit Graph

362 Commits

Author SHA1 Message Date
OfficialCHenry
f58333aaaa reverted UIElementRenderer 2022-04-14 09:55:39 -04:00
OfficialCHenry
928027f1f5 Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-14 04:09:19 -04:00
OfficialCHenry
9a1ccea1b1 added some enemy locations, added cse380 sprites to be used 2022-04-14 04:09:16 -04:00
Kelly Peng
d92be29689 update Hiro fall and jump animation 2022-04-14 01:08:28 -04:00
OfficialCHenry
6e34e8b2d4 reverted resourceManager 2022-04-13 23:17:00 -04:00
OfficialCHenry
1f0764087a updated wolfie2d 2022-04-13 23:09:40 -04:00
Renge
d19a52e184 feat: added an example of enemy spawning 2022-04-13 19:43:16 -04:00
Renge
75ce98f947 fix: bug in getEnemies 2022-04-13 19:37:26 -04:00
Renge
d53b8ce4d3 feat: added player position 2022-04-13 18:56:35 -04:00
OfficialCHenry
d748b21dfe made buffbuttons a bit prettier
need to fix bounding box issues
2022-04-13 16:35:49 -04:00
OfficialCHenry
e433e41406 Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-13 16:28:10 -04:00
OfficialCHenry
c0017d66d8 fixed button bug
wolfie2d wasnt scaling mouseclick position according to zoom
2022-04-13 16:28:09 -04:00
Renge
d9f4a9702b fix: wrong position in RMG 2022-04-13 15:34:32 -04:00
Renge
3beaf76980 fix: wrong position in RMG 2022-04-13 15:25:42 -04:00
Kelly Peng
52278cb456 update gitignore for firebase 2022-04-13 10:25:22 -04:00
OfficialCHenry
465404afda added buff giving, took out fullscreen for now
bug with button location -> works with this.viewport.setZoomLevel(1);, but zoom level 2 doesnt change the click location, only the visual location
2022-04-13 00:56:43 -04:00
OfficialCHenry
82eafede7e Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-12 00:46:31 -04:00
Kelly Peng
46bc7f5921 update the end of the story 2022-04-12 00:22:49 -04:00
Kelly Peng
b7ae9daa10 adjustment for benchmark 2 deployment 2022-04-12 00:08:57 -04:00
OfficialCHenry
a2aecb2584 Update PlayerController.ts 2022-04-12 00:08:48 -04:00
Kelly Peng
cc34842dee add story draft 2022-04-11 22:36:56 -04:00
Kelly Peng
8e56aa9450 add some story and update hiro jump 2022-04-11 21:58:21 -04:00
Kelly Peng
5e932f8501 adding enemy snake sprites 2022-04-11 19:27:51 -04:00
OfficialCHenry
c60d5b9c9a added new Hiro animations 2022-04-11 16:28:58 -04:00
OfficialCHenry
66c698dd43 added range and dmg buff 2022-04-10 21:51:45 -04:00
OfficialCHenry
4c390f8cd5 Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-10 21:32:33 -04:00
OfficialCHenry
1b3946f56c added enemy killing 2022-04-10 21:32:22 -04:00
Renge
3231e46103 Merge remote-tracking branch 'github/master' 2022-04-10 20:27:13 -04:00
Renge
966be01643 fix: rewite some for loop in RMG and fix some bugs 2022-04-10 20:25:28 -04:00
Kelly Peng
0291e481f7 extend forest background 2022-04-10 20:25:23 -04:00
OfficialCHenry
d9b81428f4 Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-10 20:00:59 -04:00
OfficialCHenry
006701dbaf added seed ui 2022-04-10 20:00:57 -04:00
Renge
faeec383ba fix: fix some bugs in prev commit 2022-04-10 19:50:14 -04:00
Renge
9aa1495dd0 feat: implemented getPlayer and getEnemies, not tested 2022-04-10 19:46:13 -04:00
OfficialCHenry
417315cf08 added super simple ai
no GOAP yet
2022-04-10 18:58:09 -04:00
Kelly Peng
d8223358d8 update tileset with background 2022-04-10 04:26:21 -04:00
OfficialCHenry
eefc91944d Added Attack
used old slice anim + knife datatype, change when we have the chance.
2022-04-09 04:49:30 -04:00
Renge
12b470614f fix: change name xinyu xu to renge 2022-04-09 01:00:06 -04:00
Renge
db0cfd0bd2 feat: make RMG random 2022-04-09 00:50:05 -04:00
Renge
63bb9c3d79 fix: view port should track player 2022-04-08 20:16:20 -04:00
Renge
ecf14b4073 Merge remote-tracking branch 'github/master' 2022-04-08 19:49:41 -04:00
Renge
86fabc2336 feat: finished RandomMapGenerator, not fully tested 2022-04-08 19:49:06 -04:00
OfficialCHenry
e6c285e9c1 Added shell for game weapon system 2022-04-08 18:01:21 -04:00
OfficialCHenry
63f5a2a3a0 added weapon file frame 2022-04-07 00:33:02 -04:00
OfficialCHenry
0cd7cbab83 Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-06 22:55:46 -04:00
OfficialCHenry
4d04c27821 added player falloff
respawns(teleports) the player if they fall off the map
2022-04-06 22:54:57 -04:00
OfficialCHenry
d13a77e902 Added health tracker 2022-04-06 22:24:08 -04:00
Renge
0b98b964bd feat: add helper function in RMG 2022-04-06 22:11:52 -04:00
OfficialCHenry
deb90c26ba Increased Gravity 2022-04-06 21:59:18 -04:00
OfficialCHenry
1b6bbf8444 changed player collision size 2022-04-06 21:44:44 -04:00