Garrett Finucane
62fb2ee074
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
...
Conflicts:
index.html
js/input.js
style/style.css
2014-05-31 19:39:07 -04:00
Garrett Finucane
1a719a4fa4
changed first screen
2014-05-31 19:37:23 -04:00
meadowstream
1ced9339a8
added click support for rotating the hexagon. consolidated touch
...
support. created pause button. created unselectable class for menus.
fixed being able to restart game while paused. now render every frame for
the pause menu now to avoid difficulties when resizing.
2014-05-31 18:12:35 -04:00
meadowstream
7d6fdd647f
made spacebar pressing make blocks spawn twice as fast as well as go twice as fast
2014-05-31 15:32:01 -04:00
meadowstream
311ca69d8e
changed magnitude to scale with the actual scale of the canvas, fixed fontawesome issues
2014-05-31 15:22:23 -04:00
meadowstream
5846ce12fe
added fontawesome and modified css layout
2014-05-31 15:08:04 -04:00
meadowstream
4aa17f79ef
consolidated style sheets, made pause anim take 300 ms rather than 500, made game not start until becoming unblurred
2014-05-31 11:26:15 -04:00
Garrett Finucane
66fbad3cb5
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
...
Conflicts:
index.html
2014-05-31 11:16:48 -04:00
Garrett Finucane
4c91ec5a29
html pause
2014-05-31 11:13:40 -04:00
meadowstream
808ee41538
fixed issues with savestate around rendering old text
2014-05-31 11:04:57 -04:00
meadowstream
48623ae777
trying to fix issue around savestate
2014-05-31 10:55:36 -04:00
meadowstream
610282628b
added spacebar to speed
2014-05-31 10:22:42 -04:00
meadowstream
411fd4b6d5
added spacebar to make game go twice as fast
2014-05-31 09:56:38 -04:00
meadowstream
43f17c6c46
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
2014-05-31 09:35:40 -04:00
Garrett Finucane
eb3d720bb1
window on blur no longer unpauses
2014-05-30 21:23:32 -04:00
Garrett Finucane
8cb927920c
fade in on restart
2014-05-30 21:05:01 -04:00
Garrett Finucane
b51a73481d
save state fixed. simultaneous checking works
2014-05-30 20:05:50 -04:00
Garrett Finucane
5a9ed8a17e
saveState working now, the falling blocks don't fall into clock now
2014-05-30 19:06:16 -04:00
meadowstream
8f5bb71bd5
reformatted index
2014-05-27 19:44:47 -04:00
meadowstream
a3d98180ea
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
2014-05-27 18:43:19 -04:00
meadowstream
e1dfa444b0
view.js changes
2014-05-27 18:43:15 -04:00
garrettdreyfus
f08b6d8dc4
help screen implemented
2014-05-26 21:05:58 -04:00
garrettdreyfus
0aaafbf760
text fades in
2014-05-26 14:43:05 -04:00
garrettdreyfus
93696511e2
score fades in
2014-05-26 14:24:38 -04:00
garrettdreyfus
bc548d3240
multipliers fade out faster
2014-05-26 14:14:30 -04:00
garrettdreyfus
2e15e31fe7
combo timing based on frames
2014-05-26 14:07:07 -04:00
meadowstream
911c0faacc
changed this.ct to increment every time
2014-05-26 13:46:11 -04:00
garrettdreyfus
22c4891ca5
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
2014-05-26 13:38:59 -04:00
garrettdreyfus
0eb631afdc
better fonts
2014-05-26 13:38:47 -04:00
meadowstream
cccdb45f55
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
2014-05-26 13:30:43 -04:00
meadowstream
5fa3102024
made center text white
2014-05-26 13:30:39 -04:00
garrettdreyfus
f1c7c93b20
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
2014-05-26 13:18:44 -04:00
meadowstream
83f4db9157
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
2014-05-26 13:18:35 -04:00
garrettdreyfus
8a2fd29cad
multipliers white
2014-05-26 13:18:27 -04:00
meadowstream
07938ea873
removed number render offset
2014-05-26 13:18:20 -04:00
meadowstream
1f4f911929
removed numbers going away
2014-05-26 13:18:10 -04:00
meadowstream
807051212b
centered text
2014-05-26 13:11:23 -04:00
meadowstream
d5ebbc071c
fixed modifying rather than accessing in findCenterOfBlocks
2014-05-26 13:09:59 -04:00
meadowstream
d2d55bcb71
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
2014-05-26 13:04:30 -04:00
meadowstream
1f34cc64f7
block function returns a center slightly otuwards
2014-05-26 13:04:26 -04:00
garrettdreyfus
f77d8d5655
score multiplier
2014-05-26 13:04:23 -04:00
meadowstream
33930833de
centered text
2014-05-26 12:57:18 -04:00
garrettdreyfus
844a856f8e
start is Lovello too
2014-05-26 12:54:33 -04:00
garrettdreyfus
4d1aadd8d7
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
2014-05-26 12:53:08 -04:00
garrettdreyfus
6ba95b9f46
Lovello is the bomb
2014-05-26 12:52:57 -04:00
meadowstream
2a1fbbc057
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
2014-05-26 12:49:24 -04:00
meadowstream
573f2c5afb
added findCenterOfBlocks
2014-05-26 12:49:20 -04:00
garrettdreyfus
71f2563db8
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
2014-05-26 12:46:12 -04:00
garrettdreyfus
144fd8e9f7
floating adder color of scored
2014-05-26 12:45:52 -04:00
meadowstream
cb42564bb3
removed clock hand
2014-05-26 12:41:04 -04:00