wbrawner/hextris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1714 commits 3 branches 1 tag 27 MiB
Commit graph

510 commits

Author SHA1 Message Date
lengstrom
277d785ada Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-22 22:07:42 -04:00
lengstrom
06ce886be1 fixed flashing on ios 2014-07-22 22:07:38 -04:00
Garrett Finucane
ed7d8e6b85 share buttons share at game over 2014-07-22 21:53:51 -04:00
lengstrom
d5042fd793 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-22 21:52:11 -04:00
lengstrom
6037f16dc9 removed redundant code, removed debugger statements 2014-07-22 21:52:02 -04:00
Garrett Finucane
e6630498b4 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-22 16:47:48 -04:00
Garrett Finucane
1f94d101e8 pause screen fades away 2014-07-22 16:47:15 -04:00
lengstrom
483e5ede7c added pause message when pressing info button 2014-07-22 09:30:13 -04:00
lengstrom
e257eda84c fixed not beig able to close helpScreen 2014-07-22 09:26:56 -04:00
lengstrom
d656d3c59b fixed double restart issue in ios. added real handlers for helpText classes 2014-07-22 09:21:16 -04:00
Garrett Finucane
23f84febc5 fixed no restart from pause 2014-07-22 09:13:13 -04:00
lengstrom
a6a0a3655c Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-22 09:07:00 -04:00
lengstrom
ca09916ca2 fixed bottom bar connectivity issues. fixed instruction text appearing in the pause screen. fixed buttons appearing in the end game screen 2014-07-22 09:06:52 -04:00
Garrett Finucane
c521f38cda made it so if you score 0 it displays 0 2014-07-22 08:38:11 -04:00
Garrett Finucane
1f135f3bd4 overlapping text in game over 2014-07-21 22:08:33 -04:00
lengstrom
c18bc1e317 upped difficulty on mobile slightly 2014-07-21 21:54:49 -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
fa2a6433fc fixed merge conflicts 2014-07-21 10:23:22 -04:00
lengstrom
c3a1941d88 removed devtools 2014-07-21 09:54:08 -04:00
Garrett Finucane
fa9fb102b3 no comboTimer 2014-07-20 23:35:42 -04:00
Garrett Finucane
279313a09a no menu button 2014-07-20 23:32:09 -04:00
Garrett Finucane
dea00c48d4 share buttons disapear 2014-07-20 23:10:21 -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
Garrett Finucane
11593f4d10 gh star buttons 2014-07-20 20:41:11 -04:00
Garrett Finucane
61b6d860dc pause button now switches whenever paused 2014-07-19 22:31:19 -04:00
Garrett Finucane
ec5f774186 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-19 22:15:26 -04:00
Garrett Finucane
0607ead568 pause button off at start screen 2014-07-19 22:15:14 -04:00
lengstrom
70b8d24c19 fixed merge commits 2014-07-19 22:11:42 -04:00
lengstrom
402d1a3718 added phonegap handlers. integrated pause and info buttons 2014-07-19 22:03:22 -04:00
Garrett Finucane
f54491c2ed added @'s 2014-07-19 21:57:34 -04:00
Garrett Finucane
06a3a31e11 highscores 2014-07-19 21:46:05 -04:00
lengstrom
43c27a0df4 removed canvas instructions from pause menu 2014-07-19 19:48:28 -04:00
Garrett Finucane
54ee9642d3 I fixed double restart clear 2014-07-19 19:12:28 -04:00
lengstrom
99f7b8a748 fixed issue around play btn firing after pressing the button to go back to the main menu 2014-07-19 18:51:35 -04:00
lengstrom
2ef65f41d8 fixed issue w/ tapping triggering multiple depths of btns 2014-07-19 18:34:33 -04:00
lengstrom
4b9e179db9 removed callback stacking issues 2014-07-19 18:03:16 -04:00
lengstrom
0eba942db5 added more to main menu btn 2014-07-19 17:49:39 -04:00
lengstrom
6dabf4e65c added button to go to main menu from the pause menu 2014-07-19 17:36:43 -04:00
lengstrom
eff06e4c18 put instructions inside of pause menu 2014-07-19 16:19:07 -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
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
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
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
lengstrom
f81f05e347 fixed "press p to continue" text occurring in mobile browsers 2014-07-04 14:14:39 -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
Garrett Finucane
1291e53d2a Fixed the small text 2014-07-04 09:46:14 -04:00
lengstrom
dfb5e5ef46 added custom fonts to Text() object 2014-07-03 19:07:51 -04:00
lengstrom
2b528bb592 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-03 18:25:30 -04:00
lengstrom
cb488e0425 fixed block initialization animation playing during pause 2014-07-03 18:25:15 -04:00
Garrett Finucane
604dc44acb fixed tiny text issue 2014-07-03 17:51:13 -04:00
lengstrom
4609a35332 Replaced raw unicode with String.fromCharCode() 2014-07-03 16:39:29 -04:00
lengstrom
3ae89724cb changed delay length 2014-07-03 16:31:45 -04:00
lengstrom
bf2b33c7a5 added devMode, disabled debugging functions. first version of tutorial is done. added delay to gamePlay after pressing start to let the UI elements fade out. 2014-07-03 16:30:56 -04:00
lengstrom
140f0614e9 added drawKey(key, x, y) to draw any key at any given (x,y) 2014-07-03 01:24:35 -04:00
lengstrom
a614f5aec7 Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-02 23:51:43 -04:00
lengstrom
13caa4c48e removed entities.js from index.html 2014-07-02 23:51:34 -04:00
Garrett Finucane
bc864ea20a Fixed flickering after pause 2014-07-02 11:10:36 -04:00
Garrett Finucane
47664aa63c Title screen fades in and out 2014-07-02 10:58:02 -04:00
lengstrom
ae6ef6690a Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-07-01 22:30:13 -04:00
lengstrom
8c4dd05427 standardized block fall speed on hexagon 2014-07-01 22:30:01 -04:00
Garrett Finucane
a231dd8a77 unhid all the buttons 2014-07-01 11:18:13 -04:00
Garrett Finucane
95c0816557 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-07-01 11:03:06 -04:00
Garrett Finucane
352988ab4a no more -2 gameState 2014-07-01 11:02:52 -04:00
lengstrom
26260747ff Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-06-30 22:45:14 -04:00
lengstrom
508002d16e fixed issue in which waves would restart after resuming the game 2014-06-30 22:45:00 -04:00
Garrett Finucane
d83d0c50be fixed clicking in hextris 2014-06-30 21:56:14 -04:00
Garrett Finucane
14e1f662cc new comboTimer 2014-06-30 21:31:54 -04:00
Garrett Finucane
9a3ac314c6 restart icon shown on resume 2014-06-30 13:34:55 -04:00
Garrett Finucane
ad48ad0a40 added restart button 2014-06-30 12:29:26 -04:00
Garrett Finucane
ea179a7292 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-30 12:13:50 -04:00
Garrett Finucane
b2abf7dabd new combotimer 2014-06-30 12:13:21 -04:00
lengstrom
36ec1a9b64 Removed spacebar speedup 2014-06-29 14:35:10 -04:00
lengstrom
4297dffefa fixed bug in which pause btn didn't show up after resuming a game 2014-06-29 14:25:40 -04:00
lengstrom
a5fe95443f removed useless opacity settings 2014-06-28 15:33:31 -04:00
lengstrom
5004a5cf34 fixed demo level faultily calling the game over after start 2014-06-28 14:42:55 -04:00
lengstrom
13be0a5db8 reverted changes around transition from start screen -> gameplay 2014-06-28 14:34:30 -04:00
lengstrom
31c4b4d96a removed white gaps, changed method for starting previously saved game to calling resumeGame (after init is called) 2014-06-28 13:44:43 -04:00
lengstrom
8ad952b379 fixed white gaps, added saveState to .unload handler 2014-06-28 12:01:41 -04:00
lengstrom
6304f410c9 fixed white gaps caused by constant, needless scaling during export 2014-06-28 11:57:22 -04:00
lengstrom
a7293a1d48 fixed start btn not starting saved games, removed useless debugging lines 2014-06-28 11:48:45 -04:00
lengstrom
2f2ad3b7ae fixed clicking on btn, started adding start->play transition anims 2014-06-28 11:24:47 -04:00
lengstrom
0a1925bc89 converted animLoop to a switch case 2014-06-27 22:15:16 -04:00
lengstrom
71dd048738 combo lines now match the faded blocks during menu screen play 2014-06-27 22:09:36 -04:00
lengstrom
57b6f21e89 converted completely to hex, added legacy support 2014-06-27 21:39:32 -04:00
lengstrom
38e417b704 fixed issues surrounding checking and faulty hex -> rgb translations 2014-06-27 21:31:59 -04:00
lengstrom
183af89000 fixed initial setup not rendering correctly in menu 2014-06-27 21:19:57 -04:00
lengstrom
632b68e60a extended reset to enter key press as well in the title screen 2014-06-27 19:10:53 -04:00
lengstrom
916cff498d fixed issue in which imported data would continue to play after startup and the hexagon would not be cleared 2014-06-26 22:19:41 -04:00
Garrett Finucane
28515ab67c moved incrementing MainClock.ct from render to update 2014-06-24 13:41:40 -04:00
Garrett Finucane
83152a24ea timer drawn beneath blocks and goes backwards 2014-06-24 13:22:47 -04:00
Garrett Finucane
fc426f46dc fixed the whole weird stuff 2014-06-24 13:16:46 -04:00
Garrett Finucane
4b434de3ef Line Wraps around now 2014-06-24 11:44:40 -04:00
Garrett Finucane
8a78a4e6c5 Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages 2014-06-24 10:53:53 -04:00
Garrett Finucane
1a8ee2388a boundary lines denote comboTimer 2014-06-24 10:53:26 -04:00
lengstrom
75ff870065 fixed restart method not clearing the screen, started fixing distFromHex changing 
after restart
 2014-06-24 09:47:15 -04:00
