Commit graph

493 commits

Author SHA1 Message Date
lengstrom
3e64d5633c Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-15 23:58:23 -04:00
lengstrom
97bde851bc c 2014-07-15 23:58:15 -04:00
Garrett Finucane
997f5e5547 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-07 10:55:26 -04:00
Garrett Finucane
878813d7d3 made looping and autoplay in js 2014-07-07 10:55:12 -04:00
lengstrom
3fe1f18223 disabled dragging on screen 2014-07-06 21:28:34 -04:00
Garrett Finucane
fe61d1f245 no jagged lines switch no one line not multiple 2014-07-06 15:18:51 -04:00
Garrett Finucane
86e274b026 removed spacing between timer and hexagon when zoomed 2014-07-06 14:50:19 -04:00
Garrett Finucane
981f36f9f4 intro leads in and loop loops 2014-07-06 10:38:33 -04:00
lengstrom
95562ce62d changed combotime coeff 2014-07-05 21:05:21 -04:00
lengstrom
2bfd8e237c Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-05 17:44:39 -04:00
lengstrom
bb1f7f3ef7 Removed count variable; extended combo time 2014-07-05 17:44:31 -04:00
Garrett Finucane
ac9617818c mute unmute and audio 2014-07-05 17:18:23 -04:00
Garrett Finucane
3214022e00 added audio and scaled comboTimer I think 2014-07-05 16:07:34 -04:00
Garrett Finucane
d83b323e96 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	index.html
2014-07-05 15:47:48 -04:00
Garrett Finucane
6f445b1194 started audio playing 2014-07-05 15:47:14 -04:00
lengstrom
bb0e15b2ff added new sound files and deleted old ones 2014-07-05 11:59:23 -04:00
lengstrom
2184faa258 added restart messages for mobile + modified those for desktop, added timeout before being able to restart 2014-07-05 10:21:07 -04:00
lengstrom
011aff0a82 misspelled messages 2014-07-05 10:00:36 -04:00
lengstrom
a1a1f7e953 fixed end game text 2014-07-05 09:57:51 -04:00
lengstrom
2190441404 fixed issues around pausing and toggling the info button at the same time 2014-07-05 00:32:54 -04:00
lengstrom
0f4b3c39a3 added intro 2014-07-04 22:42:30 -04:00
lengstrom
5e9343cdb9 added alternate text 2014-07-04 22:23:19 -04:00
Garrett Finucane
ce39bdf5bd disabled click latency on mobile 2014-07-04 21:20:43 -04:00
Garrett Finucane
34b048838f new demo play 2014-07-04 21:14:39 -04:00
Garrett Finucane
c8829001ad fixed pausing Paused -> paused 2014-07-04 20:33:26 -04:00
lengstrom
1ec29672ec almost done with tutorial. fixed devmode not being able to be enabled 2014-07-04 19:08:49 -04:00
lengstrom
b767e7bd16 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-04 16:43:01 -04:00
lengstrom
5e17b57fcb Fixed instruction text in mobile 2014-07-04 16:42:55 -04:00
Garrett Finucane
a24cd2819f added click for non mobile 2014-07-04 16:08:01 -04:00
Garrett Finucane
731c0184dc fixed blank thing 2014-07-04 16:04:16 -04:00
lengstrom
eaa47b2fd8 reduced difficulty for mobile 2014-07-04 15:05:38 -04:00
Garrett Finucane
80e05aa4e8 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-04 14:59:09 -04:00
Garrett Finucane
b3b3c11d42 instructions on mobile 2014-07-04 14:58:33 -04:00
lengstrom
90de4a7b04 removed sample play at startup 2014-07-04 14:52:14 -04:00
lengstrom
320c1ad4a5 made time between combos relative to the time between waves 2014-07-04 14:45:05 -04:00
Garrett Finucane
deaf16722d Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-04 14:27:41 -04:00
Garrett Finucane
852db36410 changed copy 2014-07-04 14:27:33 -04:00
lengstrom
6a2bce5220 fixed merge conflicts 2014-07-04 14:15:07 -04:00
lengstrom
f81f05e347 fixed "press p to continue" text occurring in mobile browsers 2014-07-04 14:14:39 -04:00
lengstrom
f76ee0f979 fixed "press p to continue" text occurring in mobile browsers 2014-07-04 14:09:14 -04:00
Garrett Finucane
2f68e31d0b info icon 2014-07-04 13:48:23 -04:00
Garrett Finucane
da2a4f3edf Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	js/main.js
2014-07-04 13:24:08 -04:00
Garrett Finucane
9022ecb29b limited infinite speed rotations 2014-07-04 13:23:00 -04:00
lengstrom
75a103610f made combo / score text larger 2014-07-04 13:08:44 -04:00
Garrett Finucane
1309a1867a Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
Conflicts:
	js/checking.js
2014-07-04 12:48:44 -04:00
Garrett Finucane
f03a822d52 clock to hex 2014-07-04 12:47:37 -04:00
lengstrom
ea2f8f0d3c removed merge files 2014-07-04 12:46:42 -04:00
lengstrom
88c1ac2607 fixed merge conflicts 2014-07-04 12:45:51 -04:00
Garrett Finucane
109edf092e Clock to Hex 2014-07-04 12:42:44 -04:00
lengstrom
55dcf3af02 replaced comboMultiplier -> comboTime 2014-07-04 12:42:22 -04:00