Merge branch 'master' of github.com:LukeShu/leaguer

Conflicts:
	app/controllers/tournaments_controller.rb
	app/models/tournament.rb
	app/views/tournaments/_selected.html.erb
	app/views/tournaments/new.html.erb
	db/migrate/20140306024707_create_servers.rb
	db/migrate/20140306024711_create_matches.rb
	db/migrate/20140306024713_create_teams.rb
	db/migrate/20140306024715_create_alerts.rb
	db/migrate/20140306024718_create_pms.rb
	db/migrate/20140306024722_create_users.rb
	db/migrate/20140306024724_create_sessions.rb
	db/migrate/20140306024729_create_server_settings.rb
	db/migrate/20140306024731_create_user_team_pairs.rb
	db/migrate/20140306024733_create_team_match_pairs.rb
	db/migrate/20140306024735_create_tournament_options.rb
	db/migrate/20140306024744_add_hidden_attrs_to_user.rb
	db/migrate/20140306202154_create_servers.rb
	db/migrate/20140306202156_create_tournaments.rb
	db/migrate/20140306202158_create_matches.rb
	db/migrate/20140306202200_create_teams.rb
	db/migrate/20140306202202_create_alerts.rb
	db/migrate/20140306202204_create_pms.rb
	db/migrate/20140306202207_create_games.rb
	db/migrate/20140306202209_create_users.rb
	db/migrate/20140306202211_create_sessions.rb
	db/migrate/20140306202213_create_game_attributes.rb
	db/migrate/20140306202215_create_server_settings.rb
	db/migrate/20140306202217_create_tournament_options.rb
	db/migrate/20140306202219_create_user_team_pairs.rb
	db/migrate/20140306202224_create_team_match_pairs.rb
	db/migrate/20140306202232_add_hidden_attrs_to_user.rb
	db/migrate/20140306222309_create_servers.rb
	db/migrate/20140306222320_create_matches.rb
	db/migrate/20140306222325_create_teams.rb
	db/migrate/20140306222330_create_alerts.rb
	db/migrate/20140306222336_create_pms.rb
	db/migrate/20140306222347_create_users.rb
	db/migrate/20140306222352_create_sessions.rb
	db/migrate/20140306222357_create_server_settings.rb
	db/migrate/20140306222402_create_tournament_options.rb
	db/migrate/20140306222422_create_user_team_pairs.rb
	db/migrate/20140306222427_create_team_match_pairs.rb
	db/migrate/20140306222447_add_hidden_attrs_to_user.rb
	db/schema.rb
	generate.sh

1 files changed, 37 insertions, 10 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 3a0ce17..cae1815 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140306202232) do
+ActiveRecord::Schema.define(version: 20140307004100) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -22,22 +22,22 @@ ActiveRecord::Schema.define(version: 20140306202232) do
 
   add_index "alerts", ["author_id"], name: "index_alerts_on_author_id"
 
-  create_table "game_attributes", force: true do |t|
-    t.integer  "game_id"
-    t.text     "key"
-    t.integer  "type"
+  create_table "game_options", force: true do |t|
+    t.integer  "vartype"
+    t.string   "name"
+    t.text     "default"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "game_attributes", ["game_id"], name: "index_game_attributes_on_game_id"
-
   create_table "games", force: true do |t|
     t.text     "name"
-    t.integer  "players_per_team"
-    t.integer  "teams_per_match"
+    t.integer  "min_players_per_team"
+    t.integer  "max_players_per_team"
+    t.integer  "min_teams_per_match"
+    t.integer  "max_teams_per_match"
     t.integer  "set_rounds"
-    t.integer  "randomized_teams"
+    t.boolean  "randomized_teams"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -62,6 +62,17 @@ ActiveRecord::Schema.define(version: 20140306202232) do
   add_index "pms", ["author_id"], name: "index_pms_on_author_id"
   add_index "pms", ["recipient_id"], name: "index_pms_on_recipient_id"
 
+  create_table "scores", force: true do |t|
+    t.integer  "user_id"
+    t.integer  "match_id"
+    t.integer  "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "scores", ["match_id"], name: "index_scores_on_match_id"
+  add_index "scores", ["user_id"], name: "index_scores_on_user_id"
+
   create_table "server_settings", force: true do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -91,17 +102,33 @@ ActiveRecord::Schema.define(version: 20140306202232) do
   add_index "team_match_pairs", ["team_id"], name: "index_team_match_pairs_on_team_id"
 
   create_table "teams", force: true do |t|
+    t.integer  "match_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "teams", ["match_id"], name: "index_teams_on_match_id"
+
   create_table "tournament_options", force: true do |t|
+    t.integer  "tournament_id"
+    t.integer  "vartype"
+    t.string   "name"
+    t.text     "value"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "tournament_options", ["tournament_id"], name: "index_tournament_options_on_tournament_id"
+
   create_table "tournaments", force: true do |t|
     t.integer  "game_id"
+    t.integer  "status"
+    t.integer  "min_players_per_team"
+    t.integer  "max_players_per_team"
+    t.integer  "min_teams_per_match"
+    t.integer  "max_teams_per_match"
+    t.integer  "set_rounds"
+    t.boolean  "randomized_teams"
     t.datetime "created_at"
     t.datetime "updated_at"
   end