Commits · merge_alpha · 406tablet / Feudal Doodles · GitLab

05 Mar, 2017 5 commits
- Merge branch 'merge_alpha' into merge_alpha_dan · 53ac6205
  Danny Huang authored Mar 05, 2017
  
  53ac6205
- Merge branch 'merge_alpha' of git.cs.usask.ca:406tablet/FeudalDoodles into merge_alpha · 83d0690e
  Danny Huang authored Mar 05, 2017
  
  83d0690e
- Merge branch 'merge_alpha' of git.cs.usask.ca:406tablet/FeudalDoodles into merge_alpha_dan · d9dd65cd
  Danny Huang authored Mar 05, 2017
  
  d9dd65cd
- merge fix · 3cb3a24e
  Danny Huang authored Mar 05, 2017
  
  3cb3a24e
- added thorough disconnect. Documented on how to disable nvidia shield... · 0953ea3c
  Danny Huang authored Mar 05, 2017
```
added thorough disconnect. Documented on how to disable nvidia shield controller wifi direct auto hotspot
```
  0953ea3c
02 Mar, 2017 12 commits
- $DESKTOP-IIOJDAI\wyatt's avatar$
  created seperate packet types for gamestates and runner states, made runner... · 1bc04501
  DESKTOP-IIOJDAI\wyatt authored Mar 02, 2017
```
created seperate packet types for gamestates and runner states, made runner states send animation and local scale, cleaned up gameengine class some, removed block limit
```
  1bc04501
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  bug fixes · a579da41
  DESKTOP-IIOJDAI\wyatt authored Mar 02, 2017
  
  a579da41
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  was updating both to same positon, fixed · c7cefa76
  DESKTOP-IIOJDAI\wyatt authored Mar 02, 2017
  
  c7cefa76
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  fixedp layer layer, updated phonebook server ip · 0038891c
  DESKTOP-IIOJDAI\wyatt authored Mar 02, 2017
  
  0038891c
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  oops · 839458ef
  DESKTOP-IIOJDAI\wyatt authored Mar 02, 2017
  
  839458ef
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  now sends runner velocity, and roation, and angularvar, as well as x and y. · 67793ee6
  DESKTOP-IIOJDAI\wyatt authored Mar 02, 2017
  
  67793ee6
- Audio playback. · 0f21e760
  Chris Chamberlain authored Mar 02, 2017
  
  0f21e760
- Merge branch 'feature_audio' into merge_alpha · 659b8689
  Chris Chamberlain authored Mar 02, 2017
  
  659b8689
- Copied · 642e5844
  Chris Chamberlain authored Mar 02, 2017
  
  642e5844
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  walljump fix, changed to update velocity of runners, not x and y · abc34342
  DESKTOP-IIOJDAI\wyatt authored Mar 02, 2017
  
  abc34342
- EnumDictionary tries to adjust to changes in the enum. · a9f7c710
  Chris Chamberlain authored Mar 02, 2017
  
  a9f7c710
- Audio manager, with fancy EnumDictionary ( because... its cool ). · 83f6f627
  Chris Chamberlain authored Mar 02, 2017
  
  83f6f627
01 Mar, 2017 6 commits
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  . · 754f3c51
  DESKTOP-IIOJDAI\wyatt authored Mar 01, 2017
  
  754f3c51
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  added multiple block types · 4dd654cd
  DESKTOP-IIOJDAI\wyatt authored Mar 01, 2017
  
  4dd654cd
- fixed some issues. · 585a276f
  Kent Weiler authored Mar 01, 2017
  
  585a276f
- Merge branch 'merge_alpha' of https://git.cs.usask.ca/406tablet/FeudalDoodles into merge_alpha · 5a71fd27
  Kent Weiler authored Mar 01, 2017
  
  5a71fd27
- fixed some block stuff and the builder. · cfc40dba
  Kent Weiler authored Mar 01, 2017
  
  cfc40dba
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  added laims new runner with some animations · d658a28a
  DESKTOP-IIOJDAI\wyatt authored Mar 01, 2017
  
  d658a28a
28 Feb, 2017 17 commits
- return server wifid ip if group formed · cc86d3a2
  Danny Huang authored Feb 28, 2017
  
  cc86d3a2
- dan fix · 71dcda2c
  Danny Huang authored Feb 28, 2017
  
  71dcda2c
- Fixed flag stuff · edaaaa79
  Kent Weiler authored Feb 28, 2017
  
  edaaaa79
- Merge branch 'merge_alpha' of https://git.cs.usask.ca/406tablet/FeudalDoodles into merge_alpha · b98238a7
  Kent Weiler authored Feb 28, 2017
  
  b98238a7
- GAme engine fix · 1761fdd7
  Kent Weiler authored Feb 28, 2017
  
  1761fdd7
- Merge branch 'merge_alpha' of git.cs.usask.ca:406tablet/FeudalDoodles into merge_alpha · 929c2bd5
  Peter Yeung authored Feb 28, 2017
  
  929c2bd5
- extended wifi direct host time · c9ddf105
  Peter Yeung authored Feb 28, 2017
  
  c9ddf105
- Merge branch 'merge_alpha' of https://git.cs.usask.ca/406tablet/FeudalDoodles into merge_alpha · e98e0dae
  Kent Weiler authored Feb 28, 2017
  
  e98e0dae
- Added explosion of blocks, scrolling builder camera. · 1ae9f46e
  Kent Weiler authored Feb 28, 2017
  
  1ae9f46e
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  remove unnessesary host switch statement · 462595a9
  DESKTOP-IIOJDAI\wyatt authored Feb 28, 2017
  
  462595a9
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  bumped up block limit to 200 form 20 · 70018bf9
  DESKTOP-IIOJDAI\wyatt authored Feb 28, 2017
  
  70018bf9
- fix · 541963ac
  Peter Yeung authored Feb 28, 2017
  
  541963ac
- fix · ccfbccad
  Peter Yeung authored Feb 28, 2017
  
  ccfbccad
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  switched to json from xml seralizing · 812294b3
  DESKTOP-IIOJDAI\wyatt authored Feb 28, 2017
  
  812294b3
- fix · 216beaf6
  Peter Yeung authored Feb 28, 2017
  
  216beaf6
- Merge branch 'merge_alpha' of git.cs.usask.ca:406tablet/FeudalDoodles into merge_alpha · e39c8408
  Peter Yeung authored Feb 28, 2017
  
  e39c8408
- $DESKTOP-IIOJDAI\wyatt's avatar$
  
  added seralizable to structsi ngamestate · ac75a985
  DESKTOP-IIOJDAI\wyatt authored Feb 28, 2017
  
  ac75a985