lengstrom
|
704e8478b4
|
changed this.ct to increment every time
|
2014-05-26 13:46:11 -04:00 |
|
garrettdreyfus
|
6712507065
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
|
2014-05-26 13:38:59 -04:00 |
|
garrettdreyfus
|
5440a2a21a
|
better fonts
|
2014-05-26 13:38:47 -04:00 |
|
lengstrom
|
472c86297d
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
|
2014-05-26 13:30:43 -04:00 |
|
lengstrom
|
c97a77bbdf
|
made center text white
|
2014-05-26 13:30:39 -04:00 |
|
garrettdreyfus
|
3cdc6228f5
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
|
2014-05-26 13:18:44 -04:00 |
|
garrettdreyfus
|
a9c7d1668c
|
multipliers white
|
2014-05-26 13:18:27 -04:00 |
|
lengstrom
|
ad15dc2fb7
|
removed number render offset
|
2014-05-26 13:18:20 -04:00 |
|
lengstrom
|
5502c3a39f
|
centered text
|
2014-05-26 13:11:23 -04:00 |
|
lengstrom
|
00e250b80e
|
fixed modifying rather than accessing in findCenterOfBlocks
|
2014-05-26 13:09:59 -04:00 |
|
lengstrom
|
4c219e2ddf
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
|
2014-05-26 13:04:30 -04:00 |
|
lengstrom
|
b1be42241b
|
block function returns a center slightly otuwards
|
2014-05-26 13:04:26 -04:00 |
|
garrettdreyfus
|
7fa3481bb3
|
score multiplier
|
2014-05-26 13:04:23 -04:00 |
|
lengstrom
|
37fcd47e37
|
centered text
|
2014-05-26 12:57:18 -04:00 |
|
garrettdreyfus
|
bca95619b3
|
start is Lovello too
|
2014-05-26 12:54:33 -04:00 |
|
garrettdreyfus
|
e97a437e34
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
|
2014-05-26 12:53:08 -04:00 |
|
garrettdreyfus
|
2f2ed11c9c
|
Lovello is the bomb
|
2014-05-26 12:52:57 -04:00 |
|
lengstrom
|
667787235f
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
|
2014-05-26 12:49:24 -04:00 |
|
lengstrom
|
420ed9d43e
|
added findCenterOfBlocks
|
2014-05-26 12:49:20 -04:00 |
|
garrettdreyfus
|
94650522b5
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
|
2014-05-26 12:46:12 -04:00 |
|
garrettdreyfus
|
5abb300163
|
floating adder color of scored
|
2014-05-26 12:45:52 -04:00 |
|
lengstrom
|
c6fcfb4a04
|
removed clock hand
|
2014-05-26 12:41:04 -04:00 |
|
Noah Moroze
|
f24055bc6a
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
|
2014-05-26 12:30:45 -04:00 |
|
Noah Moroze
|
d6d738e298
|
Fixed blocks starting behind hexagon on load save state
|
2014-05-26 12:30:30 -04:00 |
|
garrettdreyfus
|
d53768bf48
|
adding floats up
|
2014-05-26 12:27:30 -04:00 |
|
garrettdreyfus
|
3c895b6e56
|
added obnoxious purple chain multiplier
|
2014-05-26 11:22:52 -04:00 |
|
Michael Yang
|
febf41fd5b
|
whoops
|
2014-05-26 01:28:37 -04:00 |
|
Michael Yang
|
ff50557d25
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
|
2014-05-26 01:12:01 -04:00 |
|
Michael Yang
|
95ac06bc13
|
added clock hand
|
2014-05-26 01:11:47 -04:00 |
|
Noah Moroze
|
09f6a0f83c
|
Fixed problems with not resetting save
|
2014-05-26 01:11:13 -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
|
a239c13bee
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
|
2014-05-25 23:42:17 -04:00 |
|
Michael Yang
|
ed736e18f7
|
display score in center
|
2014-05-25 23:42:06 -04:00 |
|
garrettdreyfus
|
0de8d54e79
|
added combo multiplier
|
2014-05-25 23:12:47 -04:00 |
|
Michael Yang
|
a89f66723c
|
refactor for days
|
2014-05-25 22:50:13 -04:00 |
|
Michael Yang
|
0546c8abdf
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
|
2014-05-25 22:30:04 -04:00 |
|
Michael Yang
|
2421d08ade
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
|
2014-05-25 22:29:36 -04:00 |
|
garrettdreyfus
|
466b7f4c73
|
you dont spell parent parrent
|
2014-05-25 22:29:34 -04:00 |
|
Michael Yang
|
4c1ea98f8e
|
fixed onblur pausing bug
|
2014-05-25 22:28:04 -04:00 |
|
garrettdreyfus
|
155ece8b0b
|
more comments in entities
|
2014-05-25 22:17:26 -04:00 |
|
garrettdreyfus
|
79f5e856d7
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
|
2014-05-25 22:06:28 -04:00 |
|
garrettdreyfus
|
a79ec65bed
|
no circular references halfway comments
|
2014-05-25 22:06:15 -04:00 |
|
Noah Moroze
|
9b297dbfa0
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
|
2014-05-25 21:59:47 -04:00 |
|
Noah Moroze
|
12caecdbeb
|
Wrote exportSaveState
|
2014-05-25 21:59:33 -04:00 |
|
Michael Yang
|
6344039e69
|
Merge branch 'master' of https://github.com/teamsnowman/hextris
|
2014-05-25 21:49:18 -04:00 |
|
Michael Yang
|
5dc31d2e54
|
create update.js, render.js
|
2014-05-25 21:49:03 -04:00 |
|
garrettdreyfus
|
1abc55242f
|
added comments for checking
|
2014-05-25 21:47:21 -04:00 |
|
lengstrom
|
9eb41988f3
|
Merge branch 'master' into gh-pages
|
2014-05-25 21:25:45 -04:00 |
|
Michael Yang
|
79e79c5a32
|
remove test.js
|
2014-05-25 21:07:46 -04:00 |
|
garrettdreyfus
|
4cbd909845
|
better gamestates
|
2014-05-25 21:04:14 -04:00 |
|
garrettdreyfus
|
990b5cf83e
|
better infringement detection
|
2014-05-25 20:34:56 -04:00 |
|
lengstrom
|
b7a6bdf5c1
|
added new block destruction effects. broke pausing
|
2014-05-25 19:53:02 -04:00 |
|
lengstrom
|
2287f45e78
|
changed way that settings.creationSpeedModifier is used
|
2014-05-25 18:45:20 -04:00 |
|
lengstrom
|
09898509da
|
changed difficulty level
|
2014-05-25 18:32:49 -04:00 |
|
lengstrom
|
97a08da984
|
added mobile version
|
2014-05-25 18:27:25 -04:00 |
|
lengstrom
|
ad336749e8
|
added 1/4 retina display
|
2014-05-25 12:02:22 -04:00 |
|
lengstrom
|
4c1e71ce22
|
fixed falling hexagon
|
2014-05-25 11:31:05 -04:00 |
|
lengstrom
|
b16fa95c7e
|
Merge branch 'master' into gh-pages
|
2014-05-25 11:17:10 -04:00 |
|
lengstrom
|
114d420a49
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/wastedtime into gh-pages
|
2014-05-25 11:16:37 -04:00 |
|
lengstrom
|
f69e8e31f6
|
added scaling
|
2014-05-25 11:16:33 -04:00 |
|
garrettdreyfus
|
9dc6c0ee49
|
pausing fixed
|
2014-05-25 11:15:22 -04:00 |
|
garrettdreyfus
|
00116cc43c
|
no shadow
|
2014-05-25 11:05:05 -04:00 |
|
garrettdreyfus
|
5ce2fb994c
|
scoreScalar deleted
|
2014-05-25 10:55:49 -04:00 |
|
garrettdreyfus
|
17c4f72e8c
|
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
|
797f5da920
|
clean script created
|
2014-05-25 10:51:25 -04:00 |
|
lengstrom
|
f1744cf1c3
|
Merge branch 'gh-pages'
|
2014-05-25 10:42:31 -04:00 |
|
lengstrom
|
f5c0d7a047
|
merged
|
2014-05-25 10:42:09 -04:00 |
|
lengstrom
|
117a3f882f
|
added real scaling
|
2014-05-25 10:41:06 -04:00 |
|
garrettdreyfus
|
2976744f33
|
deleted blocks can not partake in combos
|
2014-05-25 10:20:32 -04:00 |
|
garrettdreyfus
|
18c5e8b4d0
|
got rid of useless lane calculation
|
2014-05-25 10:08:09 -04:00 |
|
garrettdreyfus
|
0113c3668f
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris
|
2014-05-25 10:03:42 -04:00 |
|
garrettdreyfus
|
c58a48f88d
|
added Attached lane, fixes checking
|
2014-05-25 10:03:28 -04:00 |
|
lengstrom
|
23bf29e7ab
|
merged
|
2014-05-25 01:12: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 |
|
garrettdreyfus
|
3c84813469
|
better scoring
|
2014-05-25 00:59:56 -04:00 |
|
garrettdreyfus
|
671ff6c0f2
|
added back the enter key
|
2014-05-25 00:44:25 -04:00 |
|
garrettdreyfus
|
31727a9f9e
|
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
|
268d55db14
|
fixed checking
|
2014-05-25 00:39:23 -04:00 |
|
garrettdreyfus
|
ab2ca381b3
|
better input
|
2014-05-24 22:44:23 -04:00 |
|
lengstrom
|
7cb65b2d20
|
readded pausing onblur, removed debugger statements
|
2014-05-24 22:10:12 -04:00 |
|
lengstrom
|
047ca6833d
|
removed false gameovers, added css for local fonts
|
2014-05-24 21:12:12 -04:00 |
|
lengstrom
|
9c5ed782eb
|
changed ramping in difficulty
|
2014-05-24 19:50:57 -04:00 |
|
lengstrom
|
050cb49d21
|
fixed issues surrounding white blocks
|
2014-05-24 18:28:32 -04:00 |
|
lengstrom
|
c1ffee24c2
|
added ability to restart game at any time using enter, removed logging
|
2014-05-24 16:39:25 -04:00 |
|
lengstrom
|
78f020dd1b
|
started to add ability to restart game at any time by pressing enter
|
2014-05-24 16:39:04 -04:00 |
|
lengstrom
|
cf574f8599
|
added ability to turn hexagon during startup
|
2014-05-24 16:35:32 -04:00 |
|
lengstrom
|
014b110321
|
fixed conflicts around input.js and pausing
|
2014-05-24 16:04:57 -04:00 |
|
lengstrom
|
0ce1d424b3
|
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
|
f002726b23
|
hacky fix to drop blocks on gameover
|
2014-05-24 16:01:24 -04:00 |
|
Michael Yang
|
c981196677
|
ended spawning blocks on gameover
|
2014-05-24 15:59:13 -04:00 |
|
lengstrom
|
b2bb34bbfb
|
set paused to always call requestAnimFrame
|
2014-05-24 15:56:29 -04:00 |
|
Michael Yang
|
81f04c93b5
|
Merge branch 'master' of https://github.com/teamsnowman/hextris
|
2014-05-24 15:52:38 -04:00 |
|
Michael Yang
|
071b072c7e
|
center hex snaps on gameover
|
2014-05-24 15:52:25 -04:00 |
|
garrettdreyfus
|
8fe0c0f09b
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
|
2014-05-24 15:51:32 -04:00 |
|
lengstrom
|
567f212f37
|
Merge branch 'master' of https://github.com/teamsnowman/wastedtime
|
2014-05-24 15:51:13 -04:00 |
|
garrettdreyfus
|
6ade58139f
|
Merge branch 'master' of http://github.com/teamsnowman/hextris
Conflicts:
js/main.js
|
2014-05-24 15:51:03 -04:00 |
|
garrettdreyfus
|
a5539ae7be
|
deleting is back
|
2014-05-24 15:50:01 -04:00 |
|
lengstrom
|
635993dccb
|
fixed block detection
|
2014-05-24 15:48:48 -04:00 |
|