Skip to content

Merge dev to master#41

Merged
marksanghoonkim merged 55 commits intomasterfrom
dev
Mar 22, 2016
Merged

Merge dev to master#41
marksanghoonkim merged 55 commits intomasterfrom
dev

Conversation

@marksanghoonkim
Copy link
Copy Markdown
Member

No description provided.

rickyeh and others added 30 commits March 17, 2016 11:15
[add] adds modularity for folders of prompts sent back using fs read file
[add] creates Multiplayer page, creates socket on Multiplayer
[add] removes router hashes, cleans up console logs on server-side code
[add] adds countdown timer on start button, changes time display
[feature] implements synced start and end multiGame
[refactor] creates separate files for singleplayer and multiplayer
[fix] fixes timerOn on Multiplayer and Home
jordanallen98 and others added 25 commits March 19, 2016 14:36
[add] adds sweet alert with time of completion on game end
[feature] implements Redux in CodeEditor and Timer
[refactor] adds redux blueprint and cleaned up some old code
[refactor] major refactor to bring single player mode to use redux
[add] adds redux functionality to Multiplayer components
[feature] implements synced game start and end on Multiplayer
[setup] configures remote database
marksanghoonkim added a commit that referenced this pull request Mar 22, 2016
@marksanghoonkim marksanghoonkim merged commit 0407930 into master Mar 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants