15 commits

Author	SHA1	Message	Date
Imperadeiro98	caa372628b	Fixed errors	2014-08-30 13:48:19 +01:00
Scott Erickson	4520c0f2b6	Merge branch 'master' into feature/defaults	2014-08-23 11:08:54 -07:00
Scott Erickson	1c5db3f2b7	First round of getting the site to use the new defaults system, in particular the job profile view.	2014-08-23 11:07:52 -07:00
Imperadeiro98	c0c3879bb1	Fixed typo	2014-08-22 13:15:47 +01:00
Scott Erickson	827f6ee8b8	Added a swap button, as well as moving my testing to the demo view and adding some specifications, fixing bugs and tweaking interactions along the way.	2014-08-14 14:04:03 -07:00
Scott Erickson	c31a509472	Working on the inventory view. Added a way to get the current equipment config from the inventory view.	2014-08-14 10:44:04 -07:00
Nick Winter	4f3af4d64f	Fixed #1433.	2014-08-13 14:57:07 -07:00
Nick Winter	6d04b583f9	Added volume slider to game options.	2014-08-12 10:10:54 -07:00
Nick Winter	9fd31c70e7	Hid parts of game menu that aren't ready yet.	2014-08-12 09:13:23 -07:00
Nick Winter	0074a04cfe	Moved Restart into Game Menu.	2014-08-10 17:41:18 -07:00
Nick Winter	45c762fddc	Moved multiplayer from modal into Game Menu. Deleted MultiplayerLaunchModal. Updated some i18n.	2014-08-10 17:26:30 -07:00
Nick Winter	fb95f48f73	Implemented GameMenu OptionsView.	2014-08-10 16:27:33 -07:00
Nick Winter	4dcc5bd8ee	Adding some options to the game menu options tab.	2014-08-10 15:56:45 -07:00
Nick Winter	6b2c079ff5	More work on game menu skeleton.	2014-08-08 15:57:20 -07:00
Nick Winter	dc59aff9d0	Starting skeleton for GameMenuModal and its subviews.	2014-08-08 11:36:41 -07:00