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

499 commits

Author SHA1 Message Date
lengstrom
20ce833a5c Merge branch 'gh-pages' of https://github.com/hextris/hextris into gh-pages 2014-07-27 20:06:52 -04:00
lengstrom
4e329df82b updated wave generation slightly 2014-07-27 20:06:31 -04:00
Garrett Finucane
3bc64432bb changed comboTime to 4 2014-07-27 20:05:12 -04:00
Garrett Finucane
6c5272b045 changed comboTime to 4 2014-07-27 20:04:44 -04:00
lengstrom
c7e0cda6bf fixed merge conflicts 2014-07-27 20:01:41 -04:00
lengstrom
77555f2908 updated wavegen times 2014-07-27 20:00:54 -04:00
Garrett Finucane
65ebf6e4cd changed comboTime to 3.5 2014-07-27 19:56:49 -04:00
Garrett Finucane
2a2f889e48 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-27 19:53:02 -04:00
Garrett Finucane
4ac84ee5f8 changed comboTimer to be based on waves 2014-07-27 19:52:48 -04:00
lengstrom
c753bebff6 increase speed slightly 2014-07-27 19:21:06 -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
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
Garrett Finucane
2ec570d291 fixed the jagged rendering by fixing the stupid constant 2014-07-27 08:27:15 -04:00
lengstrom
4b05194e0a Increased speed slightly 2014-07-26 20:39:53 -07:00
lengstrom
9c89b1eecb changed intervals between waves 2014-07-26 23:36:05 -04:00
lengstrom
f9a85e489f made game more exciting via changing intervals 2014-07-26 23:34:33 -04:00
Garrett Finucane
34ebaa03f9 made combo reflect timer 2014-07-26 19:58:58 -04:00
lengstrom
f9ff5b4cea added effects of creationSpeedModifier 2014-07-26 10:54:41 -04:00
lengstrom
eae6eb5b82 fixed turning the hexagon on pressing the start button on mobile 2014-07-26 10:52:38 -04:00
lengstrom
50c4ebbf92 made game slightly harder on mobile 2014-07-26 10:47:27 -04:00
lengstrom
ec94635705 made the game easier on mobile. fixed issue where wave generator wasn't being updated 2014-07-26 10:46:13 -04:00
lengstrom
96db489cd9 enabled all patterns 2014-07-26 10:42:10 -04:00
lengstrom
88b52e13d4 added a new generation pattern (half circles) 2014-07-26 10:35:56 -04:00
lengstrom
734225075c fixed pause button toggling in the opposite manner. added more 
highscores infrastructure to make it more reliable / more modular
 2014-07-26 09:23:24 -04:00
lengstrom
8d9309354f fixed not being able to pause 2014-07-25 23:34:23 -04:00
lengstrom
f4b7b80c22 made pause button switch states based on the actual gameState value rather than handlers 2014-07-25 23:10:23 -04:00
lengstrom
81c89548c4 tenatively fixed highscores 2014-07-25 00:33:54 -04:00
lengstrom
7116f0b5f4 started writing highscore code 2014-07-24 11:16:53 -04:00
lengstrom
d1a0a04f21 removed whitespace 2014-07-23 22:37:31 -04:00
lengstrom
4b1c9794dc Merge branch 'gh-pages' of https://github.com/hextris/hextris into gh-pages 2014-07-23 22:29:40 -04:00
lengstrom
81e9fffae6 added handlers to prevent turning on pressing start btn 2014-07-23 22:29:35 -04:00
lengstrom
4d8c301480 removed logging statement 2014-07-23 22:02: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
4f15bfa423 changed restart btn to always restart the game instead of sometimes also resuming 2014-07-23 09:47:03 -04:00
lengstrom
ca512a1524 removed useless function + removed alert 2014-07-23 09:30:51 -04:00
Garrett Finucane
6a41ef0d45 Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages 2014-07-22 22:19:42 -04:00
Garrett Finucane
cda42ac00c waits for fade to resume 2014-07-22 22:19:20 -04:00
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