7 commits

Author	SHA1	Message	Date
Nick Winter	6b6c8dd683	Merged master into feature/realtime-multiplayer; looks good.	2014-09-03 16:14:33 -07:00
Nick Winter	1329d31a63	Hot-swapping inventory works now.	2014-08-31 16:05:20 -07:00
Nick Winter	ef9a983e30	Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs.	2014-08-31 12:21:25 -07:00
Nick Winter	0f983bdcf1	Crude steps towards using your hero equipment in items levels.	2014-08-14 15:12:15 -07: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	dc59aff9d0	Starting skeleton for GameMenuModal and its subviews.	2014-08-08 11:36:41 -07:00