Commit Graph

153 Commits

Author SHA1 Message Date
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
832e42affa feat: implemented checkpoint 2022-04-22 15:56:12 -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
OfficialCHenry
67c9a89f82 added jump and hurt sound 2022-04-21 14:34:14 -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
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
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
e0b399af43 changed invincibility logic + fixed merge errors 2022-04-20 14:27:18 -04:00
OfficialCHenry
f8a87027b9 added some new buffs - still need to implement them 2022-04-20 14:03:13 -04:00
Renge
f72d2968d1 refactor: refactor GameLevel and Tutorial 2022-04-20 12:49:59 -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
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
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
OfficialCHenry
1c1744002f added extrajump and dash 2022-04-14 21:22:52 -04:00
OfficialCHenry
f58333aaaa reverted UIElementRenderer 2022-04-14 09:55:39 -04:00
OfficialCHenry
9a1ccea1b1 added some enemy locations, added cse380 sprites to be used 2022-04-14 04:09:16 -04:00
OfficialCHenry
6e34e8b2d4 reverted resourceManager 2022-04-13 23:17:00 -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
c0017d66d8 fixed button bug
wolfie2d wasnt scaling mouseclick position according to zoom
2022-04-13 16:28:09 -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
Kelly Peng
cc34842dee add story draft 2022-04-11 22:36:56 -04:00
OfficialCHenry
c60d5b9c9a added new Hiro animations 2022-04-11 16:28:58 -04:00
OfficialCHenry
1b3946f56c added enemy killing 2022-04-10 21:32:22 -04:00
OfficialCHenry
006701dbaf added seed ui 2022-04-10 20:00:57 -04:00
OfficialCHenry
417315cf08 added super simple ai
no GOAP yet
2022-04-10 18:58:09 -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
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
OfficialCHenry
1b6bbf8444 changed player collision size 2022-04-06 21:44:44 -04:00
Renge
1679695b10 feat: implemented some functions in RandomMapGenerator 2022-04-06 19:29:17 -04:00
Renge
e74b36585f fix: wrong format of forest template
feat: some functions in RMG
2022-04-06 18:01:23 -04:00
Renge
feb9fb824f fix: make readJSON non async 2022-04-06 16:59:22 -04:00
Renge
21068c799a fix: deleted animatedsprites in story
not finish loading function yet
2022-04-06 14:37:02 -04:00
Renge
edcc5eaffc fix: minor bug 2022-04-06 14:26:44 -04:00
Renge
ada01b6b8d fix: change line in text label and avoid reloading same resource 2022-04-06 14:22:51 -04:00
Renge
c62bd6b209 feat: tested load single audio/image 2022-04-06 13:24:06 -04:00
Renge
11e3362bf2 feat: added loadTilemapFromObject 2022-04-05 22:16:22 -04:00
OfficialCHenry
6906d361b0 Added Tutorial Level and movement 2022-04-04 03:23:10 -04:00
OfficialCHenry
5bc079756d Added Player States 2022-04-03 20:31:06 -04:00
Renge
11dffbd718 refactor: clear the code of SceneWithStory and add comments to it 2022-04-03 18:48:52 -04:00
Renge
a3009dcbbf Merge remote-tracking branch 'github/master' 2022-04-03 18:24:19 -04:00
Renge
6d86a8664b fix: add required properties to MapTemplate 2022-04-03 18:23:29 -04:00
OfficialCHenry
16370ee776 Create GameLevel.ts 2022-04-03 18:07:45 -04:00
Renge
018904cc90 feat: almost implemented story layer (TODO: BGM) 2022-04-03 14:29:42 -04:00
Renge
b8593627bc Merge remote-tracking branch 'github/master' 2022-04-02 21:45:39 -04:00
Renge
425f8b29b5 feat: partially implement storymode 2022-04-02 21:44:53 -04:00
OfficialCHenry
c782fa233a Create SplashScreen.ts
added a splash screen scene file, will use once a splash is available
2022-04-02 21:18:11 -04:00
OfficialCHenry
0fe178d896
Update MainMenu.ts 2022-04-02 13:42:12 -04:00
OfficialCHenry
ff8db44104 Added level buttons
Added buttons to go to levels, they route back to main menu for now
2022-04-02 00:26:17 -04:00