Skip to content

Commit 521e5c5

Browse files
committed
Merge branch 'add-live-data-handling'
2 parents 702c70d + 3c40ef1 commit 521e5c5

File tree

134 files changed

+20731
-3960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+20731
-3960
lines changed

Assets/_Project/Materials/SpriteLitDefault.mat.meta renamed to Assets/_Project/Data/API.meta

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Data/API/20201103-range-4-month.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

Assets/_Project/Data/API/20201103-range-4-month.json.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Data/API/20201103-rangePlusStream-1-day.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

Assets/_Project/Data/API/20201103-rangePlusStream-1-day.json.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":1,"clicks":1},"monsters":[],"trackers":{"blocked":[],"found":["google.com"]},"createdAt":"2020-11-03T18:15:51.000Z"},{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":0,"clicks":0},"monsters":[{"mid":229,"level":8,"stage":1,"tracker":"cloudfront.net"},{"mid":243,"level":9,"stage":1,"tracker":"microsoft.com"},{"mid":628,"level":25,"stage":1,"tracker":"googletagservices.com"}],"trackers":{"blocked":["quantserve.com","google-analytics.com","googleapis.com","googletagservices.com"],"found":["quantserve.com","scorecardresearch.com","google-analytics.com","googleapis.com","googletagservices.com"]},"createdAt":"2020-11-03T18:17:00.000Z"},{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":1,"clicks":1},"monsters":[],"trackers":{"blocked":[],"found":["google.com"]},"createdAt":"2020-11-03T18:18:09.000Z"},{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":0,"clicks":0},"monsters":[],"trackers":{"blocked":[],"found":["microsoft.com"]},"createdAt":"2020-11-03T18:18:14.000Z"},{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":1,"clicks":1},"monsters":[],"trackers":{"blocked":[],"found":["microsoft.com"]},"createdAt":"2020-11-03T18:18:23.000Z"},{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":1,"clicks":1},"monsters":[],"trackers":{"blocked":[],"found":["google.com"]},"createdAt":"2020-11-03T18:19:43.000Z"},{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":0,"clicks":0},"monsters":[],"trackers":{"blocked":["quantserve.com","google-analytics.com","googleapis.com","googletagservices.com"],"found":["quantserve.com","scorecardresearch.com","google-analytics.com","googleapis.com","googletagservices.com"]},"createdAt":"2020-11-03T18:20:21.000Z"},{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":0,"clicks":0},"monsters":[],"trackers":{"blocked":["quantserve.com","google-analytics.com","googleapis.com","googletagservices.com"],"found":["quantserve.com","scorecardresearch.com","google-analytics.com","googleapis.com","googletagservices.com"]},"createdAt":"2020-11-03T18:21:41.000Z"},{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":0,"clicks":0},"monsters":[],"trackers":{"blocked":["quantserve.com","google-analytics.com","googleapis.com","googletagservices.com"],"found":["quantserve.com","scorecardresearch.com","google-analytics.com","googleapis.com","googletagservices.com"]},"createdAt":"2020-11-03T18:21:57.000Z"},{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":0,"clicks":0},"monsters":[],"trackers":{"blocked":["quantserve.com","google-analytics.com","googleapis.com","googletagservices.com"],"found":["quantserve.com","scorecardresearch.com","google-analytics.com","googleapis.com","googletagservices.com"]},"createdAt":"2020-11-03T18:29:14.000Z"},{"username":"grumpyprinter37","avatarPath":"uploads/y4MxOc4B.gif","eventType":"stream","eventData":{"likes":0,"score":0,"clicks":0},"monsters":[{"mid":135,"level":6,"stage":1,"tracker":"microsoft.com"},{"mid":229,"level":8,"stage":1,"tracker":"cloudfront.net"},{"mid":243,"level":9,"stage":1,"tracker":"microsoft.com"},{"mid":628,"level":25,"stage":1,"tracker":"googletagservices.com"}],"trackers":{"blocked":[],"found":["microsoft.com"]},"createdAt":"2020-11-03T18:29:14.000Z"}]

Assets/_Project/Data/API/20201103-rangePlusStream-1-hour.json.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Data/API/20201103-rangePlusStream-1-week.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

Assets/_Project/Data/API/20201103-rangePlusStream-1-week.json.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Materials/SpriteLitDefault.mat

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)