Commits · master · Stuart John Watson / TSSSF-Game

07 Apr, 2016 2 commits
- Merge branch 'python3websockets' into 'master' · b853b1f0
  Stuart John Watson authored Apr 07, 2016
```
migrated project to websockets and python3, added logging and a few other bobs



See merge request !1
```
  b853b1f0
- migrated project to websockets and python3, added logging and a few other bobs · a9ea6578
  chao-master authored Apr 07, 2016
  
  a9ea6578
04 Feb, 2016 1 commit
- fixed options not being sent on joining a room · 34879043
  Stuart John Watson authored Feb 04, 2016
  
  34879043
03 Feb, 2016 1 commit
- Added options parsing on client · a2d91481
  Stuart John Watson authored Feb 03, 2016
  
  a2d91481
12 Jan, 2016 4 commits
- Added client side disabling of owner controlls for non owners · 7e6e6341
  Stuart John Watson authored Jan 12, 2016
  
  7e6e6341
- Allow client to send option message · 7ce5107d
  Stuart John Watson authored Jan 12, 2016
  
  7ce5107d
- Changed code to use the smartJson · 9d175cf9
  Stuart John Watson authored Jan 12, 2016
```
(which isn't as smart as original planned but still works)
```
  9d175cf9
- added smart json · 4a780795
  Stuart John Watson authored Jan 12, 2016
  
  4a780795
11 Jan, 2016 1 commit
- Add option controll method to server · 8a970779
  Stuart John Watson authored Jan 11, 2016
  
  8a970779
05 Jan, 2016 1 commit
- Added better join/leave/disconnect and more to demo · bbdf45e7
  Stuart John Watson authored Jan 05, 2016
  
  bbdf45e7
04 Jan, 2016 4 commits
- Added room paramater to join/leave · b4e8448b
  Stuart John Watson authored Jan 04, 2016
  
  b4e8448b
- Docstrings & tidyup · 02de2748
  Stuart John Watson authored Jan 04, 2016
  
  02de2748
- Made some progress debugging errors - it helps I can see them now · 5e801bd9
  Stuart John Watson authored Jan 04, 2016
  
  5e801bd9
- Oh I can actually debug this shit now · fbf9bd23
  Stuart John Watson authored Jan 04, 2016
  
  fbf9bd23
12 Nov, 2015 1 commit
- PUSH · 3b742d60
  Stuart John Watson authored Nov 12, 2015
  
  3b742d60
05 Nov, 2015 5 commits
- Created a client folder and move client parts into it · 3d2d98f5
  Stuart John Watson authored Nov 05, 2015
  
  3d2d98f5
- Grid now centers when resizing window · eb2e198e
  Stuart John Watson authored Nov 05, 2015
  
  eb2e198e
- Fixed an error where a single card in a hand had it's x set to NaN which in... · 09d831ae
  Stuart John Watson authored Nov 05, 2015
```
Fixed an error where a single card in a hand had it's x set to NaN which in turn was causing bound detection errors
```
  09d831ae
- Redid the cardDragEnd event for hand to be smoother · bab5e46d
  Stuart John Watson authored Nov 05, 2015
  
  bab5e46d
- Added Replace functionality · 0c102667
  Stuart John Watson authored Nov 05, 2015
  
  0c102667
04 Nov, 2015 5 commits
- changed colours layout in constants · 94a5f8a1
  Stuart John Watson authored Nov 04, 2015
  
  94a5f8a1
- Made startcard inherit from ponyCard · 3e5edec7
  Stuart John Watson authored Nov 04, 2015
  
  3e5edec7
- Added Readme · 3c37b68d
  Stuart John Watson authored Nov 04, 2015
  
  3c37b68d
- Exteralized icon colours & updated them to match game cards · b74a02f6
  Stuart John Watson authored Nov 04, 2015
  
  b74a02f6
- Demo canvas now resizes with window · c221a034
  Stuart John Watson authored Nov 04, 2015
  
  c221a034
03 Nov, 2015 7 commits
- Fixed center detection · 30b74c86
  Stuart John Watson authored Nov 03, 2015
  
  30b74c86
- Added check to stop playing ship cards on ship cards · 6e99fb59
  Stuart John Watson authored Nov 03, 2015
  
  6e99fb59
- REmoved logging · fd037f54
  Stuart John Watson authored Nov 03, 2015
  
  fd037f54
- Added basic cursor feedback for playing pony cards · e427b63a
  Stuart John Watson authored Nov 03, 2015
  
  e427b63a
- Fixed ship cards not being played correctlly · a7974afa
  Stuart John Watson authored Nov 03, 2015
  
  a7974afa
- Updated playing cards to use new hotspots · 5da02fb5
  Stuart John Watson authored Nov 03, 2015
  
  5da02fb5
- Added better play hot spot detection · 6fecc05d
  Stuart John Watson authored Nov 03, 2015
  
  6fecc05d
30 Oct, 2015 8 commits
- Added card deck and demo drawing · 520697cc
  Stuart John Watson authored Oct 30, 2015
  
  520697cc
- Made colours into constants, changed slightly to darker scheme · 5fe4d86d
  Stuart John Watson authored Oct 30, 2015
  
  5fe4d86d
- Added ability to play ship card between pony cards · 40684b1b
  Stuart John Watson authored Oct 30, 2015
  
  40684b1b
- Added MediumCard - a superclass for medium sized cards · c627ae07
  Stuart John Watson authored Oct 30, 2015
  
  c627ae07
- commiting before lecture · 777c5157
  Stuart John Watson authored Oct 30, 2015
```
Need to work out inheritencs shit
```
  777c5157
- Started replacing magic numbers · 8bb22e76
  Stuart John Watson authored Oct 30, 2015
  
  8bb22e76
- Added ability to drag the grid around · 7e27b12d
  Stuart John Watson authored Oct 30, 2015
  
  7e27b12d
- Added more cards,fixed bug · 1bc01345
  Stuart John Watson authored Oct 30, 2015
  
  1bc01345