Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Milestone 5 #12

Merged
merged 42 commits into from
Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c9716c5
fix gh-pages asset loading
smileynet Feb 25, 2023
f8528b7
update name and favicon
smileynet Feb 26, 2023
8523cd5
fix asset loading for gh-pages
smileynet Feb 26, 2023
3e482fb
update readme
smileynet Feb 26, 2023
d369342
ractor actions
smileynet Feb 26, 2023
67ab753
add css editor settings
smileynet Feb 26, 2023
d5117b3
fix css style
smileynet Feb 26, 2023
3903620
refactor putout suggested changes
smileynet Feb 26, 2023
4843012
update project settings to add react & redux
smileynet Feb 26, 2023
6aa1835
add react as entry point
smileynet Feb 26, 2023
43c29c8
add App unit test
smileynet Feb 26, 2023
1777723
fix Directions type
smileynet Feb 27, 2023
22f6f6b
remove unused performAction method
smileynet Feb 27, 2023
c8f2b02
fix interactable direction reference
smileynet Feb 27, 2023
1ffef7a
refactor thing tests to interactable
smileynet Feb 27, 2023
e933e16
remove thing test
smileynet Feb 27, 2023
6fa325c
add react settings
smileynet Feb 27, 2023
f59cc4d
remove gh-pages
smileynet Feb 27, 2023
6964bcd
remove unused imports
smileynet Feb 27, 2023
7ae081d
fix jest tests
smileynet Feb 27, 2023
9e507fc
remove cypress
smileynet Feb 27, 2023
c709a00
config updates
smileynet Mar 4, 2023
f1eaff3
add player healthbar
smileynet Mar 4, 2023
e872e51
Add healthBar to object on player focus.
smileynet Mar 4, 2023
fd11bae
Add healthBar to object on player focus.
smileynet Mar 4, 2023
d54ba9c
Code cleanup - Fix #6 #7
smileynet Mar 4, 2023
20650fe
Code cleanup - Fix #6 #7
smileynet Mar 4, 2023
17ec584
Merge remote-tracking branch 'origin/milestone-5' into milestone-5
smileynet Mar 4, 2023
da1a740
add broken and destroyed cases to feature test
smileynet Mar 4, 2023
58c4f7a
refactor with even more composition
smileynet Mar 5, 2023
99683de
Update tests
smileynet Mar 5, 2023
36fbcbc
refactor event bus with logging
smileynet Mar 5, 2023
d743374
add multi-directional movement
smileynet Mar 5, 2023
9b0e3e3
Added extensive debugging system with toggles.
smileynet Mar 5, 2023
066a353
Fix health constructor
smileynet Mar 6, 2023
65ce756
Fix health constructor
smileynet Mar 6, 2023
f7391ae
fix universe interactable deletion, refactor playerControl and Action…
smileynet Mar 7, 2023
ecba055
fix universe interactable deletion, refactor playerControl and Action…
smileynet Mar 7, 2023
1f68554
fix healthBar movement
smileynet Mar 8, 2023
9ebbae5
Closing milestone 5
smileynet Mar 8, 2023
bcf25ec
Merge branch 'main' into milestone-5
smileynet Mar 8, 2023
6ee9557
build fixes
smileynet Mar 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix health constructor
Signed-off-by: Sam Biggins <sambiggins@gmail.com>
  • Loading branch information
smileynet committed Mar 6, 2023
commit 65ce756238f8ec75722de1535dbcbd7f15ffd083
18 changes: 16 additions & 2 deletions src/utilities/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
import { createSprite, getGameHeight, getGameWidth } from './helpers';
import {
BooleanToggle,
createSprite,
getGameHeight,
getGameWidth,
toggleOrSetState
} from './helpers';
import log from './logging';
import { assetPackUrl } from './constants';

export { getGameWidth, getGameHeight, createSprite, log, assetPackUrl };
export {
getGameWidth,
getGameHeight,
createSprite,
log,
assetPackUrl,
toggleOrSetState,
BooleanToggle
};
2 changes: 2 additions & 0 deletions test/features/steps/interaction.steps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ defineFeature(feature, (test) => {
const health = bench.getComponent(Health);
if (arg0 === 'destroyed') {
expect(health).toBeUndefined();
} else if (arg0 === 'broken') {
// Add broken check
} else if (arg0 === 'not destroyed') {
expect(health).toBeDefined();
}
Expand Down