Commit graph

222 commits

Author SHA1 Message Date
lengstrom
04f8607ea1 modified comments/suggestions text 2014-07-27 20:20:32 -04:00
lengstrom
b6e2a9338a removed debugger statements. made larger hitboxes for buttons. fixed garrett's github link. 2014-07-27 19:10:40 -04:00
lengstrom
72059a9951 testing 2014-07-27 16:55:33 -04:00
lengstrom
03294de85c moved scripts to head tag 2014-07-27 16:46:18 -04:00
lengstrom
2d289d7019 added cordova.js 2014-07-27 16:40:52 -04:00
lengstrom
ee9dbc48d5 fixed links opening not in new tab
Please enter the commit message for your changes. Lines starting
2014-07-27 15:31:19 -04:00
lengstrom
3be02a75be fixed twitter button, increased time before intro text fades 2014-07-27 14:16:53 -04:00
lengstrom
8f9fad2a44 changed intro text 2014-07-26 10:39:30 -04:00
lengstrom
81c89548c4 tenatively fixed highscores 2014-07-25 00:33:54 -04:00
lengstrom
54daacbb27 added info button support in home screen; made hit detection basde on canvas coordinates rather than DOM for info button 2014-07-23 22:00:46 -04:00
lengstrom
38e7423f24 reverted inadvertant changes 2014-07-23 09:44:38 -04:00
Garrett Finucane
0caea03f61 first and last commit 2014-07-22 22:33:41 -04:00
lengstrom
d656d3c59b fixed double restart issue in ios. added real handlers for helpText classes 2014-07-22 09:21:16 -04:00
lengstrom
fcaac9396d added showing and hiding of buttons, made buttons appear onload (instead of having ugly iframes / skeletons, other misc changes 2014-07-21 21:41:04 -04:00
lengstrom
d081c5a50d centered twitter / github buttons at bottom of page 2014-07-21 10:12:01 -04:00
lengstrom
5503d95f1b fixed link text, fixed covering info btn issue 2014-07-20 23:13:51 -04:00
Garrett Finucane
bfc356c4aa made users clickable 2014-07-20 22:46:01 -04:00
Garrett Finucane
976711b4e8 share buttons centered 2014-07-20 22:36:45 -04:00
Garrett Finucane
29e2aa5498 added share buttons 2014-07-20 21:47:08 -04:00
lengstrom
80ccc10b46 removed intro JSON, kept keypress, consolidated initialization to a single function 2014-07-17 21:11:05 -04:00
Garrett Finucane
d0eccacdae fixed touble restart on mobile 2014-07-16 10:37:12 -04:00
lengstrom
14dfd8a4f8 added fading helpText, removed old ogg declarations 2014-07-16 00:08:57 -04:00
lengstrom
401c0873af removed music 2014-07-16 00:06:23 -04:00
Garrett Finucane
878813d7d3 made looping and autoplay in js 2014-07-07 10:55:12 -04:00
Garrett Finucane
981f36f9f4 intro leads in and loop loops 2014-07-06 10:38:33 -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
0f4b3c39a3 added intro 2014-07-04 22:42:30 -04:00
lengstrom
5e9343cdb9 added alternate text 2014-07-04 22:23:19 -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
5e17b57fcb Fixed instruction text in mobile 2014-07-04 16:42:55 -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
f81f05e347 fixed "press p to continue" text occurring in mobile browsers 2014-07-04 14:14:39 -04:00
Garrett Finucane
2f68e31d0b info icon 2014-07-04 13:48:23 -04:00
Garrett Finucane
109edf092e Clock to Hex 2014-07-04 12:42:44 -04:00
lengstrom
13caa4c48e removed entities.js from index.html 2014-07-02 23:51:34 -04:00
Garrett Finucane
ad48ad0a40 added restart button 2014-06-30 12:29:26 -04:00
Garrett Finucane
1a8ee2388a boundary lines denote comboTimer 2014-06-24 10:53:26 -04:00
lengstrom
b153107bdc added start screen 2014-06-23 20:55:04 -04:00
Garrett Finucane
4d848a5ac4 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
03d1627037 changed first screen 2014-05-31 19:37:23 -04:00
lengstrom
3dff49b0ef 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
lengstrom
269f79232f made spacebar pressing make blocks spawn twice as fast as well as go twice as fast 2014-05-31 15:32:01 -04:00
lengstrom
4cbfa4e40f added fontawesome and modified css layout 2014-05-31 15:08:04 -04:00
lengstrom
aabc3447af 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
82fe0c9a6b 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
eb84ceea27 html pause 2014-05-31 11:13:40 -04:00
lengstrom
95b3070e99 reformatted index 2014-05-27 19:44:47 -04:00
garrettdreyfus
540bc36ec0 help screen implemented 2014-05-26 21:05:58 -04:00
garrettdreyfus
5440a2a21a better fonts 2014-05-26 13:38:47 -04:00
garrettdreyfus
2f2ed11c9c Lovello is the bomb 2014-05-26 12:52:57 -04:00
garrettdreyfus
3c895b6e56 added obnoxious purple chain multiplier 2014-05-26 11:22:52 -04:00
Noah Moroze
06bacb800f Fixed mistakes during merge 2014-05-26 00:07:03 -04:00
Noah Moroze
25c0d69b0d Merge 2014-05-25 23:55:20 -04:00
Noah Moroze
3421f54db0 Save state during game 2014-05-25 23:52:35 -04:00
Michael Yang
ed736e18f7 display score in center 2014-05-25 23:42:06 -04:00
Michael Yang
a89f66723c refactor for days 2014-05-25 22:50:13 -04:00
Michael Yang
5dc31d2e54 create update.js, render.js 2014-05-25 21:49:03 -04:00
lengstrom
ad336749e8 added 1/4 retina display 2014-05-25 12:02:22 -04:00
lengstrom
eccb3a4248 merged html 2014-05-25 11:31:28 -04:00
lengstrom
4c1e71ce22 fixed falling hexagon 2014-05-25 11:31:05 -04:00
garrettdreyfus
53a3799afa no extra padding 2014-05-25 11:24:36 -04:00
lengstrom
117a3f882f added real scaling 2014-05-25 10:41:06 -04:00
lengstrom
a56f47c9b7 centered, resized canvas. made system to augment different aspects of the game for different devices. 2014-05-25 01:11:24 -04:00
lengstrom
047ca6833d removed false gameovers, added css for local fonts 2014-05-24 21:12:12 -04:00
Michael Yang
09c0125e92 fixed touch maybe 2014-05-24 14:54:59 -04:00
Michael Yang
f304010964 fixed height vs originalHeight drawing 2014-05-24 14:37:29 -04:00
garrettdreyfus
71eda56c77 thread safe(lol :)) light ui 2014-05-24 12:48:46 -04:00
lengstrom
63dbd47ee7 added beginnings of new wave system 2014-05-23 20:23:31 -04:00
lengstrom
163f0570a4 added new startanim 2014-05-23 16:13:28 -04:00
Michael Yang
b0868afc1b added high score displaying 2014-05-23 01:10:12 -04:00
Michael Yang
cbcd95b85b added navbar, added pausing, changed score rendering 2014-05-23 00:51:03 -04:00
lengstrom
c85d8334ef added analytics 2014-05-22 21:06:33 -04:00
lengstrom
7eab697244 added favicon 2014-05-22 17:30:09 -04:00
lengstrom
a740f1b60d added recording system 2014-05-22 17:04:57 -04:00
Garrett Finucane
283cbbe281 minor fixes wavegen a thing now 2014-05-22 15:29:35 -04:00
Michael Yang
4e88f3e5ce fixed merge conflicts 2014-05-21 17:31:19 -04:00
Michael Yang
846a850c2d changed shadow to gradient 2014-05-21 17:18:18 -04:00
Noah Moroze
5e3af346bd Render score on canvas for better performance 2014-05-20 20:33:44 -04:00
Noah Moroze
13e417bf5b Split loop into game update and render, separated graphics-related code 2014-05-20 08:30:14 -04:00
lengstrom
29b03ea47e Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-19 22:46:39 -04:00
lengstrom
8b8ea581dc added type attributes 2014-05-19 22:46:35 -04:00
Michael Yang
d04972140a added shadows 2014-05-19 22:16:43 -04:00
lengstrom
c5dfd749c1 added index 2014-05-19 16:22:30 -04:00
lengstrom
b2dd5b4ecf adjusted tabs in html 2014-05-19 15:50:10 -04:00
Mathew Huusko V
addfc956db Support retina displays (multiple X rendering) 2014-05-18 14:48:50 -04:00
Mathew Huusko V
5794bcf68e Make game fully responsive (try resizing window...) 2014-05-18 14:26:08 -04:00
Mathew Huusko V
8f3d2e3797 Organize project slightly, clean html 2014-05-18 14:12:33 -04:00
garrettdreyfus
92af3b1e56 the meta tag 2014-05-18 11:49:27 -04:00
garrettdreyfus
c5f8bfc216 touch smi-working 2014-05-18 11:43:49 -04:00
lengstrom
826544b5ac added hackexeter comments 2014-05-17 19:26:31 -04:00
lengstrom
d32e16b205 trying to fix white gaps 2014-05-17 19:21:19 -04:00
Michael Yang
0514e560ea added init/reset function 2014-05-17 18:47:37 -04:00
Michael Yang
b31789f17e added start and end screens 2014-05-17 18:34:02 -04:00
Noah Moroze
c5e769713e Score 2014-05-17 18:22:12 -04:00
Noah Moroze
3d57cc0e09 Added score 2014-05-17 17:38:11 -04:00
lengstrom
fb16e5c189 added formatting 2014-05-17 17:37:52 -04:00
Michael Yang
4be426fe84 added modals, changed game shape, changed colors 2014-05-17 17:10:35 -04:00
lengstrom
0ce085fa34 added collision detection 2014-05-17 13:55:02 -04:00
Michael Yang
2d61f08e19 with noah, fixed clock rotation 2014-05-17 12:57:48 -04:00
Michael Yang
b13a649539 noah is kewl 2014-05-17 12:50:12 -04:00
garrettdreyfus
02fb7b4df9 included checking.js 2014-05-17 12:45:22 -04:00
Noah Moroze
8e525bce6c Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 12:42:02 -04:00
Noah Moroze
1c77af6bd6 Fixed mod arithmetic 2014-05-17 12:41:54 -04:00
lengstrom
b4d006a0e5 merged files 2014-05-17 12:30:40 -04:00
lengstrom
3851284032 added blocks 2014-05-17 12:29:46 -04:00
Noah Moroze
f936253e58 yes 2014-05-17 12:16:56 -04:00
Michael Yang
f8cf88beaf fixed polygon function 2014-05-17 11:55:58 -04:00
Michael Yang
23f3331311 merge again 2014-05-17 11:27:00 -04:00
Michael Yang
ee8f94f68e fixed the width and height stuff 2014-05-17 11:25:33 -04:00
Noah Moroze
f9f00a53dd Fixed styles 2014-05-17 11:22:26 -04:00
lengstrom
ad62664bfc merged 2014-05-17 11:15:53 -04:00
lengstrom
8064f86dda fixed render function + added basic demos for green / yellow stuff 2014-05-17 11:13:10 -04:00
Noah Moroze
530b926a41 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 11:03:14 -04:00
Noah Moroze
32907eef36 Real MATH 2014-05-17 11:03:11 -04:00
lengstrom
9f88cef7d6 Merge branch 'master' of https://github.com/teamsnowman/wastedtime 2014-05-17 10:52:49 -04:00
lengstrom
ddd2630692 added blocks + tests for blocks - not sure if works yet 2014-05-17 10:52:25 -04:00
Noah Moroze
4646514de8 MATH 2014-05-17 10:43:16 -04:00
Noah Moroze
5ecd8349de Initial commit 2014-05-17 10:16:26 -04:00