Commit Graph

319 Commits

Author SHA1 Message Date
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
OfficialCHenry
dc74bf5424 fixed attack animation to match with range buffs 2022-04-15 17:16:30 -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
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
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
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
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
966be01643 fix: rewite some for loop in RMG and fix some bugs 2022-04-10 20:25:28 -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
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
Renge
1679695b10 feat: implemented some functions in RandomMapGenerator 2022-04-06 19:29:17 -04:00
Renge
d3b2a7324b feat: implement some helper functions in RandomMapGenerator 2022-04-06 18:47:47 -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
cdbcd7ac8b fix: remove boundaries 2022-04-06 15:57:17 -04:00
Renge
1dd9c4177d fix: make the game full screen 2022-04-06 15:20:11 -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
Renge
3f7254ffb8 feat: added custiomized functions to ResourceManager 2022-04-05 21:02:01 -04:00
Renge
a1bc6aa095 fix: changed enmies to sprites 2022-04-04 11:48:50 -04:00
OfficialCHenry
3e1b3d2b4f Merge branch 'master' of https://github.com/kellypeng44/ShatteredSword 2022-04-04 03:23:14 -04:00
OfficialCHenry
6906d361b0 Added Tutorial Level and movement 2022-04-04 03:23:10 -04:00
Renge
3af91db74d feat: add weight for room 2022-04-04 00:45:26 -04:00
Renge
cf4e84320a feat: add corners to MapTemplate 2022-04-03 23:40:57 -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
OfficialCHenry
87ff0d5ec7 Added Player States 2022-04-03 17:43:50 -04:00
OfficialCHenry
9b335ba6ea Update index.html 2022-04-03 16:42:07 -04:00
Renge
018904cc90 feat: almost implemented story layer (TODO: BGM) 2022-04-03 14:29:42 -04:00
Renge
4f4461761a Merge remote-tracking branch 'origin/HEAD'
fix: fix bugs
2022-04-03 02:04:26 -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
43f1d941de attack inputs added to main.ts
may be redundant due to inputwrapper.ts
2022-04-02 21:09:01 -04:00
OfficialCHenry
0fe178d896
Update MainMenu.ts 2022-04-02 13:42:12 -04:00
Renge
520fb8837e fix: add width for entrances in MapTemplate 2022-04-02 12:34:54 -04:00
Renge
735754af56 feat: add MapTemplate 2022-04-02 12:33:48 -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
OfficialCHenry
ff133c4a65 Simple Main Menu
added for now - make prettier later
2022-04-02 00:02:24 -04:00
Renge
fb951259fa feat: implemented Localstorage manipulation and config and save 2022-04-01 18:25:57 -04:00
Renge
869ba41f13 init: initializr base code 2022-03-31 20:52:05 -04:00
ZGrandison
b901612c3c Bug fixes to engine across all HWs, event data for tweens 2022-03-31 19:03:21 -04:00
ZGrandison
82699642ca Misc fixes 2022-02-15 16:11:33 -05:00
ZGrandison
ff51b6911d fix for webGL rendering on main 2022-02-15 14:07:44 -05:00
ZGrandison
a0bace91a0
Origin/new engine features (#2)
* isolate features
2022-02-15 13:57:47 -05:00
ZGrandison
8b0f6f34a9 Updates for DocGenerator 2022-02-09 21:11:06 -05:00
Joe Weaver
363f3db4ad fixed bug with default group and scene creation 2021-04-24 16:07:53 -04:00
Joe Weaver
eb13a2d165 added support for vAlign modification for Labels 2021-04-05 11:13:57 -04:00
Joe Weaver
14c029e31f added support for changing volume of audio 2021-04-02 17:14:39 -04:00
Joe Weaver
760bdafe1c added support for flipped and rotated tiles 2021-04-02 13:23:34 -04:00
Joe Weaver
b085612908 added resource culling and resource saving in the ResourceManager 2021-03-19 15:44:11 -04:00
Joe Weaver
460d0e3643 fixed some bugs and added destroy() methods 2021-03-18 17:28:05 -04:00
Joe Weaver
c241aa99bc add Timers and Lines, and modified Registry 2021-03-04 19:10:41 -05:00
Joe Weaver
924469a2cd improved webGL shader, added label shader 2021-02-19 15:35:57 -05:00
Joe Weaver
4214ef7fd4 added webGL support 2021-02-15 19:44:47 -05:00
Joe Weaver
eeaf73bab4 started platformer demo, added features back to physics system 2021-02-05 13:56:56 -05:00
Joe Weaver
681d63f202 restructured project, added default scene, fixed viewport bug 2021-02-02 18:24:57 -05:00
Joe Weaver
1512fa5c8f separated Game from Gameloop 2021-01-26 14:18:48 -05:00
Joe Weaver
34b9a2d71d organized docs and split up interface file 2021-01-26 10:08:38 -05:00
Joe Weaver
9e0ebae63c added annotations to all files 2021-01-13 13:30:45 -05:00
Joe Weaver
3661ee3ada added better documentation to Nodes folder 2021-01-05 11:31:17 -05:00
Joe Weaver
ea33e71619 added a working physics system 2020-12-22 13:18:10 -05:00
Joe Weaver
4b8ebf360d improved visual debugging 2020-12-21 12:32:32 -05:00
Joe Weaver
b8849b4c84 added tween features 2020-12-01 14:04:24 -05:00
Joe Weaver
5bf6e96778 added tween animations 2020-11-29 19:49:04 -05:00
Joe Weaver
32d63ea2bf added animated sprites 2020-11-24 16:51:13 -05:00
Joe Weaver
b6a0aa569a abstracted rendering to renderingManager 2020-11-24 13:25:36 -05:00
Joe Weaver
3d275ba7f9 added slider and textInput uiElements 2020-11-18 12:20:33 -05:00
Joe Weaver
fff1ac4907 cleaned up UIElement code 2020-11-18 10:57:55 -05:00
Joe Weaver
6149b983a5 finished implementing physics layers and added support for tilemap editing with code 2020-11-16 11:02:45 -05:00
Joe Weaver
9dc8cd29d1 added demo level and started work on physics layer support 2020-11-15 08:26:49 -05:00
Joe Weaver
ff5a2896fe added pathfinding and ai factories, split layers, and made fixes to other factories 2020-11-04 14:03:52 -05:00
Joe Weaver
1047e31c70 added extra demo classes and implemented pathfinding groundwork 2020-10-28 14:55:32 -04:00
Joe Weaver
19028a9a58 reworked physics system 2020-10-25 17:46:43 -04:00
Joe Weaver
c77a947cc0 added stats 2020-10-21 15:30:13 -04:00
Joe Weaver
15dd74f45e fixed fps tracking in game loop 2020-10-21 06:38:03 -04:00
Joe Weaver
d9a87b2727 added viewport zoom 2020-10-18 18:34:13 -04:00
Joe Weaver
7a0f9e5c95 added state machine demo and added some features 2020-10-18 12:03:40 -04:00
Joe Weaver
25e0b8a39e added states and state machines for ai behaviors 2020-10-14 14:55:22 -04:00
Joe Weaver
f3449c1526 added AI support 2020-10-07 15:00:28 -04:00
Joe Weaver
254462993a converted all code to work with AABBs 2020-10-05 15:01:26 -04:00
Joe Weaver
a32066468f added quadtree scene graph and gave CanvasNodes boundaries 2020-09-28 18:57:02 -04:00
Joe Weaver
cf3c801bdb added y sorting for object layers 2020-09-23 14:30:29 -04:00
Joe Weaver
9cb4f55d9a added support for Tiled object layers 2020-09-20 14:05:22 -04:00
Joe Weaver
a67521ea26 added enums for event type and added an emitter class 2020-09-19 20:18:39 -04:00
Joe Weaver
d452678344 added viewport smoothing 2020-09-19 15:21:55 -04:00
Joe Weaver
90996115f1 made sounds play via EventQueue and flagged vars in ResourceManager 2020-09-16 14:45:37 -04:00
Joe Weaver
3a57a1acab commented code and cleaned formatting 2020-09-13 20:57:28 -04:00
Joe Weaver
8cb4fb7972 added scene changes 2020-09-07 22:15:49 -04:00
Joe Weaver
9e86192bb0 added audio and sprite loading 2020-09-07 15:38:10 -04:00
Joe Weaver
2093d8e4ab reworked scenes 2020-09-06 18:07:09 -04:00
Joe Weaver
214eba6e71 added resource loader 2020-09-05 00:04:14 -04:00
Joe Weaver
bd49258d30 cleaned up typescript inconsistencies in code 2020-08-24 18:54:52 -04:00
Joe Weaver
2dd60b5197 fixed tilemap physics 2020-08-20 20:45:48 -04:00
Joe Weaver
66ced08987 added some error checking to tilemaps and alpha value to scenes 2020-08-20 14:00:38 -04:00
Joe Weaver
bd961d04d3 fixed issues with tilemaps and physics 2020-08-18 14:48:47 -04:00
Joe Weaver
033680cf52 fixed bug with non-square tilemaps 2020-08-18 11:54:16 -04:00
Joe Weaver
201e1624c4 added basic collisions 2020-08-18 11:07:58 -04:00
Joe Weaver
e6d4d75cd5 added basic physics collision checks 2020-08-17 20:09:41 -04:00
Joe Weaver
f0bb31f61e added tilemaps and a resource loader 2020-08-17 10:34:31 -04:00
Joe Weaver
851fd050a7 added rounded buttons 2020-08-11 19:55:05 -04:00
Joe Weaver
606232d1d1 added debug message system 2020-08-10 20:09:52 -04:00
Joe Weaver
98c23cda40 added canvasItem factory and added parallax 2020-08-10 19:13:42 -04:00
Joe Weaver
b33b7b0a21 improved ui elements 2020-08-10 16:44:24 -04:00
Joe Weaver
91fcfd0a0d disabled right click on canvas and improved handling of blur 2020-08-10 13:51:33 -04:00
Joe Weaver
67bcba2c5f restructured game nodes and created canvas node subclass 2020-08-10 13:19:59 -04:00
Joe Weaver
40a05fdbdb transferred game engine code to typescript 2020-08-07 12:21:15 -04:00
Joe Weaver
e5d0678b5d initial commit 2020-08-03 16:51:20 -04:00