Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
376 commits
Select commit Hold shift + click to select a range
c012464
Smaller changes like adding some text screens before the practice day
bruskajp May 25, 2021
2f4af33
Change the number of sessions that do practice delivery days
bruskajp May 26, 2021
32a992b
Nick small changes
bruskajp Jun 10, 2021
0a4b1d3
Unity Force Text in Asset Serialization
bruskajp Jun 10, 2021
e9c007b
Improved the quality of the instruction images
bruskajp Jun 15, 2021
2329be1
Small changes such as: ability to skip familiarization, exclude confe…
bruskajp Jun 15, 2021
07a50e1
Remove all .DS_Store files and gitignore them
bruskajp Jun 15, 2021
2e8692e
Force Text Serialization
bruskajp Jun 15, 2021
75edfbf
New input manager by daemon3000
bruskajp Jun 16, 2021
b4cda83
New DoTownLearning function and NICLS_COURIER flag
bruskajp Jun 17, 2021
8b4b239
Improved usage of new input manager, refactored MessageImageDisplayer…
bruskajp Jun 18, 2021
e2086d6
Changed efr button names from correct/incorrect to efrLeft/efrRight a…
bruskajp Jun 18, 2021
0f62913
Added EFR Button Practice
bruskajp Jun 21, 2021
b51ffa7
Updated EFR instruction video, added efr keypress check, added efr ke…
bruskajp Jun 22, 2021
e3fda8e
Removed unneeded pngs and MessageImageDisplayer game objects
bruskajp Jun 22, 2021
edb7aa2
Improved queued recall message and removed more unused variables
bruskajp Jun 22, 2021
3fc7661
Merge branch 'dev/Modified2021Unity2017' into dev/Nicls
bruskajp Jun 24, 2021
e19b99a
Fixes from merge
bruskajp Jun 25, 2021
65ae672
Made some things only happen for EFR and added a skip to the micropho…
bruskajp Jun 25, 2021
9096987
Improved town learning days text
bruskajp Jun 25, 2021
d23a0b8
Change default resolution to 1920x1080
bruskajp Jun 25, 2021
c793e26
Added more controllable const variables, many bug fixes, added script…
bruskajp Jun 28, 2021
82c71a7
Added Efr Text Resizing and more bug fixes
bruskajp Jun 29, 2021
a62131c
Add DoMovie and make each keypress create a separate event log
bruskajp Jul 7, 2021
4df217b
Added store identity to town learning
bruskajp Jul 7, 2021
895ab95
Moved RemainingItems folder from the participant folder to the sessio…
bruskajp Jul 9, 2021
e0a1611
Added many changes and bug fixes for the NICLS task
bruskajp Jul 9, 2021
899040f
Added basic configuration file for NiclsInterface and updated when Ni…
bruskajp Jul 12, 2021
b333374
Made PointingIndicator report only once when turned on and created a …
bruskajp Jul 12, 2021
cc64e55
Refactored the configuration system and started changing the const va…
bruskajp Jul 13, 2021
78a8c27
Town learning only happens on first subsession
bruskajp Jul 13, 2021
a42a622
Added Recap instructions, changed the FFR instructions slide, added t…
bruskajp Jul 13, 2021
40de2a1
Added New EFR procedure (using the "B" key)
bruskajp Jul 13, 2021
31162ce
Small changes for NICLS task
bruskajp Jul 13, 2021
3676b8c
Bug fix for fixation message and wording change on slide
bruskajp Jul 13, 2021
ecb43f7
Redid networking to use TcpClient instead of ZMQ, skip intros for ses…
bruskajp Jul 16, 2021
4033ae6
Fixed a few small bugs, added new efr instructions, added efr instruc…
bruskajp Jul 16, 2021
6ea79c9
change version number
bruskajp Jul 16, 2021
34c81e8
Changed reported event from true/false to 1/0
bruskajp Jul 19, 2021
660a620
Update README.md
bruskajp Jul 30, 2021
28c6976
Update README.md
bruskajp Jul 30, 2021
87ff7b8
Added the fixBooleans.sh helper script
bruskajp Jul 30, 2021
3880be8
Added configs that are needed to run code
bruskajp Jul 30, 2021
9e7a8bf
Merge pull request #4 from pennmem/dev/Nicls
bruskajp Aug 11, 2021
c2bb615
added dll files
leo950804 Sep 8, 2021
65ed339
merged Courier Online code
leo950804 Sep 8, 2021
27bb6ff
added Courier Online language script
leo950804 Sep 8, 2021
aace206
added reset() to reset player's position
leo950804 Sep 8, 2021
be70b5d
added Psiturk_Wrapper
leo950804 Sep 8, 2021
68e6364
added WriteToPsiturkHandler.cs to UnityEPL folder
leo950804 Sep 8, 2021
cbed742
changed to virtual void
leo950804 Sep 8, 2021
0663ec5
additional psiturk meta file
leo950804 Sep 8, 2021
7e5474b
changed the class in order for psiturk to override
leo950804 Sep 8, 2021
d889ba6
minor fix for merging online version
leo950804 Sep 8, 2021
6f96ecb
commented out recording related codes
leo950804 Sep 8, 2021
6a7509d
minor fix for merging online version
leo950804 Sep 8, 2021
f203f97
minor fix for merging online version
leo950804 Sep 8, 2021
04600f3
added StreamingAssets folder
leo950804 Sep 8, 2021
1ac84ef
initial compile error resolved
leo950804 Sep 8, 2021
4e4a668
added WriteToPsiturkHandler.cs to DataCollection
leo950804 Sep 8, 2021
0a0c9c8
emptied CollectMouseEvents() for online ver
leo950804 Sep 15, 2021
beff510
private bool to protected bool
leo950804 Sep 15, 2021
9fc9534
added .ToString() at the end
leo950804 Sep 15, 2021
68a2aaa
disable space feature for online
leo950804 Sep 15, 2021
5aa0316
added frame test prompts
leo950804 Sep 29, 2021
d0b2de4
Checkpoint: resolved all compile errors
leo950804 Sep 29, 2021
02091a5
added borderline to indicate non-compiling areas
leo950804 Sep 29, 2021
94d6a82
Update Town Constructor 3.meta
leo950804 Sep 30, 2021
b4a6f34
fixed FPS testing, and now working
leo950804 Sep 30, 2021
e5970bc
modified FlexibleConfig.cs for webGL
leo950804 Sep 30, 2021
39a39c6
added config files for Courier Online in streamingassets folder
leo950804 Oct 1, 2021
012fbff
config now supported in Courier Online
leo950804 Oct 1, 2021
f651303
Update .gitignore
leo950804 Oct 1, 2021
7c94e93
modified FPS test display, and fully functional now
leo950804 Oct 1, 2021
3fa2450
finished merging Courier Online in Unity
leo950804 Oct 1, 2021
bd0023e
reset the experiment variables to default
leo950804 Oct 1, 2021
7795e4d
disabled microphone for Courier Online
leo950804 Oct 1, 2021
f6f5286
added symlink
leo950804 Oct 4, 2021
7733eac
disable target framerate for webGL
leo950804 Oct 4, 2021
a129031
commented out just in case for webGL
leo950804 Oct 4, 2021
2bcf4ec
comment out NiclsInterface for webGL
leo950804 Oct 4, 2021
d0741b7
updated VideoSelector that supports webGL
leo950804 Oct 4, 2021
91c8b8a
minor fix in video player
leo950804 Oct 5, 2021
b3e1613
added videos to StreamingAssets path
leo950804 Oct 5, 2021
1214a8c
fixing object casting
leo950804 Oct 5, 2021
184f381
updated how Online version uses config via UnityWebRequest
leo950804 Oct 6, 2021
0ad646a
clean up the code
leo950804 Oct 7, 2021
7f8f12f
config web request issue resolved
leo950804 Oct 11, 2021
187cd17
type change (dynamic -> object)
leo950804 Oct 11, 2021
f489504
dynamic to object, along with debug printing
leo950804 Oct 11, 2021
36afa4e
cued recall field location adjustment
leo950804 Oct 11, 2021
c8ab72a
disabling webGL from grabbing all the keyboard input
leo950804 Oct 11, 2021
fffee59
Courier Online merged, still need to check NICLS logging
leo950804 Oct 11, 2021
22ba515
finished fixing DataPoint.cs (dynamic to object type), and tested new…
leo950804 Oct 15, 2021
9365f88
fixes for pull request
leo950804 Oct 18, 2021
5aa990a
moved online config functions to FlexibleConfig.cs
leo950804 Oct 26, 2021
3841a2b
Revert "moved online config functions to FlexibleConfig.cs"
leo950804 Nov 5, 2021
ce2387d
commented on online config fetching
leo950804 Nov 5, 2021
4ddab54
UNITY_STANDALONE -> !UNITY_WEBGL
leo950804 Nov 5, 2021
2c28e08
Merge pull request #5 from pennmem/dev/Online
leo950804 Nov 5, 2021
d7885c6
Changed ReportScriptedEvent to make dict optional and added ability f…
bruskajp Aug 27, 2021
929694b
Added Music Video system, updated configs, updated NiclsInterface, an…
bruskajp Sep 1, 2021
d7d9cf7
Fix DisplaySlider yield bug
bruskajp Sep 1, 2021
014e76f
Fix minor bugs like incorrect text, lag issues on videos, etc.
bruskajp Sep 2, 2021
259aed1
Moved code around to make it easier to locate and other small changes
bruskajp Sep 3, 2021
1448cfe
Changed version number to 5.1.0
bruskajp Sep 3, 2021
69934b6
Updated naming and removed extra files
bruskajp Sep 7, 2021
f39cc9c
Changed bike movement system, fixed hole in map border, andd increase…
bruskajp Sep 13, 2021
2067a81
More motion sickness updates
bruskajp Sep 14, 2021
f389536
Motion sickness problem should be eliminated now
bruskajp Sep 16, 2021
f6d0917
Finished player movement (for now) and made town learning only happen…
bruskajp Sep 21, 2021
f707707
More movement fixes such as rotational damping and slowdown forward v…
bruskajp Sep 29, 2021
546d25b
Moved FpsDisplayer to its own MonoBehavior and added config var, Help…
bruskajp Sep 29, 2021
81de98f
Added new smoother (optional) movement system, thread exception catch…
bruskajp Oct 12, 2021
ac7d30e
Add saving of NICLS config to NiclsInterface
Oct 8, 2021
74b655a
Fixed compile error with writing config to file
bruskajp Oct 12, 2021
74027bf
Removed formatting from nicls network message json strings
bruskajp Oct 12, 2021
9802ec9
Added music video meta file
bruskajp Oct 14, 2021
1543dbc
6->8 ReadOnly, Music video recall now sessions 9, 10, and 11, added c…
bruskajp Nov 9, 2021
c82661a
Changed NUM_READ_ONLY_TRIALS to NUM_CLASSIFIER_NORMALIZATION_TRIALS
bruskajp Nov 9, 2021
6966169
Added Slider Display that handles yes/no cases (this will be refactor…
bruskajp Nov 10, 2021
535aad7
Changed/added music video question about musicianship
bruskajp Nov 10, 2021
d290c4e
Formatting changes
bruskajp Nov 16, 2021
53652ff
Fixed bug in DataPoint about commas, renaming stuff, and improved com…
bruskajp Nov 16, 2021
61116e9
Merge pull request #7 from pennmem/dev/NiclsRebase
bruskajp Nov 16, 2021
2031ffc
Fixed delay note appearing every session and videos splitting by 2 in…
bruskajp Nov 16, 2021
124f1dc
Merge pull request #8 from pennmem/dev/NiclsRebase
bruskajp Nov 16, 2021
3ee31b5
Added Music Videos folder to git ignore
bruskajp Nov 16, 2021
35752fc
Fixed Jitter
bruskajp Nov 17, 2021
0b700ea
Removed Familiarization and made COURIER_ONLINE flag depend on UNITY_…
bruskajp Nov 17, 2021
1c89d46
Upgraded starSystem, Upgraded MessageImageDisplayer to take formattab…
bruskajp Nov 18, 2021
17b19b1
Turn particles on by default and off for Nicls Courier
bruskajp Nov 18, 2021
a4cd2dc
Removed EFR practice day for hospital courier and started doing ECR o…
bruskajp Nov 20, 2021
5a37fc8
Added a Reliable random function that uses just the first part of the…
bruskajp Nov 22, 2021
eebc8b4
Added hospital and standard config file and refactored 'efr' and 'new…
bruskajp Nov 22, 2021
4f53c21
Revamped cued recall, added ecr, and added DisplayMessageTimedKeypres…
bruskajp Nov 23, 2021
de422c1
Updated EFR to bold the text
bruskajp Nov 24, 2021
dc3c6d5
Added runtime loadable controls (including for online)
bruskajp Nov 24, 2021
f0ee503
Added Ps4 controlls and added different smoothing options to horizont…
bruskajp Nov 29, 2021
e1f805a
Added PickNextStore function
bruskajp Nov 30, 2021
a621c90
Added new way to pick next store (and removed craft store requirement…
bruskajp Nov 30, 2021
e1e5dcf
Changed Town Learning to use new PickNextStore function
bruskajp Nov 30, 2021
8c66495
Change version number
bruskajp Dec 2, 2021
28850d4
Merge pull request #9 from pennmem/dev/Hospital
bruskajp Dec 2, 2021
e079e5f
1st Checkpoint (2017 -> 2020)
leo950804 Feb 1, 2022
c69104a
removed JsonDotNet directory
leo950804 Feb 1, 2022
2e043e5
disabled sound recording
leo950804 Feb 1, 2022
0e64376
commented out line 43 in VideoControl.cs
leo950804 Feb 1, 2022
115a09e
relocated config calling functions down to ExperimentCoroutine
leo950804 Feb 1, 2022
f414e12
config fixes
leo950804 Feb 1, 2022
2c514af
config fixes 2
leo950804 Feb 1, 2022
2eb9af3
webGL now working
leo950804 Feb 9, 2022
6fb8234
updated to Unity 2021
leo950804 Feb 9, 2022
b58c56a
Changes #1
leo950804 Feb 9, 2022
ec83ceb
added online instruction slides (preliminary)
leo950804 Dec 7, 2021
54dda1b
added value courier video
leo950804 Feb 9, 2022
785a848
video related all set
leo950804 Feb 9, 2022
fa29356
online recap fully implemented
leo950804 Feb 9, 2022
61e2ac0
updated everything related to Value Courier (maybe)
leo950804 Feb 14, 2022
a0869b8
modified town learning
leo950804 Feb 15, 2022
58f6848
Change version number
bruskajp Dec 2, 2021
2c43cf8
Made it skip go straight to MainGame if it is for webgl
bruskajp Dec 3, 2021
7d33449
Updated FlexibleConfig to save configs to file
bruskajp Dec 3, 2021
dcf823f
Updated FlexibleConfig to save configs to file
bruskajp Dec 3, 2021
4696ea4
Combined all 3 WriteToDisk handler classes into one
bruskajp Dec 3, 2021
f36cee9
Update FlexibleConfig.cs
leo950804 Feb 15, 2022
d643987
allow DLL to get imported
leo950804 Feb 15, 2022
cc4ef82
ready for debugging
leo950804 Feb 22, 2022
3f257ab
Downgrade to Unity 2021.2.12f1
leo950804 Mar 1, 2022
d407100
Added instruction slides before recall tasks / added Elemem toggle
leo950804 Mar 7, 2022
4e49cab
added Elemem (Newtonsoft.dll not resolved yet)
leo950804 Mar 8, 2022
cfb04e0
Elemem related error resolved
leo950804 Mar 8, 2022
f746798
hospital 5.2.1 ready for launch
leo950804 Mar 20, 2022
562a3bc
hospital 5.2.1 Revision
leo950804 Mar 22, 2022
e4604da
Fix to cued recall message display (anchor)
leo950804 Mar 23, 2022
b90b98e
Update LanguageSource.cs
leo950804 Mar 23, 2022
8f9fddb
Elemem / NiclsInterface fix
leo950804 Mar 23, 2022
537ddd3
added stim store selection
leo950804 Mar 24, 2022
2d365dd
added SetElememState function
leo950804 Mar 25, 2022
489122f
Elemem 1st draft
leo950804 Mar 25, 2022
86306d9
implemented Elemem FR stim
leo950804 Mar 30, 2022
64c75d3
Elemem Stimulation
leo950804 Mar 31, 2022
2fc74a0
added new instruction videos
leo950804 Apr 5, 2022
87cf597
update gitignore (video files)
leo950804 Apr 5, 2022
887a26d
ready for pilot testing
leo950804 Apr 8, 2022
829f46c
elemem testing
leo950804 Apr 12, 2022
3ae7b94
Fixed Elemem Integration
bruskajp Apr 12, 2022
bfd8948
updated SendWordMessage
leo950804 Apr 13, 2022
62f9f4e
Made ScriptedEventReported and all other valid DataReporters (besides…
bruskajp Apr 15, 2022
e142f47
fixed cued recall bug
leo950804 Apr 18, 2022
8512f2c
Revert "fixed cued recall bug"
leo950804 Apr 18, 2022
3483d1f
fixed cued recall bug
leo950804 Apr 18, 2022
45ed2f1
edited recap slides & some minor fixes
leo950804 Apr 20, 2022
02179ce
recap slide update / joystick functionality added
leo950804 Apr 20, 2022
fbca349
mp4 to mov
leo950804 Apr 20, 2022
614a12f
Minor fix
leo950804 Apr 29, 2022
21df197
update Unity to 2021.3.1f1 / 1st draft for Stim using DoRepeating()
leo950804 May 3, 2022
2aaca2a
fixed video / added repeating stim in Elemem
leo950804 May 4, 2022
892079d
changed the protection level of SendMessageInternal
leo950804 May 4, 2022
b6dc23a
minor fix
leo950804 May 4, 2022
b2d622c
Courier U01 instruction videos
leo950804 May 5, 2022
76856e2
commenting out debug command
leo950804 May 5, 2022
670897d
Courier OL Stim and ElememInterface fixes for OL stim
bruskajp May 6, 2022
c95d2c8
Updated to version 6.0.0
bruskajp May 6, 2022
982af8d
Merge pull request #10 from pennmem/dev/Unity2021
leo950804 May 9, 2022
647af46
Changed magic number to constant
bruskajp May 9, 2022
b87ebb0
Added DrivingControls xml integration back in
bruskajp May 9, 2022
1561d9e
Upgraded to 2021.3.2f1 from 2021.3.1f1
bruskajp May 10, 2022
bd3798b
added BlackScreen before Townlearning / edited language text
leo950804 May 10, 2022
c6c8c90
remove the commented line
leo950804 May 10, 2022
093ce42
Merge pull request #11 from pennmem/dev/Unity2021
leo950804 May 10, 2022
b6eae1f
Added bugfix for ElememDataPoint null dictionary, more events being r…
bruskajp May 11, 2022
19647e2
changed 360p to 720p in VideoTexture/ reverted back to MP4
leo950804 May 18, 2022
15c21e6
update recap instruction slide
leo950804 May 20, 2022
8dbe03d
increased pointing threshold / added delay at the beginning of the de…
leo950804 May 25, 2022
8f8b783
SendWordMessage deleted
leo950804 Jun 2, 2022
9fed766
Syntax error
leo950804 Jun 2, 2022
b1b046e
Hospital to Standard
leo950804 Jun 3, 2022
286e3d1
Update dev.rst
bruskajp Jun 14, 2022
6c4ff2d
Created pointer navigation system
Jun 17, 2022
c43abf3
Set pointer to navigate to delivery zones, updated NavMesh and NavMes…
Jun 17, 2022
00f494f
Implemented offset system for navigation pointer and fixed invisible …
Jun 21, 2022
906631b
Updated pointer to recompute shortest path to destination
Jun 22, 2022
ff5221a
Added some comments
Jun 22, 2022
d0a4bde
Added FindDeliveryRoute script
psybruce Jul 6, 2022
54643e3
Fixed route sequence bugs
psybruce Jul 6, 2022
0ea8dc5
Fixed minor bugs, node times now influence sequence building
psybruce Jul 7, 2022
c96d0b6
Added turn penalty variable
psybruce Jul 8, 2022
94b75a0
Created scene for new environment
psybruce Jul 8, 2022
8caef91
Completed structure for new town & removed shadows from pointer
psybruce Jul 12, 2022
13cce90
Set up delivery experiment in new environment & added post office sta…
psybruce Jul 13, 2022
6803dad
Added experimental speed change keys
psybruce Jul 13, 2022
3045a6d
Created new item selection system
psybruce Jul 15, 2022
5bd7060
Add Asset - Easy Roads Mesh Gen
bruskajp Jul 18, 2022
22e08d7
Add Asset - Modular Urban Buildings URP
bruskajp Jul 18, 2022
f77f867
Add Asset - Residential Buildings Pack
bruskajp Jul 18, 2022
3018ebe
Created framework for audio implementation in new item system
psybruce Jul 18, 2022
3e3bc27
Merge branch 'feature/APEM' of github.com:pennmem/Courier into featur…
psybruce Jul 18, 2022
79f0e84
Added some buildings
psybruce Jul 25, 2022
3976fac
Created new delivery zone system
psybruce Jul 27, 2022
079ddc3
Began implementation of rep & value courier
psybruce Aug 3, 2022
169951d
Finished sidewalks and curbs and finished distance judgment task
psybruce Aug 5, 2022
fdc1abe
Updated some stuff
psybruce Aug 10, 2022
0057cb7
Trees.
psybruce Aug 10, 2022
b41b496
Added audio samples for items
psybruce Aug 12, 2022
3269170
Added conditional category selection and changed ax to axe
psybruce Aug 12, 2022
e12bab6
changed a couple of things for mike
psybruce Aug 12, 2022
109b0c5
Commented code and fixed error in FindNodeTime
Aug 26, 2022
41925e1
Commented some sections
Aug 27, 2022
804200c
temp change
zrentala Sep 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file removed .DS_Store
Binary file not shown.
80 changes: 74 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,40 @@
[Ll]ibrary/
[Tt]emp/
[Oo]bj/
[Bb]uild/
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# Autogenerated VS/MD solution and project files
# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Visual Studio packages
/[Pp]ackages/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
Expand All @@ -13,12 +44,49 @@
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D Generated File On Crash Reports
# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.unitypackage
*.zip
*.zip.meta

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*

# Textures which are too big for github
Assets/Town Constructor 3/Textures
Assets/Town Constructor 3
Assets/Video/Music Videos
Assets/Video/Sherlock_*

# Streaming Assets
Assets/StreamingAssets/CourierOnline.json

# Other
.DS_Store
tags
tags.meta
TAGS
TAGS.meta
Assets/Video/New Courier Instructions/cued_recall_video.mp4.meta
Binary file added .ionide/symbolCache.db
Binary file not shown.
25 changes: 0 additions & 25 deletions .vs/DeliveryBoy/xs/UserPrefs.xml

This file was deleted.

56 changes: 56 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitignore":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
}
6 changes: 6 additions & 0 deletions .vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
Binary file removed Assets/.DS_Store
Binary file not shown.
Loading