Skip to content

Collective narrative TEST DO NOT MERGE #38

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
Open
kapil1garg wants to merge 144 commits into
base: swift-convert
Choose a base branch
from
Open

Collective narrative TEST DO NOT MERGE #38

kapil1garg wants to merge 144 commits into from

Conversation

@kapil1garg
Copy link
Contributor

@kapil1garg kapil1garg commented Jun 18, 2018

DO NOT MERGE TESTING

codethecoffee and others added 30 commits April 18, 2018 21:08
@codethecoffee
Setting up the basics
c550b48
@kapil1garg
Merge branch 'master' into food-fight
694755a
@jylfeng
created food fight stages with helper functions
1733144
@ginowangsh4
Finished writing food fight
fafe1c1
@jylfeng
wrote turf war
414e9e5
@ginowangsh4
Implemented fantasy gym
2f353d6
@ginowangsh4
Compiler done
28a6f4a
@ginowangsh4
After meeting with CE, experience now runs
715953c
@jylfeng
changed instruction to be the previous need
dfff17c
@jylfeng
testing HTML character
9b03548
@ginowangsh4
Changes to template
e3d5ff6
@ginowangsh4
Working on submission
3b71952
@jylfeng
fixed html, still working on callbacks
e7882cb
@jylfeng
fixed results template
e94e91b
@jylfeng
fixed more of experience template
7f4ec93
@jylfeng
redid print system
36069db
@jylfeng
debugging callbacks
a06ff2c
@jylfeng
comments and logs
7da8149
@jylfeng
Merge branch 'master' into collective-narrative
31f7a25
@jylfeng
debugged basic story package
45d6585 
debugged basic story part of cn, added a filler file for pseudo code/testing
@jylfeng
convert old story system into new one
00069b9
@jylfeng
protoype of medieval dilemma in CN API
bfd44e1
@jylfeng
debugging callbacks
f799336
@jylfeng
small update
572edb4
@jylfeng
added html template for cn, converting old chapterToExperience to new
1e82f7b
@jylfeng
added comments to testing constants
4c720ce
@jylfeng
BASIC STORIES WORKING
a48ed99
@jylfeng
combine chat with select options
9310b98
@jylfeng
creates messages collection
20adb4a
@jylfeng
displaying messages + setup messages collection
620b38a
@gcanco gcanco temporarily deployed to staging-ce-platform November 27, 2019 17:58 Inactive
@gcanco gcanco temporarily deployed to staging-ce-platform November 27, 2019 18:27 Inactive
@gcanco gcanco temporarily deployed to staging-ce-platform November 27, 2019 18:51 Inactive
@gcanco gcanco temporarily deployed to staging-ce-platform November 28, 2019 04:55 Inactive
@youralien youralien changed the base branch from master to swift-convert November 28, 2019 05:15
@gcanco gcanco temporarily deployed to staging-ce-platform November 30, 2019 02:30 Inactive
@youralien youralien force-pushed the collective-narrative branch from a432cf5 to 3bda4c2 Compare November 30, 2019 02:37
@gcanco gcanco temporarily deployed to staging-ce-platform November 30, 2019 02:37 Inactive
@gcanco gcanco temporarily deployed to staging-ce-platform December 4, 2019 03:01 Inactive
@gcanco gcanco temporarily deployed to staging-ce-platform December 4, 2019 04:06 Inactive
@gcanco gcanco temporarily deployed to staging-ce-platform December 4, 2019 04:25 Inactive
@gcanco gcanco temporarily deployed to staging-ce-platform December 7, 2019 19:37 Inactive
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.

10 participants

@kapil1garg @gcanco @codethecoffee @jylfeng @ginowangsh4 @nkgopaul @youralien @mtruong68 @NinaCong