Garrett Finucane
|
9db7b8bf55
|
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
|
a710c4299e
|
limited infinite speed rotations
|
2014-07-04 13:23:00 -04:00 |
|
meadowstream
|
02cc263dff
|
made combo / score text larger
|
2014-07-04 13:08:44 -04:00 |
|
Garrett Finucane
|
3aac7eb439
|
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
|
be3706a346
|
clock to hex
|
2014-07-04 12:47:37 -04:00 |
|
meadowstream
|
ec592072d3
|
removed merge files
|
2014-07-04 12:46:42 -04:00 |
|
meadowstream
|
f3e39a6ddd
|
fixed merge conflicts
|
2014-07-04 12:45:51 -04:00 |
|
Garrett Finucane
|
f27cb24988
|
Clock to Hex
|
2014-07-04 12:42:44 -04:00 |
|
meadowstream
|
2831ad3ddc
|
replaced comboMultiplier -> comboTime
|
2014-07-04 12:42:22 -04:00 |
|
Garrett Finucane
|
d80156e3e0
|
Fixed the small text
|
2014-07-04 09:46:14 -04:00 |
|
meadowstream
|
03692b426e
|
added custom fonts to Text() object
|
2014-07-03 19:07:51 -04:00 |
|
meadowstream
|
70f1226c48
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
|
2014-07-03 18:25:30 -04:00 |
|
meadowstream
|
0f27875b33
|
fixed block initialization animation playing during pause
|
2014-07-03 18:25:15 -04:00 |
|
Garrett Finucane
|
3be0152d14
|
fixed tiny text issue
|
2014-07-03 17:51:13 -04:00 |
|
meadowstream
|
1ebf854153
|
Replaced raw unicode with String.fromCharCode()
|
2014-07-03 16:39:29 -04:00 |
|
meadowstream
|
c1e5617f9a
|
changed delay length
|
2014-07-03 16:31:45 -04:00 |
|
meadowstream
|
4b4471d7f7
|
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 |
|
meadowstream
|
01de2bd6c5
|
added drawKey(key, x, y) to draw any key at any given (x,y)
|
2014-07-03 01:24:35 -04:00 |
|
meadowstream
|
216da7ba81
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
|
2014-07-02 23:51:43 -04:00 |
|
meadowstream
|
b100a0c722
|
removed entities.js from index.html
|
2014-07-02 23:51:34 -04:00 |
|
Garrett Finucane
|
3764ececd8
|
Fixed flickering after pause
|
2014-07-02 11:10:36 -04:00 |
|
Garrett Finucane
|
4090f36b83
|
Title screen fades in and out
|
2014-07-02 10:58:02 -04:00 |
|
meadowstream
|
0eebf24cd7
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
|
2014-07-01 22:30:13 -04:00 |
|
meadowstream
|
94e70f9e31
|
standardized block fall speed on hexagon
|
2014-07-01 22:30:01 -04:00 |
|
Garrett Finucane
|
01e84ce186
|
unhid all the buttons
|
2014-07-01 11:18:13 -04:00 |
|
Garrett Finucane
|
429de31d14
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
|
2014-07-01 11:03:06 -04:00 |
|
Garrett Finucane
|
d8420a753e
|
no more -2 gameState
|
2014-07-01 11:02:52 -04:00 |
|
meadowstream
|
7fec2e36a1
|
Merge branch 'gh-pages' of https://github.com/teamsnowman/hextris into gh-pages
|
2014-06-30 22:45:14 -04:00 |
|
meadowstream
|
63d5aaa2be
|
fixed issue in which waves would restart after resuming the game
|
2014-06-30 22:45:00 -04:00 |
|
Garrett Finucane
|
1372087e59
|
fixed clicking in hextris
|
2014-06-30 21:56:14 -04:00 |
|
Garrett Finucane
|
13c1243adb
|
new comboTimer
|
2014-06-30 21:31:54 -04:00 |
|
Garrett Finucane
|
62c3611334
|
restart icon shown on resume
|
2014-06-30 13:34:55 -04:00 |
|
Garrett Finucane
|
69da2a2d03
|
added restart button
|
2014-06-30 12:29:26 -04:00 |
|
Garrett Finucane
|
0e6b54ef82
|
Merge branch 'gh-pages' of http://github.com/teamsnowman/hextris into gh-pages
|
2014-06-30 12:13:50 -04:00 |
|
Garrett Finucane
|
6edb912365
|
new combotimer
|
2014-06-30 12:13:21 -04:00 |
|
meadowstream
|
93b8e4276a
|
Removed spacebar speedup
|
2014-06-29 14:35:10 -04:00 |
|
meadowstream
|
c92124375c
|
fixed bug in which pause btn didn't show up after resuming a game
|
2014-06-29 14:25:40 -04:00 |
|
meadowstream
|
feea8c4b85
|
removed useless opacity settings
|
2014-06-28 15:33:31 -04:00 |
|
meadowstream
|
32eef0bc72
|
fixed demo level faultily calling the game over after start
|
2014-06-28 14:42:55 -04:00 |
|
meadowstream
|
b07a0a140c
|
reverted changes around transition from start screen -> gameplay
|
2014-06-28 14:34:30 -04:00 |
|
meadowstream
|
b3aac51fd3
|
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 |
|
meadowstream
|
f90ba95cd5
|
fixed white gaps, added saveState to .unload handler
|
2014-06-28 12:01:41 -04:00 |
|
meadowstream
|
efba90831d
|
fixed white gaps caused by constant, needless scaling during export
|
2014-06-28 11:57:22 -04:00 |
|
meadowstream
|
1b59126ed7
|
fixed start btn not starting saved games, removed useless debugging lines
|
2014-06-28 11:48:45 -04:00 |
|
meadowstream
|
b1676d912e
|
fixed clicking on btn, started adding start->play transition anims
|
2014-06-28 11:24:47 -04:00 |
|
meadowstream
|
5e60841fb6
|
converted animLoop to a switch case
|
2014-06-27 22:15:16 -04:00 |
|
meadowstream
|
54a4759b9c
|
combo lines now match the faded blocks during menu screen play
|
2014-06-27 22:09:36 -04:00 |
|
meadowstream
|
6f731d8598
|
converted completely to hex, added legacy support
|
2014-06-27 21:39:32 -04:00 |
|
meadowstream
|
60a3947264
|
fixed issues surrounding checking and faulty hex -> rgb translations
|
2014-06-27 21:31:59 -04:00 |
|
meadowstream
|
0e29354d02
|
fixed initial setup not rendering correctly in menu
|
2014-06-27 21:19:57 -04:00 |
|