Garrett Finucane
04aaa6bc45
continues to draw score and background hex after pause
2014-05-31 20:10:32 -04:00
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
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
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
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
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
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
Noah Moroze
95e7c1b0db
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
2014-05-26 12:30:45 -04:00
Noah Moroze
0ce3056879
Fixed blocks starting behind hexagon on load save state
2014-05-26 12:30:30 -04:00
garrettdreyfus
2c707b62a9
adding floats up
2014-05-26 12:27:30 -04:00
garrettdreyfus
8c0692fa90
added obnoxious purple chain multiplier
2014-05-26 11:22:52 -04:00
Michael Yang
0b9cd14100
whoops
2014-05-26 01:28:37 -04:00
Michael Yang
4af9d97442
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
2014-05-26 01:12:01 -04:00
Michael Yang
d6b4716bd0
added clock hand
2014-05-26 01:11:47 -04:00
Noah Moroze
05246608ce
Fixed problems with not resetting save
2014-05-26 01:11:13 -04:00
Noah Moroze
bfde350f92
Fixed mistakes during merge
2014-05-26 00:07:03 -04:00
Noah Moroze
6b40e6ecdc
Merge
2014-05-25 23:55:20 -04:00
Noah Moroze
56bc252977
Save state during game
2014-05-25 23:52:35 -04:00
Michael Yang
12ded6b0da
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
2014-05-25 23:42:17 -04:00
Michael Yang
2313940108
display score in center
2014-05-25 23:42:06 -04:00
garrettdreyfus
7b6a910865
added combo multiplier
2014-05-25 23:12:47 -04:00
Michael Yang
ff2978b9ad
refactor for days
2014-05-25 22:50:13 -04:00
Michael Yang
83607bf806
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
2014-05-25 22:30:04 -04:00
Michael Yang
91b3c3f925
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
2014-05-25 22:29:36 -04:00
garrettdreyfus
6ef7f09da7
you dont spell parent parrent
2014-05-25 22:29:34 -04:00
Michael Yang
035ae2da91
fixed onblur pausing bug
2014-05-25 22:28:04 -04:00
garrettdreyfus
58d8016a28
more comments in entities
2014-05-25 22:17:26 -04:00
garrettdreyfus
b7fb4ab89d
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
2014-05-25 22:06:28 -04:00
garrettdreyfus
c7061997f6
no circular references halfway comments
2014-05-25 22:06:15 -04:00
Noah Moroze
e64577f3b1
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
2014-05-25 21:59:47 -04:00
Noah Moroze
85fe438cf0
Wrote exportSaveState
2014-05-25 21:59:33 -04:00
Michael Yang
41afa3ca46
Merge branch 'master' of https://github.com/teamsnowman/hextris
2014-05-25 21:49:18 -04:00
Michael Yang
918c8ab924
create update.js, render.js
2014-05-25 21:49:03 -04:00
garrettdreyfus
7e7c583d0a
added comments for checking
2014-05-25 21:47:21 -04:00
meadowstream
b0cfe52534
Merge branch 'master' into gh-pages
2014-05-25 21:25:45 -04:00
Michael Yang
94a6610977
remove test.js
2014-05-25 21:07:46 -04:00
garrettdreyfus
0ddf85c921
better gamestates
2014-05-25 21:04:14 -04:00
garrettdreyfus
666fa8b511
better infringement detection
2014-05-25 20:34:56 -04:00
meadowstream
4371164e45
added new block destruction effects. broke pausing
2014-05-25 19:53:02 -04:00
meadowstream
37dff530b8
changed way that settings.creationSpeedModifier is used
2014-05-25 18:45:20 -04:00
meadowstream
f01e89248c
changed difficulty level
2014-05-25 18:32:49 -04:00
meadowstream
464a7dde43
added mobile version
2014-05-25 18:27:25 -04:00
meadowstream
0e9db3d7ab
added 1/4 retina display
2014-05-25 12:02:22 -04:00
meadowstream
a01bf3d26a
fixed falling hexagon
2014-05-25 11:31:05 -04:00
meadowstream
8fb791fbac
Merge branch 'master' into gh-pages
2014-05-25 11:17:10 -04:00
meadowstream
1921d43060
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
2014-05-25 11:16:37 -04:00
meadowstream
9c3521880b
added scaling
2014-05-25 11:16:33 -04:00
garrettdreyfus
16c4502a1c
pausing fixed
2014-05-25 11:15:22 -04:00
garrettdreyfus
1db9d66474
no shadow
2014-05-25 11:05:05 -04:00
garrettdreyfus
b8526741c3
scoreScalar deleted
2014-05-25 10:55:49 -04:00
garrettdreyfus
138e0e5b2c
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
...
Conflicts:
js/main.js
2014-05-25 10:52:20 -04:00
garrettdreyfus
bf3c247533
clean script created
2014-05-25 10:51:25 -04:00
meadowstream
2a4c971d67
Merge branch 'gh-pages'
2014-05-25 10:42:31 -04:00
meadowstream
3388dfa022
merged
2014-05-25 10:42:09 -04:00
meadowstream
c6613ad794
added real scaling
2014-05-25 10:41:06 -04:00
garrettdreyfus
2b52b64165
deleted blocks can not partake in combos
2014-05-25 10:20:32 -04:00
garrettdreyfus
3f0040c213
got rid of useless lane calculation
2014-05-25 10:08:09 -04:00
garrettdreyfus
fe0cbb72c9
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris
2014-05-25 10:03:42 -04:00
garrettdreyfus
79ae18dc6f
added Attached lane, fixes checking
2014-05-25 10:03:28 -04:00
meadowstream
63d33c7e11
merged
2014-05-25 01:12:06 -04:00
meadowstream
10a24d092e
centered, resized canvas. made system to augment different aspects of the game for different devices.
2014-05-25 01:11:24 -04:00
garrettdreyfus
aeb17cfec5
better scoring
2014-05-25 00:59:56 -04:00
garrettdreyfus
edab5b7118
added back the enter key
2014-05-25 00:44:25 -04:00
garrettdreyfus
70330a40bf
Merge branch 'master' of http://github.com/teamsnowman/hextris into gh-pages
...
Conflicts:
js/main.js
2014-05-25 00:41:01 -04:00
garrettdreyfus
944245f639
fixed checking
2014-05-25 00:39:23 -04:00
garrettdreyfus
8db46856f7
better input
2014-05-24 22:44:23 -04:00
meadowstream
078093eff4
readded pausing onblur, removed debugger statements
2014-05-24 22:10:12 -04:00
meadowstream
482a3ef7b9
removed false gameovers, added css for local fonts
2014-05-24 21:12:12 -04:00
meadowstream
df82f5fee8
changed ramping in difficulty
2014-05-24 19:50:57 -04:00
meadowstream
10c8a0b28a
fixed issues surrounding white blocks
2014-05-24 18:28:32 -04:00
meadowstream
0f9484b7e6
added ability to restart game at any time using enter, removed logging
2014-05-24 16:39:25 -04:00
meadowstream
d7ea9b6628
started to add ability to restart game at any time by pressing enter
2014-05-24 16:39:04 -04:00
meadowstream
bf6368cdba
added ability to turn hexagon during startup
2014-05-24 16:35:32 -04:00
meadowstream
70b404e161
fixed conflicts around input.js and pausing
2014-05-24 16:04:57 -04:00
meadowstream
74cf58facc
fixed speeding up used to create an additional concurrent game loop when enter was pressed
2014-05-24 16:02:14 -04:00
Michael Yang
598acaae87
hacky fix to drop blocks on gameover
2014-05-24 16:01:24 -04:00
Michael Yang
6c073cacdb
ended spawning blocks on gameover
2014-05-24 15:59:13 -04:00
meadowstream
bc11f11d07
set paused to always call requestAnimFrame
2014-05-24 15:56:29 -04:00
Michael Yang
477c5aba6d
Merge branch 'master' of https://github.com/teamsnowman/hextris
2014-05-24 15:52:38 -04:00
Michael Yang
7e762ebe77
center hex snaps on gameover
2014-05-24 15:52:25 -04:00
garrettdreyfus
18299e433b
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
2014-05-24 15:51:32 -04:00
meadowstream
2645e32474
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
2014-05-24 15:51:13 -04:00
garrettdreyfus
5eb36f205a
Merge branch 'master' of http://github.com/teamsnowman/hextris
...
Conflicts:
js/main.js
2014-05-24 15:51:03 -04:00
garrettdreyfus
68273a6a23
deleting is back
2014-05-24 15:50:01 -04:00
meadowstream
cbba963675
fixed block detection
2014-05-24 15:48:48 -04:00
meadowstream
f6d208917e
removed debugger statements
2014-05-24 15:46:35 -04:00
Michael Yang
367bbd8656
fixed restart bug
2014-05-24 15:42:40 -04:00
meadowstream
4491ef2d28
made anim slower
2014-05-24 15:41:44 -04:00
meadowstream
e853555ef5
boundary renders below hex
2014-05-24 15:39:27 -04:00
meadowstream
d0b8c563c6
merged boundary systems
2014-05-24 15:37:21 -04:00
meadowstream
2c6759262a
added new block initialization animation
2014-05-24 15:35:38 -04:00
garrettdreyfus
5cdc671f0d
outline
2014-05-24 15:31:57 -04:00
Michael Yang
eebc76cb06
whoops, now properly merged
2014-05-24 15:10:28 -04:00
Michael Yang
a3b74202b8
merge conflict resolved
2014-05-24 15:07:58 -04:00
Michael Yang
19fa87eb5a
improved drawPolygon, changed inner hex
2014-05-24 15:06:57 -04:00
garrettdreyfus
43e011e884
Merge branch 'master' of http://github.com/teamsnowman/hextris
...
Conflicts:
js/main.js
2014-05-24 14:53:22 -04:00
garrettdreyfus
e07386038f
pauses when you leave the tab
2014-05-24 14:52:21 -04:00
meadowstream
4aae004ba6
added fade in for hexagonal boundary
2014-05-24 14:41:14 -04:00
garrettdreyfus
ae13307b64
Merge branch 'master' of http://github.com/teamsnowman/hextris
2014-05-24 14:38:36 -04:00
garrettdreyfus
6eb89aefdd
not sure
2014-05-24 14:38:35 -04:00
Michael Yang
33dc99827f
Merge branch 'master' of https://github.com/teamsnowman/hextris
2014-05-24 14:37:55 -04:00
Michael Yang
19d02687b0
fixed height vs originalHeight drawing
2014-05-24 14:37:29 -04:00
garrettdreyfus
8863a41f69
wavegen back to normal
2014-05-24 14:15:07 -04:00
garrettdreyfus
23a15852cf
Merge branch 'master' of http://github.com/teamsnowman/hextris
2014-05-24 14:12:44 -04:00
garrettdreyfus
6d1b01853d
blocks fade in on shoot
2014-05-24 14:12:33 -04:00
meadowstream
aa75117137
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
2014-05-24 14:12:19 -04:00
meadowstream
f28e510b9b
Merge branch 'gh-pages'
2014-05-24 14:12:13 -04:00
meadowstream
085e04c2c9
fixed importing and exporting game data
2014-05-24 14:12:01 -04:00
garrettdreyfus
3f0f3f1e86
better boundry line
2014-05-24 14:08:40 -04:00
garrettdreyfus
73b51be3a8
pausing fixed
2014-05-24 13:59:01 -04:00
garrettdreyfus
8c14cc9463
no undefined colors
2014-05-24 13:56:41 -04:00
garrettdreyfus
19ae89369a
checking working again
2014-05-24 13:25:33 -04:00
garrettdreyfus
e1979053b5
blocks being generated no checking happening
2014-05-24 13:24:03 -04:00
garrettdreyfus
9116411bb9
better modular arithmetic
2014-05-24 13:11:17 -04:00
meadowstream
7a934ca976
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
2014-05-24 12:57:38 -04:00
meadowstream
0992939823
fixed pausing
2014-05-24 12:57:27 -04:00
garrettdreyfus
7c8830472a
thread safe(lol :)) light ui
2014-05-24 12:48:46 -04:00
meadowstream
154eea7a1b
fixed issues around blocks not revolving + updated generation mehcanics
2014-05-24 12:21:29 -04:00
meadowstream
51c479ed77
made timing for wavegeneration iteration rather than time based
2014-05-24 12:09:46 -04:00
meadowstream
bfc020af6a
Merge branch 'master' into gh-pages
2014-05-23 23:28:44 -04:00
meadowstream
bf7cf8c0f8
generations of waves start at a faster speed but reach mins slower
2014-05-23 23:27:58 -04:00
meadowstream
37c015dab7
made # of sides more dynamic
2014-05-23 22:46:01 -04:00
meadowstream
1c56603bc2
added more variety in block generation
2014-05-23 22:41:55 -04:00
garrettdreyfus
3dad2f1e9c
less consolidateBlocks
2014-05-23 21:36:59 -04:00
meadowstream
4cc4ca6dea
changed randomGEneration function to have faster rampup, longer amount of time in the more fun zone
2014-05-23 20:49:57 -04:00
meadowstream
518c72f844
added beginnings of new wave system
2014-05-23 20:23:31 -04:00
meadowstream
95f9613899
added bouncing anim v2
2014-05-23 16:50:18 -04:00
meadowstream
3ec79fcb35
added new startanim
2014-05-23 16:13:28 -04:00
Noah Moroze
47e0e9632d
Properly set default highscores
2014-05-23 13:01:51 -04:00
Michael Yang
324aaa7b5d
added localStorage highscores
2014-05-23 01:51:16 -04:00
Michael Yang
aef9eb31c9
added high score displaying
2014-05-23 01:10:12 -04:00
Michael Yang
2a398e255b
added navbar, added pausing, changed score rendering
2014-05-23 00:51:03 -04:00
meadowstream
7aadcb8fe1
added analytics v2
2014-05-22 21:06:52 -04:00
garrettdreyfus
6514598b6c
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris
2014-05-22 20:44:25 -04:00
garrettdreyfus
29e71d9479
faster fade
2014-05-22 20:44:14 -04:00
Noah Moroze
642ef7cd31
Removed space-to-speed-up until we figure out an alternative
2014-05-22 20:36:48 -04:00
meadowstream
e4bdde9fd1
added new waves system, starting to redo start screen
2014-05-22 20:22:20 -04:00
meadowstream
28d612c734
merged
2014-05-22 19:32:58 -04:00
meadowstream
32136d48ce
added more extensive shaking + cleaned up some code
2014-05-22 19:30:40 -04:00
garrettdreyfus
d5eedd0f5b
fixed scoring
2014-05-22 19:30:01 -04:00
garrettdreyfus
96412e5233
no more disappearing blocks
2014-05-22 19:08:08 -04:00
meadowstream
567852279f
added shaking when the hexagon is hit by blocks
2014-05-22 19:01:39 -04:00
meadowstream
f0b279274d
added recording system
2014-05-22 17:04:57 -04:00
meadowstream
3222f2184e
merged
2014-05-22 16:38:32 -04:00
meadowstream
c9ef3d04b2
added import/export system
2014-05-22 16:36:32 -04:00
Garrett Finucane
23c8a89047
fixed combos and added wavegen
2014-05-22 15:42:05 -04:00
Garrett Finucane
cbd56c8826
minor fixes wavegen a thing now
2014-05-22 15:29:35 -04:00
Garrett Finucane
a8b6d36fd7
added combo detecting
2014-05-22 14:19:58 -04:00
Garrett Finucane
9fac2d2f8f
got rid of cruft
2014-05-22 13:53:24 -04:00
meadowstream
4607423e09
fixed falling mechanics, tint and opacity no longer conflict
2014-05-22 13:26:44 -04:00
meadowstream
4ee2ffbd2b
now, only blocks that need to fall go into a state of falling after
...
blocks below them are destroyed
2014-05-22 13:10:26 -04:00
meadowstream
f5a3056823
blocks now fade out based on their opacity before being destroyed
2014-05-22 13:01:39 -04:00
meadowstream
dafb4b6fe2
added opacity / tint properties
2014-05-21 18:39:02 -04:00
meadowstream
56d34d4d2d
removed innerhtml scoring statement
2014-05-21 17:44:34 -04:00
meadowstream
6eb13b72a4
removed useless translation + did some jslinting
2014-05-21 17:41:18 -04:00
meadowstream
5cc9210781
Merge branch 'master' into gh-pages
2014-05-21 17:39:49 -04:00
Michael Yang
f6ecba5024
fixed merge conflicts
2014-05-21 17:31:19 -04:00
Michael Yang
797701c4e4
changed shadow to gradient
2014-05-21 17:18:18 -04:00
garrettdreyfus
02a46580af
Merge branch 'master' of http://github.com/teamsnowman/hextris into gh-pages
...
Conflicts:
js/checking.js
2014-05-20 22:39:03 -04:00
garrettdreyfus
8219515329
NO LAG ctx.shadowBlur=25
2014-05-20 22:33:50 -04:00
Noah Moroze
08abf881e4
Got rid of extraneous debugger call
2014-05-20 20:39:19 -04:00