Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
8cde38b
add app.js express framework
kozlowskicd Nov 27, 2018
135bc20
Merge pull request #3 from EnSeven/chris
kozlowskicd Nov 27, 2018
aa0182d
add test
kozlowskicd Nov 27, 2018
059c54b
Merge pull request #4 from EnSeven/chris
kozlowskicd Nov 27, 2018
7007223
add dotenv
kozlowskicd Nov 27, 2018
b309956
Merge pull request #5 from EnSeven/chris
kozlowskicd Nov 27, 2018
754ce10
add Socket-IO integration, add comments throughout code
kozlowskicd Nov 27, 2018
5f21e93
add comments for index.html
kozlowskicd Nov 27, 2018
d54a4c0
fix package.json
kozlowskicd Nov 28, 2018
7bacabd
Merge pull request #6 from EnSeven/chris
kozlowskicd Nov 28, 2018
bea81e4
work on 'join' event listener
kozlowskicd Nov 28, 2018
7d44621
add api route for after the game
kozlowskicd Nov 29, 2018
54a32db
add server-side socket'io code to test client connections
kozlowskicd Nov 29, 2018
0ff2a9b
fix server start code
kozlowskicd Nov 29, 2018
0a7f5c1
change socket.io port
kozlowskicd Nov 29, 2018
2a9de84
refactor socket.io declaration
kozlowskicd Nov 29, 2018
701929c
refactor socket.io
kozlowskicd Nov 29, 2018
250bec4
refactor socket.io
kozlowskicd Nov 29, 2018
779a099
work on socket.io address
kozlowskicd Nov 29, 2018
f475795
refactor socket.io declaration
kozlowskicd Nov 29, 2018
95b6b5b
refactor socket.io declaration
kozlowskicd Nov 29, 2018
e25fb5a
got 'start' and 'ready' emitters implemented
kozlowskicd Nov 30, 2018
fb232b2
work on socketio
kozlowskicd Nov 30, 2018
fb1d40a
fix PORT for heroku
kozlowskicd Nov 30, 2018
65301b8
fix PORT for heroku
kozlowskicd Nov 30, 2018
b378663
work on heroku deployment
kozlowskicd Nov 30, 2018
1db378b
work on heroku deployment
kozlowskicd Nov 30, 2018
1104fbb
change port for socketio
kozlowskicd Nov 30, 2018
91b7867
change port for socketio
kozlowskicd Nov 30, 2018
0d3f550
change port for socketio
kozlowskicd Nov 30, 2018
3e44d3a
change port for socketio
kozlowskicd Nov 30, 2018
9e305a6
change port for socketio
kozlowskicd Nov 30, 2018
c5a82a3
Merge pull request #7 from EnSeven/chris
kozlowskicd Nov 30, 2018
44f6a5a
two players can join, then send 'ready' emit
kozlowskicd Dec 1, 2018
5f93e11
push for staging branch
kozlowskicd Dec 1, 2018
e3f588e
Merge pull request #8 from EnSeven/chris
kozlowskicd Dec 1, 2018
e5b89cd
refactor postdata route
kozlowskicd Dec 1, 2018
4d74188
modulariziation and refactored game functions
kozlowskicd Dec 3, 2018
c76163b
refactoring and added client socket hooks to scratch file
kozlowskicd Dec 3, 2018
edaa1c6
standardized client inputs for the game engine
kozlowskicd Dec 3, 2018
67dc742
push for heroku
kozlowskicd Dec 4, 2018
a203eec
refactor with client team
kozlowskicd Dec 4, 2018
07cbf11
refactor with client team
kozlowskicd Dec 4, 2018
9e1c8ec
fix socket.io listener
kozlowskicd Dec 4, 2018
5c916bc
work on sockets
kozlowskicd Dec 4, 2018
98ba853
work on sockets
kozlowskicd Dec 4, 2018
419158a
work on sockets
kozlowskicd Dec 4, 2018
195dd8c
work on sockets
kozlowskicd Dec 4, 2018
0eb66c4
working on sockets
kozlowskicd Dec 4, 2018
93df32b
work on sockets
kozlowskicd Dec 4, 2018
2bd6174
working on sockets
kozlowskicd Dec 4, 2018
07e07ad
working on sockets
kozlowskicd Dec 4, 2018
51c6566
work on sockets
kozlowskicd Dec 4, 2018
df66d87
work on sockets, works through the end of the game and determining wi…
kozlowskicd Dec 5, 2018
d17fadc
adding game logic to server
Dec 7, 2018
2165cf3
refactor for 1 player
kozlowskicd Dec 7, 2018
b9f1250
implementing object containment for variables and starting code for r…
Dec 7, 2018
07b0608
creating GameState object to track changes over course of game
Dec 7, 2018
7550ab1
functional remoteClient.js calls, game doesn't have end point when ru…
Dec 7, 2018
ec86242
Merge branch 'chris' of https://github.com/EnSeven/Game-Engine into g…
Dec 7, 2018
60e75f9
removing invocation of callback function in remoteClient.js's .then call
Dec 8, 2018
011ef00
rearranging code to enable the guess-response loop from a remoteClient
Dec 8, 2018
8458be0
functional game code running though remoteClient.js
Dec 8, 2018
f160f92
updating readme.md with settings info
Dec 8, 2018
82b8f3e
fixed input loop
kozlowskicd Dec 8, 2018
152160f
Merge branch 'game-logic' of https://github.com/EnSeven/Game-Engine i…
kozlowskicd Dec 8, 2018
c51cdef
updating prompt results to pass as object in remoteClient.js>promptIn…
Dec 8, 2018
c6210a1
Merge branch 'game-logic' of https://github.com/EnSeven/Game-Engine i…
kozlowskicd Dec 8, 2018
ed0c1a0
cleaning out junk code, updating a path for the welcome message
Dec 8, 2018
a0a114d
Merge branch 'game-logic' of https://github.com/EnSeven/Game-Engine i…
kozlowskicd Dec 8, 2018
182ed75
got category and word string to send to client
kozlowskicd Dec 8, 2018
c7426b2
words now change when restarted
kozlowskicd Dec 8, 2018
dfbe2c4
refactor win/lose conditions
kozlowskicd Dec 8, 2018
55e8172
push for master
kozlowskicd Dec 8, 2018
1b953b4
Merge pull request #9 from EnSeven/beta
cottmar Dec 9, 2018
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
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ node_js:
- "9"

script:
- npm run lint
- npm test
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# Game-Engine
A server designed to connect a socket.io game to a express framework

to modify the number of guesses a user has, change the number in wordWizard.js>gameStateGenerator()>guessesRemainingSetting
8 changes: 8 additions & 0 deletions __tests__/game-engine.tests.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'use strict';

describe('tests', () => {
it('lame test to get travis up and running', () => {
let x = 5;
expect(x).toBe(5);
});
});
6 changes: 4 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

require('dotenv').config();

// Pulling in start function from ./src/app.js
const start = require('./src/app.js');


require(./src/app.js).start(process.env.PORT);
// PORT defined in .env file
start(process.env.PORT);
Loading