Moved a couple of folders and wrote some code
This commit is contained in:
Madhav Kapa
parent
0eea70ab4e
commit
e8684391ca
@ -9,63 +9,25 @@
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="8e9b3697-c9b4-441a-aeed-4ea7b4488600" name="Changes" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/Steam.asmdef" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/Steam.asmdef.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/steam_appid.txt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.station_obscurum_temp/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.station_obscurum_temp/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/DefaultPrefabObjects.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/DefaultPrefabObjects.asset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/CHANGELOG.txt" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/CHANGELOG.txt.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/BidirectionalDictionary.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/BidirectionalDictionary.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/ClientHostSocket.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/ClientHostSocket.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/ClientSocket.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/ClientSocket.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/CommonSocket.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/CommonSocket.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/FishyConnectionManager.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/FishyConnectionManager.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/FishySocketManager.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/FishySocketManager.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/LocalPacket.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/LocalPacket.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/ServerSocket.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/Core/ServerSocket.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/FishyFacepunch.cs" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/FishyFacepunch.cs.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/VERSION.txt" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/FishNet/Plugins/FishyFacepunch/VERSION.txt.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Posix.dll" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Posix.dll.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Posix.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Posix.xml.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Win32.dll" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Win32.dll.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Win32.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Win32.xml.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Win64.dll" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Win64.dll.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Win64.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/Facepunch.Steamworks.Win64.xml.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/linux32.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/linux32/libsteam_api.so" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/linux32/libsteam_api.so.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/linux64.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/linux64/libsteam_api.so" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/linux64/libsteam_api.so.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/osx.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/osx/libsteam_api.bundle" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/osx/libsteam_api.bundle.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/steam_api.dll" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/steam_api.dll.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/steam_api.lib" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/steam_api.lib.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64/steam_api64.dll.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64/steam_api64.dll.meta" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Experimentation/MultiplayerScenes/LobbyTesting3d.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Experimentation/MultiplayerScenes/LobbyTesting3d.unity" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64/steam_api64.dll" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64/steam_api64.dll.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64/steam_api64.lib" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64/steam_api64.lib.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/FriendObject.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/FriendObject.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamFriendsManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamFriendsManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyWithPlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyWithPlayer.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Packages/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/manifest.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -73,10 +35,8 @@
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="HighlightingSettingsPerFile">
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Steam/FriendObject.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Steam/SteamFriendsManager.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyWithPlayer.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Steam/SteamManager.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Assets/Samples/Steamworks Foundation/3.0.16/Example Scenes/Examples/Common Scripts/MarketingButtons.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.heathen.steamworksfoundation@3fc1f33a48/Runtime/SteamworksBehaviour.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
</component>
|
||||
<component name="MarkdownSettingsMigration">
|
||||
<option name="stateVersion" value="1" />
|
||||
@ -164,7 +124,7 @@
|
||||
<workItem from="1685636572156" duration="4819000" />
|
||||
<workItem from="1685617055026" duration="83000" />
|
||||
<workItem from="1685617157524" duration="2799000" />
|
||||
<workItem from="1685632962650" duration="4402000" />
|
||||
<workItem from="1685632962650" duration="5878000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
||||
Binary file not shown.
@ -1,89 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cf5718c4ee1c31e458f8a58a77f4eef0
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
: Any
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
Exclude Editor: 0
|
||||
Exclude Linux: 0
|
||||
Exclude Linux64: 0
|
||||
Exclude LinuxUniversal: 0
|
||||
Exclude OSXUniversal: 0
|
||||
Exclude Win: 1
|
||||
Exclude Win64: 0
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 1
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: x86_64
|
||||
DefaultValueInitialized: true
|
||||
OS: AnyOS
|
||||
- first:
|
||||
Facebook: Win
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Facebook: Win64
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: Linux
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: x86
|
||||
- first:
|
||||
Standalone: Linux64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: LinuxUniversal
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: OSXUniversal
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: Win
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: Win64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user