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

Inheritance and prestige #11

Open
wants to merge 9 commits into
base: gh-pages
Choose a base branch
from
Open

Inheritance and prestige #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aaef7a4
temp prestige upgrade stuff -- will get replaced by inheritance later
tjleing Jun 7, 2020
d0d4af8
Upgrades inherit; world and ascension upgrades in prep for multiple p…
tjleing Jun 7, 2020
0248c7e
BROKEN -- first pass of resource inheritance, just to look at on phone
tjleing Jun 15, 2020
100502b
big dump: done moving asc from game.js to asc.js, DOM next, then prob…
tjleing Jun 27, 2020
6d63e20
mostly bugfixing; functionality restored -- ascension coming along
tjleing Jul 7, 2020
3353b6d
remove unused import
tjleing Jul 7, 2020
83c1829
HTML makes more sense, animations, bugfixes
tjleing Jul 13, 2020
0879150
world selection in ascension level; also fixed upgrade loading and fo…
tjleing Jul 24, 2020
9f622f1
fixed unused var
tjleing Jul 24, 2020
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
37 changes: 30 additions & 7 deletions css/voynich.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,30 @@ body {
“Ubuntu”, “Cantarell”, “Fira Sans”,
“Droid Sans”, “Helvetica Neue”, sans-serif;

margin:0;
padding:0;
height:100%;
margin: 0;
padding: 0;
height: 100%;
width: 100%;

position: absolute;
top: 0px;
opacity: 1;
transition: opacity 1s;
transition: 1s;
}

.fadeout {
opacity: 0;
transition: opacity 1s;
transition: 1s;
}

.up {
top: 600px;
transition: 1s;
}

.down {
top: -600px;
transition: 1s;
}

button {
Expand All @@ -44,13 +57,21 @@ button {
“Droid Sans”, “Helvetica Neue”, sans-serif;
}

#game {
#ascension > div {
margin: 15px;
}

.worldSelect {
margin: 10px 0;
}

#worldLevel {
display: flex;
height: 100%;
overflow: hidden;
}

#prestige {
#worldAscension {
margin: 15px;
}

Expand All @@ -65,6 +86,7 @@ button {
.world {
width: 100%;
display: flex;
height: calc(100vh - 47px);
}

#leftpanel {
Expand Down Expand Up @@ -226,6 +248,7 @@ button:focus {outline:0;}
overflow: hidden;
border: 1px solid #ccc;
background-color: #f1f1f1;
height: 45px;
}

/* Style the buttons that are used to open the tab content */
Expand Down
60 changes: 44 additions & 16 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,51 @@
<title>Voynich</title>
</head>
<body>
<div class="tabs" id="topBar"></div>
<div id="achievement-container">
<div id="achievements"></div>
</div>
<div id="settings">
<button>"Mute"</button>
<button id="import">Load save!</button>
<button id="export">Export save!</button>
<button id="hardReset">HARD RESET</button>
</div>
<div id="stats">
</div>
<div id="prestige">
<div id="prestigeResources"></div>
<button id="anotherOne">Another one...</button>
</div>
<div id="game">
<div id="ascensionContainer">
<div class="tabs" id="ascensionLevelTabs"></div>
<div id="ascension">
<div id="market">
<div id="resources">resources</div>
<div id="upgrades">upgrades</div>
</div>
<div id="shrines">
TODO
</div>
<div id="selection">
Pick some world types and difficulties, won't you?
<div id="worldOptions">
<!--
TODO: add back for new UI
<button id="addWorld">Add a world...</button>
-->
</div>
<button id="descend">Start!</button>
</div>
</div>
</div>

<div id="worldLevelContainer">
<div class="tabs" id="worldLevelTabs"></div>
<div id="worldLevel">
</div>
<div id="worldAscension">
<div id="ascensionResources"></div>
<button id="ascend">Another one...</button>
</div>
</div>

<div id="achievement-container">
<div id="achievements"></div>
</div>
<div id="settings">
<button>"Mute"</button>
<button id="import">Load save!</button>
<button id="export">Export save!</button>
<button id="hardReset">HARD RESET</button>
</div>
<div id="stats">
</div>
</div>
</body>
</html>
Loading