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.

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

Финал #9

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
401acbe
Integration with new backend
Ustimov May 20, 2016
4b37067
User read
Ustimov May 20, 2016
5bafcbc
Fix proxy to support web socket
darkwrat May 20, 2016
65e95f0
Merge pull request #15 from darkwrat/ws-fix
Ustimov May 21, 2016
caef833
Websocket
Ustimov May 21, 2016
f2e0732
Preview WS
artem1996 May 21, 2016
288bdfb
WebSocket to backbone model
Ustimov May 22, 2016
a410ddb
Game state update from websocket
Ustimov May 22, 2016
23d9567
GET to /api/game after Start Game button click
Ustimov May 23, 2016
16c4d62
GET to /api/game after Start Game button click
Ustimov May 23, 2016
8990a0d
Added birthday to registration
Ustimov May 23, 2016
b2a5178
Loader
Ustimov May 23, 2016
f710faf
Merge
Ustimov May 23, 2016
76c0649
Bug fix
Ustimov May 27, 2016
844cf6b
Redisain
artem1996 May 29, 2016
a690cc6
Merge pull request #17 from artem1996/develop
Ustimov May 29, 2016
54e0c2b
Cards down
Ustimov May 29, 2016
7cfde57
listener client
artem1996 May 30, 2016
9cbe97f
add responce
artem1996 May 30, 2016
9545b8a
Add buttons
artem1996 May 30, 2016
7976945
add button pass
artem1996 May 30, 2016
f9719a5
Add debug conclude button
darkwrat May 31, 2016
cfa2efd
hand bug fix
artem1996 May 31, 2016
6c11d61
Merge branch 'develop' of https://github.com/darkwrat/2016_1_IOTA int…
darkwrat May 31, 2016
95fca52
Merge pull request #1 from darkwrat/develop
artem1996 May 31, 2016
efd45a7
safe point commit
artem1996 May 31, 2016
3a92e87
Merge branch 'temp' into develop
artem1996 May 31, 2016
b01644e
Hand fix
artem1996 May 31, 2016
8e39927
fix dubl card
artem1996 May 31, 2016
3fe429c
Exit button
artem1996 Jun 2, 2016
15f1a41
RollCard
artem1996 Jun 3, 2016
019c20c
RollCard with server
artem1996 Jun 3, 2016
b94071b
Canvas score
Ustimov Jun 3, 2016
f3a5863
Merge pull request #2 from Ustimov/develop
artem1996 Jun 3, 2016
d380071
EExit alert
artem1996 Jun 3, 2016
1d8ff72
Working exit
artem1996 Jun 4, 2016
a3ea02d
Merge New Score
artem1996 Jun 4, 2016
c035a1c
redesign v2.0
artem1996 Jun 4, 2016
f8be2c7
Fix
artem1996 Jun 4, 2016
d76d672
Fix pass
artem1996 Jun 4, 2016
830ef71
Fix pass 2
artem1996 Jun 4, 2016
ef58565
Fix pass 2
artem1996 Jun 4, 2016
f0a3be7
Fix nav-bar margin
artem1996 Jun 4, 2016
cd04894
Fix nav-bar margin
artem1996 Jun 4, 2016
384c782
Performance improvements
darkwrat Jun 5, 2016
f84bd25
Bugfix
darkwrat Jun 5, 2016
bafa8f7
Remove unnecessary background clear
darkwrat Jun 5, 2016
bfe8a5a
Small template fix
darkwrat Jun 5, 2016
8fa25f8
Merge pull request #3 from darkwrat/perf
artem1996 Jun 7, 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
22 changes: 22 additions & 0 deletions build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/**
* Created by note on 27.05.16.
*/
({
baseUrl: 'public_html/js',

out: 'build/main.js',
optimize: 'uglify2',

name: 'lib/almond/almond',
include: ['lib/almond/almond','main'],
stubModules: ['cs', 'text'],
wrap: true,

paths: {
backbone: 'lib/backbone',
underscore: 'lib/underscore',
jquery: 'lib/jquery',
require: 'lib/require',
scp: 'serviceworker-cache-polyfill'
}
})
41 changes: 41 additions & 0 deletions build/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"test": "grunt test"
},
"dependencies": {
"express-http-proxy": "^0.6.0",
"express-rewrite": "0.0.4",
"http-proxy-middleware": "^0.15.0",
"ws": "^1.0.1"
}
}
6 changes: 6 additions & 0 deletions public_html/css/bootstrap-theme.min.css

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions public_html/css/bootstrap.min.css

Large diffs are not rendered by default.

36 changes: 1 addition & 35 deletions public_html/css/main.css
Original file line number Diff line number Diff line change
@@ -1,35 +1 @@
@import "sass.css";

* {
box-sizing: border-box;
}

body {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 14px;
line-height: 1.42857143;
color: #333;
background-color: #fff;
}

h1 {
font-size: 36px;
}
h1, h2, h3 {
margin-top: 20px;
margin-bottom: 10px;
}
h1, h2, h3, h4, h5, h6 {
font-family: inherit;
font-weight: 500;
line-height: 1.1;
color: inherit;
}
h1 {
margin: .67em 0;
font-size: 2em;
}
a {
color: #337ab7;
text-decoration: none;
}
@import "sass.css";
Loading