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.

Sign up for GitHub

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

Jump to bottom

MVP #8

Merged
merged 69 commits into from
Aug 23, 2020
Merged

MVP #8

merged 69 commits into from
Aug 23, 2020

Conversation

mcrd25
Copy link
Owner

@mcrd25 mcrd25 commented Aug 23, 2020

No description provided.

mcrd25 added 30 commits January 13, 2020 05:13
Added stickler and eslint config file:
f7bfdf4
Basic project setup with webpack
85e4867
Created Ship factory and test for hit method
c6fcc30
Added .babelrc config file to allow import to work with jest
b546879
Finsihed Ship Factory
98feea3
Fixed lint error on line 11 of Ship.js
0ffa404
Merge pull request #1 from mcrd25/ship
2117cce 
Ship
Created skeleton for Gameboard Factory src and test
919e632
Added length as attribute of ship
3340501
WIP: Gameboard component
5a6c30a
Created placeShip, getBoard functions with helpers
7ab98b1
Added tests for placeShip
7e07f3c
Created set default board method
a01fde3
Updated board to track objects with position of ship as opposed to ju…
7dcc1f7 
…st ship
Updated to include direction in board
94a9026
Updated tests and fixed placeShipHelper Function bug
6c82553
Fix receive attack function
6746374
Reverted allsunk function to original
54c22bc
Removed console.log
af2ed95
Merge pull request #2 from mcrd25/gameboard
050f842 
Gameboard
Created Player and player test files
0bb10fd
Created basic player
d0b2353
Basic random move logic if computer
ae46b03
Added basic files system for setting up gameloop
f6bb576
Added Player to right file
c86504e
Adjusted random functions
708933a
Added default properties to Player props and adjusted indentation
2079f1e
Removed board as property for now
00f4dcf
Added player GetName() tests
ffdc2eb
WIP Player tests
621ac2a
Maya Douglas added 29 commits August 4, 2020 22:05
Merge pull request #4 from mcrd25/development
6ea4f7d 
correct feature branch issue
Player moves and ability to win added
6d729e2
Added basic gameplay: TODO: placements and UI completion
69492fa
Gameplay compelte
55ce065
Bsaic placement working
d3b2627
Got placements to work
be035b9
divs laid out
ff7d7a4
Direction placements and disable buttons once placed
c21cfce
Added start button div and remove console.logs
feb6ab7
Gameplay complete
444dcf4
Removed console.log from Player.js
6528f50
Gameplay technically done
91b7346
Worked on placement divs layout
3e6e129
Added instructions
988775d
README plus one change
8fd6083
Merge pull request #5 from mcrd25/game
820b068 
Final Game implementation
Create LICENSE
7224620
Merge pull request #6 from mcrd25/add-license-1
0071747 
Create LICENSE
Added disable Grid feature after player wins
f58ec6e
Added disable Grid feature after computer wins
53a8e14
Removed unused file and uploaded and fixed typo
35fd6e3
Fixed line 18 of board.js
ba39948
Added semi-colon
b948b6f
finalized gameplay changes
7474e54
Removed stickler and added github lint actions
04984aa
Small change to test if linter working
a6cc6df
Removed materialize import, not necessary
272e672
removed empty stylesheet and fixed lint errors
7fcbfe7
Merge pull request #7 from mcrd25/battleship
ddbba71 
Battleship gameplay basic
@mcrd25 mcrd25 merged commit 4e9760a into master Aug 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@mcrd25