Commits · mainline-qr-temp-merge · Febi Chajadi (fec935) / sharedSpaces

23 Jun, 2022 1 commit
- Update model.cs · e0dae973
  Febi Chajadi (fec935) authored Jun 23, 2022
  
  e0dae973
09 May, 2022 2 commits
- Merge branch 'QRCode' into mainline-qr-temp-merge · 849a16a0
  Febi Chajadi (fec935) authored May 09, 2022
  
  849a16a0
- turned off debugger · 30d1c4d5
  Brandon Piller authored May 09, 2022
  
  30d1c4d5
05 May, 2022 4 commits
- Merge branch 'QRCode' into mainline-qr-temp-merge · 2842aa78
  Febi Chajadi (fec935) authored May 05, 2022
  
  2842aa78
- this should add all things? · 9d482458
  Brandon Piller authored May 05, 2022
  
  9d482458
- this should add all things? · a4411304
  Brandon Piller authored May 05, 2022
  
  a4411304
- Merge branch 'QRCode' into mainline-qr-temp-merge · 5104fd72
  Febi Chajadi (fec935) authored May 05, 2022
  
  5104fd72
04 May, 2022 1 commit
- Reduced jitter and drift, spawned objects cannot move with trigger · 232c63f9
  Brandon Piller authored May 04, 2022
  
  232c63f9
28 Apr, 2022 1 commit
- Removed extraneous StreamingAssets files + switched to testing db. · 52f828dc
  Febi Chajadi (fec935) authored Apr 28, 2022
  
  52f828dc
27 Apr, 2022 2 commits
- Merge branch 'QRCode' into mainline-qr-temp-merge · d3caa389
  Febi Chajadi (fec935) authored Apr 27, 2022
  
  d3caa389
- iOS meta datas generated from various assets. · c712a913
  Febi Chajadi (fec935) authored Apr 27, 2022
  
  c712a913
26 Apr, 2022 1 commit
- adjustments to object jitter in qrcode · fe0c9b23
  Brandon Piller authored Apr 26, 2022
  
  fe0c9b23
25 Apr, 2022 1 commit
- Added AR Remote plugin. · 8f46a23c
  Febi Chajadi (fec935) authored Apr 25, 2022
  
  8f46a23c
19 Apr, 2022 2 commits
- Merge branch 'mainline-qr-temp-merge' of https://git.cs.usask.ca/fec935/sharedspaces into QRCode · 9ea9877f
  Brandon Piller (brp570) authored Apr 19, 2022
  
  9ea9877f
- Changed UI layout and hideshow script · 6ad524f3
  Brandon Piller authored Apr 19, 2022
  
  6ad524f3
18 Apr, 2022 2 commits
- Merge branch 'QRCode' into mainline-qr-temp-merge · 4e210213
  Febi Chajadi (fec935) authored Apr 18, 2022
  
  4e210213
- Generated iOS assetbundles for Cena. · b119edf0
  Febi Chajadi (fec935) authored Apr 18, 2022
  
  b119edf0
13 Apr, 2022 1 commit
- push incase I break something · d33c47d1
  Brandon Piller authored Apr 13, 2022
  
  d33c47d1
12 Apr, 2022 1 commit
- Fixed search and toggling for search page. · 6d1ddd0d
  Febi Chajadi (fec935) authored Apr 12, 2022
  
  6d1ddd0d
11 Apr, 2022 1 commit
- fully funtional tutorial · 90441fb0
  Brandon Piller authored Apr 11, 2022
  
  90441fb0
30 Mar, 2022 1 commit
- modifications to experiences to make roman stuff work · 702d8700
  Brandon Piller authored Mar 30, 2022
  
  702d8700
25 Mar, 2022 1 commit
- more stable android, potentially · 2d33c52d
  Brandon Piller authored Mar 25, 2022
  
  2d33c52d
23 Mar, 2022 1 commit
- added andrei files · eb6e91ba
  Brandon Piller (brp570) authored Mar 23, 2022
  
  eb6e91ba
21 Mar, 2022 3 commits
- Working zip in qrcode · 40cfaedb
  Brandon Piller (brp570) authored Mar 21, 2022
  
  40cfaedb
- Merge branch 'mainline-qr-temp-merge' of https://git.cs.usask.ca/fec935/sharedspaces into QRCode · 70253a35
  Brandon Piller (brp570) authored Mar 21, 2022
```
# Conflicts:
#	Assets/Scripts/model.cs
```
  70253a35
- commit to merge · 9f6f7c03
  Brandon Piller (brp570) authored Mar 21, 2022
  
  9f6f7c03
18 Mar, 2022 2 commits
- New Roman room. · 4f9b6cfa
  Febi Chajadi (fec935) authored Mar 18, 2022
  
  4f9b6cfa
- Generated Android asset bundles for Roman table and room. · 2f9d31c7
  Febi Chajadi (fec935) authored Mar 18, 2022
  
  2f9d31c7
17 Mar, 2022 1 commit
- Generated broad beaker and strap handle jug Android asset bundles. · e44d23ba
  Febi Chajadi (fec935) authored Mar 17, 2022
  
  e44d23ba
14 Mar, 2022 1 commit
- Merge branch 'QRCode' into mainline-qr-temp-merge · 64ff960c
  Febi Chajadi (fec935) authored Mar 14, 2022
  
  64ff960c
11 Mar, 2022 1 commit
- Generated iOS assetbundle fix for dissension. · c1e294e7
  Febi Chajadi (fec935) authored Mar 11, 2022
  
  c1e294e7
10 Mar, 2022 2 commits
- Basic tutorial system in experiences functions · 15e8f340
  Brandon Piller (brp570) authored Mar 10, 2022
  
  15e8f340
- Added tutorial and feedback manager scripts, fix for QR code so object will... · 0686cd74
  Brandon Piller (brp570) authored Mar 10, 2022
```
Added tutorial and feedback manager scripts, fix for QR code so object will spawn at origin initially before taking server positions
```
  0686cd74
09 Mar, 2022 2 commits
- Generated iOS assetbundles for lamp, jug, and speech bubble. · 55dd68e6
  Febi Chajadi (fec935) authored Mar 09, 2022
  
  55dd68e6
- Generated Android assetbundles for jug, lamp, and speech bubble. · 16e98459
  Febi Chajadi (fec935) authored Mar 09, 2022
  
  16e98459
08 Mar, 2022 4 commits
- Merge branch 'QRCode' into mainline-qr-temp-merge · 9ed09117
  Febi Chajadi (fec935) authored Mar 08, 2022
  
  9ed09117
- whoop last push broke some stuff, it has been fixed · 4a23f31e
  Brandon Piller (brp570) authored Mar 08, 2022
  
  4a23f31e
- Merge branch 'QRCode' into mainline-qr-temp-merge · 25e426cb
  Febi Chajadi (fec935) authored Mar 08, 2022
  
  25e426cb
- working qrcode · 5abdab86
  Brandon Piller (brp570) authored Mar 08, 2022
  
  5abdab86
04 Mar, 2022 1 commit
- Added logging. · 28b4473e
  Febi Chajadi (fec935) authored Mar 04, 2022
  
  28b4473e