Commit graph

302 commits

Author SHA1 Message Date
Chris Blanchard
5b81a242dc Fix warnings from forceUpdate callbacks 2015-09-17 21:57:56 +01:00
Chris Blanchard
cd936bda4d Minor style changes 2015-09-17 21:40:54 +01:00
Chris Blanchard
57d849f3f0 Tighten update method 2015-09-17 20:59:05 +01:00
Chris Blanchard
5f3885b765 Add regather voting 2015-09-17 14:56:50 +01:00
Chris Blanchard
6dc379f33f Implemented regather event 2015-09-17 14:56:44 +01:00
Chris Blanchard
ab806776bd Fix leaving gathers when data not defined 2015-09-17 13:56:34 +01:00
Chris Blanchard
1fd8835d20 Implemented admin kicks 2015-09-17 13:36:18 +01:00
Chris Blanchard
c5b2d10356 Swap marine and alien tables 2015-09-17 12:47:37 +01:00
Chris Blanchard
4a06a11233 Make muting clearer 2015-09-17 12:40:11 +01:00
Chris Blanchard
b0ab01b5f6 Sort gather by elo 2015-09-17 12:37:16 +01:00
Chris Blanchard
bbf277b260 Added lifeform icons 2015-09-17 12:33:28 +01:00
Chris Blanchard
f7bd92e32d Fix gap between buttons 2015-09-16 16:34:54 +01:00
Chris Blanchard
7aff6ad2be Remove invite button 2015-09-16 16:20:43 +01:00
Chris Blanchard
51964138c5 Implemented picking mechanism in UX 2015-09-16 16:16:00 +01:00
Chris Blanchard
eef26b30c0 Implemented logic for ordered captain selection of team 2015-09-16 15:47:15 +01:00
Chris Blanchard
2f07de1d1c Implemented picking turn method 2015-09-16 12:44:34 +01:00
Chris Blanchard
8621546cf9 Reformat gather 2015-09-15 21:36:08 +01:00
Chris Blanchard
f12b19a90f Use defaultValue 2015-09-15 17:11:52 +01:00
Chris Blanchard
c1b771d2ef Fix reporting on skill 2015-09-15 15:13:03 +01:00
Chris Blanchard
9583ca688b Deserialise session store using ruby child process 2015-09-15 14:25:00 +01:00
Chris Blanchard
edf4301557 Test ruby subprocess in heroku 2015-09-15 13:04:28 +01:00
Chris Blanchard
b6a7190b51 Smarten up previous gather 2015-09-15 00:10:06 +01:00
Chris Blanchard
3613df3475 Cleanup start gather button 2015-09-15 00:02:52 +01:00
Chris Blanchard
e0d2532f2d Fix server list 2015-09-14 23:59:34 +01:00
Chris Blanchard
065c62e6c9 Flatten gatherer list 2015-09-14 23:44:43 +01:00
Chris Blanchard
1454c3e8de Restyle 2015-09-14 23:34:50 +01:00
Chris Blanchard
98a89ee4b9 Restyle 2015-09-14 23:27:45 +01:00
Chris Blanchard
7bd06a5131 Restyled 2015-09-14 23:14:36 +01:00
Chris Blanchard
7005c58082 Added gather logging 2015-09-14 22:40:49 +01:00
Chris Blanchard
0d592c85b5 Log incoming and deleted messages 2015-09-14 22:27:04 +01:00
Chris Blanchard
50f86b66d4 Fix ordering 2015-09-14 22:26:57 +01:00
Chris Blanchard
41d2f4417e New message append method 2015-09-14 22:10:26 +01:00
Chris Blanchard
58417c9a90 Implemented delete for admins 2015-09-14 22:03:39 +01:00
Chris Blanchard
add58ff761 Fix sound disabling 2015-09-14 18:40:27 +01:00
Chris Blanchard
5d90538337 Co-opted users are loaded via User.find 2015-09-14 18:28:22 +01:00
Chris Blanchard
c04a2d71bf Polish server joining box 2015-09-14 18:27:50 +01:00
Chris Blanchard
9b80a26361 Added basic bot commands 2015-09-14 18:11:52 +01:00
Chris Blanchard
861fc57757 Added singleton for gather 2015-09-14 17:50:00 +01:00
Chris Blanchard
6525b44714 Show vote results at selection stage 2015-09-05 18:37:43 +01:00
Chris Blanchard
54f3ca0ed7 Restyle gathers 2015-09-05 18:22:23 +01:00
Chris Blanchard
e161ddddbd Fix missing logger 2015-09-05 17:26:39 +01:00
Chris Blanchard
08fab28f5c Add initial cut of bot 2015-09-04 22:24:33 +01:00
Chris Blanchard
45a3a992e1 Merge branch 'master' of github.com:cblanc/sws_gathers 2015-08-31 21:13:24 +01:00
Chris Blanchard
8e8eeef844 Pull steam id from ensl api 2015-08-31 16:50:56 +01:00
Chris Blanchard
87faeab649 Implemented hive integration fixes #7 2015-08-31 15:55:42 +01:00
Chris Blanchard
1e347d26e5 Load hive data on user retrieval 2015-08-31 15:46:35 +01:00
Chris Blanchard
ecd3702085 Added hive client 2015-08-31 15:30:33 +01:00
Chris Blanchard
87e0ad99b4 Add method to extract steam and hive id 2015-08-31 15:29:37 +01:00
Chris Blanchard
799b0af20a Fix gorge ability setting 2015-08-31 14:37:33 +01:00
Chris Blanchard
a78939ab5c Show server name instead of description 2015-08-30 15:55:56 +01:00
Chris Blanchard
17ff3b06cc Switch to skill level 2015-08-30 00:46:16 +01:00
Chris Blanchard
d699c0096b Fix random user 2015-08-28 21:37:55 +01:00
Chris Blanchard
d39d031c9c Added player profiles 2015-08-28 21:28:50 +01:00
Chris Blanchard
b672baa9b5 Change sound icon 2015-08-28 21:28:38 +01:00
Chris Blanchard
c6c9192dcf Draw abilities from profiles 2015-08-28 15:17:08 +01:00
Chris Blanchard
eadb8f3b12 Fix user population method 2015-08-28 15:17:02 +01:00
Chris Blanchard
87ea51027b Delegate user auth to users model 2015-08-28 15:00:14 +01:00
Chris Blanchard
90e6ff758a Debounce gather refreshes 2015-08-28 14:18:09 +01:00
Chris Blanchard
79a5997055 Fix progress bar 2015-08-27 19:08:34 +01:00
Chris Blanchard
397ba7aee8 Only play music for participating gatherers fixes #10 2015-08-27 18:03:44 +01:00
Chris Blanchard
59d4b0a731 Prevent music from refiring on join 2015-08-27 18:01:11 +01:00
Chris Blanchard
4d3a058fb0 Prevent links from redirecting 2015-08-27 17:59:08 +01:00
Chris Blanchard
f05dce946a Added gather music 2015-08-27 17:54:34 +01:00
Chris Blanchard
dc2ced3cde Add relevant message for voting 2015-08-27 16:11:54 +01:00
Chris Blanchard
16ffef6b6e Improve buttons for touchscreens 2015-08-27 15:53:11 +01:00
Chris Blanchard
f9848f3edd Limit message box height 2015-08-27 15:14:00 +01:00
Chris Blanchard
aeb0910829 Fix teamspeak links 2015-08-27 15:00:10 +01:00
Chris Blanchard
ead2f4073e No sane way to concat strings in hbs 2015-08-27 13:13:58 +01:00
Chris Blanchard
ca4dcf0361 Added gather ban message 2015-08-27 13:11:38 +01:00
Chris Blanchard
1e298638af Fix user model for bans 2015-08-27 13:06:54 +01:00
Chris Blanchard
9578b72ac8 Add teamspeak links 2015-08-27 12:57:35 +01:00
Chris Blanchard
c0d2ae6613 Refresh data on reconnect 2015-08-27 12:07:45 +01:00
Chris Blanchard
d2dcc8d50c Put automated gather population behind POPULATE_GATHER flag 2015-08-27 12:06:21 +01:00
Chris Blanchard
0131c9b9a7 Pull ENSL url from config 2015-08-27 11:41:42 +01:00
Chris Blanchard
a46113c55f Update deps, remove some logging 2015-08-27 00:41:07 +01:00
Chris Blanchard
d386a07d50 Change marshal lib 2015-08-27 00:35:23 +01:00
Chris Blanchard
8243719852 Log deserialised session 2015-08-27 00:23:31 +01:00
Chris Blanchard
3f93d88588 Stop pushing bots 2015-08-26 18:16:09 +01:00
Chris Blanchard
689aefc3ab Enable random users on staging 2015-08-18 12:40:48 +01:00
Chris Blanchard
bb2bdac8eb Tidy up 2015-08-18 12:09:33 +01:00
Chris Blanchard
f1d1a7b622 Move admin options 2015-08-18 12:02:27 +01:00
Chris Blanchard
b31ca31c2b Fix for invalid steam ids 2015-08-18 11:33:44 +01:00
Chris Blanchard
9151212c78 Bunch of changes 2015-08-18 10:56:35 +01:00
Chris Blanchard
882bacab1b Added rails session validation 2015-08-17 14:50:59 +01:00
Chris Blanchard
d8fb9bfa9b Author cache no longer needed 2015-08-11 17:05:01 +01:00
Chris Blanchard
54e67d14f7 Clean up 2015-08-11 13:02:31 +01:00
Chris Blanchard
affa015258 More cleanup 2015-08-11 12:59:19 +01:00
Chris Blanchard
d850a3e34c Clean up 2015-08-11 12:55:04 +01:00
Chris Blanchard
c7c7c4eb24 ES2015 strikes again 2015-08-11 01:37:43 +01:00
Chris Blanchard
6ecdba9232 ES2015 for users 2015-08-11 01:31:03 +01:00
Chris Blanchard
667a167e79 ES2015ify 2015-08-11 01:25:25 +01:00
Chris Blanchard
b95b6bd537 ES2015 gathers 2015-08-11 01:19:04 +01:00
Chris Blanchard
10f9d5b2b9 More arrows! 2015-08-11 00:56:53 +01:00
Chris Blanchard
1ae14e7912 Arrows! 2015-08-11 00:44:54 +01:00
Chris Blanchard
2e44439b5b Pull map list off ensl 2015-08-11 00:12:27 +01:00
Chris Blanchard
9baac3d301 Fix potential bug where removeUser event doesn't actually remove user 2015-08-10 23:41:04 +01:00
Chris Blanchard
1ec36bbb6f Retrieve live server data 2015-08-10 23:38:05 +01:00
Chris Blanchard
75ac2fe1ab Show previous completed gather and cycle to new one 2015-08-09 17:38:57 +01:00
Chris Blanchard
132f8019b1 Use latest node and fix tests 2015-08-09 16:29:15 +01:00
Chris Blanchard
ef456896de Run everything with --harmony 2015-08-09 15:56:23 +01:00
Chris Blanchard
6072e124df Added babel 2015-08-09 15:38:34 +01:00
Chris Blanchard
c15418723f Fix gather refreshing 2015-08-09 15:27:46 +01:00
Chris Blanchard
3d02b5d316 Add completed gather information 2015-08-08 20:14:16 +01:00
Chris Blanchard
b9123202c1 Added flags and other things 2015-08-08 18:13:17 +01:00
Chris Blanchard
bf7c19a928 Fix for missing team 2015-08-08 16:27:17 +01:00
Chris Blanchard
e9e85036d5 Added delete message method 2015-08-07 01:53:52 +01:00
Chris Blanchard
ab790e8c9e Added message persistence 2015-08-07 01:14:36 +01:00
Chris Blanchard
e49f4ffa77 Added team name 2015-08-05 01:06:09 +01:00
Chris Blanchard
708ace40d9 Disable user creation 2015-08-05 01:01:49 +01:00
Chris Blanchard
70d47eda99 Update styling 2015-08-05 00:57:54 +01:00
Chris Blanchard
eda6fb5d76 Typo & feature list 2015-07-31 17:34:27 +01:00
Chris Blanchard
028bae41c3 Fix gather time and smarten up dropdown 2015-07-31 17:20:52 +01:00
Chris Blanchard
d6d0e94b01 Added election countdown 2015-07-31 16:54:08 +01:00
Chris Blanchard
cbc486de77 Added timeout to leadership election 2015-07-31 16:06:21 +01:00
Chris Blanchard
6f5e927f70 Added timeout to leadership election 2015-07-31 16:03:09 +01:00
Chris Blanchard
3bdaaa9169 Stuff 2015-07-31 15:39:59 +01:00
Chris Blanchard
cd089587bd Added keys 2015-07-31 12:23:55 +01:00
Chris Blanchard
0bcd67f7a0 Simplify 2015-07-31 12:21:25 +01:00
Chris Blanchard
dfd2e885f8 Fix timer for updating createdAt 2015-07-31 12:21:07 +01:00
Chris Blanchard
3cb1e600ee Simplify 2015-07-31 11:51:38 +01:00
Chris Blanchard
cb49b15eab Simplify 2015-07-31 11:49:59 +01:00
Chris Blanchard
5b4abf5115 Simplify 2015-07-31 11:49:39 +01:00
Chris Blanchard
fc0d635aae Disable automated user creation 2015-07-29 16:01:58 +01:00
Chris Blanchard
be3eb07795 Stuff 2015-07-29 15:54:45 +01:00
Chris Blanchard
973015e927 Remove captain confirmation 2015-07-29 15:35:58 +01:00
Chris Blanchard
934b707434 Added server and map votes 2015-07-29 14:50:39 +01:00
Chris Blanchard
673402ed26 Install lodash 2015-07-29 11:56:01 +01:00
Chris Blanchard
ece9b72086 Add online/offline api 2015-07-29 11:46:30 +01:00
Chris Blanchard
755cb50dcd Finish player selection phase 2015-07-29 00:32:50 +01:00
Chris Blanchard
9515c8c6f7 A lot of changes..... 2015-07-28 16:54:29 +01:00
Chris Blanchard
cf2b9643fb Added basic voting implementation 2015-07-27 12:55:36 +01:00
Chris Blanchard
74a0468f09 More cool stuff 2015-07-27 01:09:02 +01:00
Chris Blanchard
e00306657e Added cool stuff 2015-07-26 12:54:35 +01:00
Chris Blanchard
cc3b1bca54 Add local assets 2015-07-25 13:00:56 +01:00
Chris Blanchard
5401e021ad Tidy up 2015-07-24 18:05:12 +01:00
Chris Blanchard
1645c296e5 List gather joins 2015-07-24 16:01:56 +01:00
Chris Blanchard
703944a709 Implemented most of gather model 2015-07-24 14:34:02 +01:00
Chris Blanchard
11b2ad7bd3 Added gather model methods 2015-07-23 14:36:51 +01:00
Chris Blanchard
92a2d0442b Added usre model and more skeleton 2015-07-23 00:30:14 +01:00
Chris Blanchard
425ce23ce7 Added gather skeleton 2015-07-22 23:34:57 +01:00
Chris Blanchard
2087638588 Refactored user methods into a controller 2015-07-22 17:38:58 +01:00
Chris Blanchard
9618fb80ca Added gather skeleton and auth error checking 2015-07-22 17:28:15 +01:00
Chris Blanchard
6883b0b938 Cleanup styling a bit 2015-07-22 16:57:15 +01:00
Chris Blanchard
01a4960827 Change terminology to users 2015-07-22 16:49:20 +01:00
Chris Blanchard
fb2ca2a4f3 Added signing into different users 2015-07-22 16:35:40 +01:00
Chris Blanchard
d2ee19a095 Added dynamic socket.io hostname 2015-07-22 15:13:08 +01:00
Chris Blanchard
b91e812fcd Change case 2015-07-22 14:53:50 +01:00
Chris Blanchard
e293e1b5ca Refactored and added ensl client 2015-07-22 01:00:05 +01:00
Chris Blanchard
3cb92e43f0 Started ensl client library 2015-07-21 23:44:47 +01:00
Chris Blanchard
4a21328691 Implemented basic chat 2015-07-21 15:10:24 +01:00
Chris Blanchard
7a5d0ec573 Added gatherers on sidebar 2015-07-21 01:24:14 +01:00
Chris Blanchard
9f4fd9be53 Added gatherer counter as a react component 2015-07-20 23:47:18 +01:00