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

latest merge #4

Open
wants to merge 128 commits into
base: master
Choose a base branch
from
Open

latest merge #4

wants to merge 128 commits into from

Conversation

ash7594
Copy link
Contributor

@ash7594 ash7594 commented Feb 29, 2016

No description provided.

ash7594 and others added 30 commits February 7, 2016 23:51
@ash7594
mini-simulation on char info page - prototype
a4e9a63
@ash7594
Merge branch 'docs'
0c713dd
@gitter-badger
Add Gitter badge
33e915e
@tushar-rishav
Merge pull request #1 from gitter-badger/gitter-badge
dbb5f3f 
Add a Gitter chat badge to README.md
@tushar-rishav
Revert "Add a Gitter chat badge to README.md"
37a9b0b
@tushar-rishav
Merge pull request #2 from ash7594/revert-1-gitter-badge
eb98b65 
Revert "Add a Gitter chat badge to README.md"
@ash7594
bug fix with mapgen
a72a8b7
@ash7594
Merge branch 'master' of https://github.com/ash7594/code-control
19ee0bc
@sathiyavrs
Finished linting
3b9486a
@sathiyavrs
simple stuff
877acad
@sathiyavrs
Tentative fix for globals
8b50b9d
@tushar-rishav
edit_build.js: Minor UI change
72eebaf 
This commit changes resultDiv innerHTML on
code change
@tushar-rishav
models.js: Change the Char Schema
ccf55bf 
This commit updates the Char Schema to separate
the attack and defend code
@tushar-rishav
edit_char.ejs: Fix code display bug
4ebb061 
This commit fixes minor UI bug in code display.
@tushar-rishav
lint.js: Export attack and defend code
37d74f9 
This commit exports the attack and defend code
from the result of getCode
@tushar-rishav
runner.js Separate attack and defend code
c84159d
@tushar-rishav
runner.js Change Runner function
dc7076c 
This commit changes everything :P
@ash7594
Map gen altered
46456a4
@ash7594
map gen in serverjs
11e6720
@ash7594
2 simulations defend attack
ce86c63
@tushar-rishav
runner.js: First working prototype with successful attack and defense…
892e5db 
… split
@tushar-rishav
docs.ejs: Remove login from docs
7806d08
@ash7594
info_char page mini-simulation overlay effect
fd05f5b
@ash7594
docs login fixed
cd96c3b
@ash7594 @tushar-rishav
docs login fixed
2207d10
@tushar-rishav
lint.js: Fix error in lint
bc214b9
@tushar-rishav
lint.js: Stick to only two globals(defend,attack) in user's code
7d9baff
@ash7594
defense attack added for BattleLevel
c6d3f90
@sathiyavrs
Defender shall not Attack
f2e035e
@ash7594
prototype 2 after bug fixes with battle
1b146a3
sathiyavrs and others added 29 commits February 25, 2016 17:19
@sathiyavrs
Updated 4 API and corresponding docs
13bfee7
@ash7594
Template mods
402e521
@ash7594
pragyan logos added
4fc22bb
@tushar-rishav
docs: Add docs imgs
2cab459
@tushar-rishav
Merge branch 'master' of https://github.com/ash7594/code-control
864d04e
@ash7594
leaderboard differentiation
77ec043
@ash7594
Merge branch 'master' of https://github.com/ash7594/code-control
5575409
@sathiyavrs
Revert SwarmLevel
cb67155
@tushar-rishav
leaderboard.ejs: Fix url ref bug
b7daee0
@ash7594
docs bug fix
7f2d2f4
@sathiyavrs
Added examples
2dce532
@sathiyavrs
Merge branch 'master' of https://github.com/ash7594/code-control
775f771
@ash7594
exp algo modified
f116563
@sathiyavrs
swarm-code update
ed4df84
@ash7594
exp algo modified
4631d00
@ash7594
fix
df6c7d0
@ash7594
showing losers exp dec
c3910d4
@tushar-rishav
docs: Add neagtive points
42980f9
@ash7594
Merge branch 'master' of https://github.com/ash7594/code-control
7e874da
@tushar-rishav
docs: Add neagtive points
c5d0beb
@tushar-rishav
Merge branch 'master' of https://github.com/ash7594/code-control
bc67607
@tushar-rishav
docs: Add negatives and peace podu
fc2f364
@sathiyavrs
Corrected docs
4dd1025
@ash7594
IRC added
c17bd3f
@ash7594
reg date modified
0e27f33
@ash7594
leaderboard template changes
4dcc8d4
@ash7594
template leaderboard edit
1c9f600
@tushar-rishav
api.md: coord fix
a683d7a
@sathiyavrs
api corrections
9e21917
@vasuman
Copy link
Owner

vasuman commented Mar 1, 2016

Hi,
Can you git rebase and squash or fixup to a single commit.
Thanks

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.
5 participants
@ash7594 @vasuman @gitter-badger @tushar-rishav @sathiyavrs