lengstrom
0715056fe0 fixed issue in which blocks were added twice (init was called twice) 2014-06-24 09:23:43 -04:00
Garrett Finucane
04c553d46d minor fixes 2014-06-24 00:15:03 -04:00
Garrett Finucane
48217a7940 falling blocks dont continue falling on refresh 2014-06-23 23:12:38 -04:00
Garrett Finucane
5b41abcb02 refreshing no longer clears at start 2014-06-23 22:31:25 -04:00
lengstrom
b7f475724f Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages 2014-06-23 22:26:05 -04:00
lengstrom
706c9f1130 added previous game display on the title 2014-06-23 22:26:00 -04:00
Garrett Finucane
31b4f91c32 high scores better 2014-06-23 22:21:36 -04:00
lengstrom
4936b76940 merged 2014-06-23 20:58:07 -04:00
lengstrom
b153107bdc added start screen 2014-06-23 20:55:04 -04:00
Garrett Finucane
5f25d1de37 re-whitened text 2014-06-23 20:18:32 -04:00
Garrett Finucane
b84e8c48f0 text inverts 2014-06-23 19:21:09 -04:00
Garrett Finucane
7b16ffc85a faded to immediate background 2014-06-23 18:47:29 -04:00
Garrett Finucane
6eb3d17f1c different timeout tone 2014-06-23 18:40:41 -04:00
Garrett Finucane
a5788fcc0c tints to show combo timeout 2014-06-23 18:35:28 -04:00