Commit graph

13 commits

Author SHA1 Message Date
Ari Timonen
eb3f260f01 Fix gather music to old one 2015-04-06 01:09:36 +03:00
jamal
d6e0a5d1d1 Revert "Fix some logic errors with captains"
Revert "Change Gather style to volunteer captains"

This reverts commits fb7d361, d8134ca, and ebd60d1.
2014-12-08 09:35:40 -05:00
Luke Barratt
2ef1b536cd Merge remote-tracking branch 'jamal/self-captains' into develop
Conflicts:
	app/views/gathers/_status.html.erb
2014-10-11 23:13:57 +01:00
jamal
4c7041e4b3 Change Gather style to volunteer captains
This will change the gather format to allow for players to volunteer to be captain / commander. The gather will not change from the running state until 2 commanders have volunteered. Once commanders have volunteered the gather will switch to the picking state. The voting state is no longer used.

Also, added a new sound alert that will be played when the gather is full but doesn't have 2 captains. This alert will loop every 10 seconds unless you're the commander. And changed the music to play once the gather switches to the picking state and only if the player doesn't have the gather page on focus.
2014-10-11 15:50:06 -04:00
jamal
bffbbcb572 Disable leave confirm when voting for map or server 2014-10-11 10:04:16 -04:00
jamal
4da97ce553 Fix double confirm when you click the 'Leave Gather' button 2014-10-11 09:13:07 -04:00
jamal
d6b501ac46 Add state to gatherers and track when a gatherer has left or is away 2014-10-10 20:50:17 -04:00
Luke Barratt
987a28d7d0 Remove TS3 Password 2014-08-28 23:04:18 +01:00
Luke Barratt
8bef59868e Fixes gather music not playing during voting phase
Fixes issues with topic ordering
Tweaked read/unread icon colours for forums
2014-05-16 23:54:41 +01:00
Luke Barratt
f2d908a06f Switched web server to puma
Added styling to gathers page
Added styling to account page
Improved forms styling
2014-04-15 10:59:52 +01:00
Luke Barratt
f438984e34 Updates to gather pages: Styling & Copy 2014-04-05 01:03:13 +01:00
Luke Barratt
ae6d146852 Added 2 hour start date overlap for calendar events
Added new NSL logo
Change default gather passwords
Explicitly add sprockets to the Gemfile
2014-04-04 23:56:22 +01:00
Luke Barratt
6bcc8dc76b Purged git history and removed sensitive information. 2014-03-23 00:22:25 +00:00