Skip to content

F001 #7

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

Open
igesan21 wants to merge 10 commits into
base: purwo-branch
Choose a base branch
from
Open

F001 #7

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7fd59f2
Add some feature
suhendra-ep Nov 17, 2016
f482755
Refine the changes
suhendra-ep Nov 17, 2016
a7d31d1
Merge pull request #1 from suhendra-ep/feature_branch
mitrais-cdc-training Nov 17, 2016
4c6cb6b
Feature A
suhendra-ep Nov 17, 2016
4c2fb09
deathstar.json
suhendra-ep Nov 17, 2016
65c456f
Merge branch 'develop' of https://github.com/mitrais-cdc-training/ws3…
suhendra-ep Nov 17, 2016
d7d1439
Modify file
suhendra-ep Nov 17, 2016
554f13e
Merge branch 'feature_branch' of https://github.com/suhendra-ep/ws3 i…
suhendra-ep Nov 17, 2016
0152d50
Merge branch 'suhendra-ep-feature_branch' into develop
suhendra-ep Nov 17, 2016
fa23999
Adding anti-matter bomb
igesan21 Nov 22, 2016
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
5 changes: 3 additions & 2 deletions deathstar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Death Star",
"identifier": "DS-1 platform",
"commander": "Grand Moff",
"weapon": ["superlaser", "tractor beam", "turbolaser"],
"weapon": ["superlaser", "tractor beam", "turbolaser", "anti-matter bomb"],
"powersource": "hypermatter reactor",
"specification": {
"scale": "km",
Expand All @@ -14,5 +14,6 @@
"price": {
"amount": 1000000000000,
"currency": "galactic credits"
}
},
"star": 0
}