Skip to content
This repository was archived by the owner on Feb 20, 2022. It is now read-only.

Commit e246ce9

Browse files
author
Vincent Cantin
committed
Updated Meteor to v1.4.1.2 and Unity3D to v5.4.1f1, updated all the meteor packages, reset the database with meteor reset, and changed the password's digest to lower case to perfectly match the DDP traffic from a browser.
Tested OK! 1. Created the user "toto" from a browser with the password "123456", logged out. 2. Used Unity to login toto, the server answered that it worked. Logged out, correct answer again from the server to tell me that I logged out.
1 parent b8be6f0 commit e246ce9

File tree

9 files changed

+205
-91
lines changed

9 files changed

+205
-91
lines changed

example-server/.meteor/.finished-upgraders

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ notices-for-facebook-graph-api-2
1111
1.2.0-cordova-changes
1212
1.2.0-breaking-changes
1313
1.3.0-split-minifiers-package
14+
1.4.0-remove-old-dev-bundle-link
15+
1.4.1-add-shell-server-package

example-server/.meteor/packages

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@
44
# 'meteor add' and 'meteor remove' will edit this file for you,
55
# but you can also edit it by hand.
66

7-
meteor-base # Packages every Meteor app needs to have
8-
mobile-experience # Packages for a great mobile UX
9-
mongo # The database Meteor supports right now
10-
blaze-html-templates # Compile .html files into Meteor Blaze views
11-
reactive-var # Reactive variable for tracker
12-
jquery # Helpful client-side library
13-
tracker # Meteor's client-side reactive programming library
7+
meteor-base@1.0.4 # Packages every Meteor app needs to have
8+
mobile-experience@1.0.4 # Packages for a great mobile UX
9+
mongo@1.1.12_1 # The database Meteor supports right now
10+
blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
11+
reactive-var@1.0.10 # Reactive variable for tracker
12+
jquery@1.11.9 # Helpful client-side library
13+
tracker@1.1.0 # Meteor's client-side reactive programming library
1414

15-
standard-minifier-css # CSS minifier run for production mode
16-
standard-minifier-js # JS minifier run for production mode
17-
es5-shim # ECMAScript 5 compatibility for older browsers.
18-
ecmascript # Enable ECMAScript2015+ syntax in app code
15+
standard-minifier-css@1.2.0_1 # CSS minifier run for production mode
16+
standard-minifier-js@1.2.0_1 # JS minifier run for production mode
17+
es5-shim@4.6.14_1 # ECMAScript 5 compatibility for older browsers.
18+
ecmascript@0.5.8_1 # Enable ECMAScript2015+ syntax in app code
1919

20-
accounts-password
21-
accounts-ui
20+
21+
22+
shell-server

example-server/.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.3.3.1
1+
METEOR@1.4.1.2

example-server/.meteor/versions

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,85 @@
1-
2-
accounts-password@1.1.11
1+
2+
accounts-password@1.3.0
33
44
55
6-
autoupdate@1.2.10
7-
babel-compiler@6.8.2
8-
6+
autoupdate@1.3.11
7+
babel-compiler@6.9.1_1
8+
99
1010
11-
12-
13-
14-
15-
caching-compiler@1.0.5
16-
11+
12+
13+
14+
15+
caching-compiler@1.1.7_1
16+
1717
1818
1919
20-
ddp-client@1.2.8
20+
ddp-client@1.3.1_1
2121
2222
23-
ddp-server@1.2.8
23+
ddp-server@1.3.10_1
2424
2525
26-
ecmascript@0.4.5
27-
ecmascript-runtime@0.2.11
26+
ecmascript@0.5.8_1
27+
ecmascript-runtime@0.3.14_1
2828
29-
email@1.0.14
30-
es5-shim@4.5.12
29+
email@1.1.17_1
30+
es5-shim@4.6.14_1
3131
3232
3333
34-
35-
36-
http@1.1.6
34+
35+
36+
http@1.2.9_1
3737
3838
3939
40-
less@2.6.2
40+
less@2.7.5_1
4141
4242
43-
logging@1.0.13
44-
meteor@1.1.15
43+
logging@1.1.15_1
44+
meteor@1.2.17_1
4545
46-
minifier-css@1.1.12
47-
minifier-js@1.1.12
46+
minifier-css@1.2.14_1
47+
minifier-js@1.2.14_1
4848
4949
5050
51-
modules@0.6.3
52-
modules-runtime@0.6.4
53-
51+
modules@0.7.6_1
52+
modules-runtime@0.7.6_1
53+
5454
55-
npm-bcrypt@0.8.6_1
56-
npm-mongo@1.4.44
55+
npm-bcrypt@0.9.1_1
56+
npm-mongo@2.2.10_1
5757
5858
59-
promise@0.7.2
59+
promise@0.8.7
6060
6161
6262
6363
64-
64+
6565
6666
6767
6868
6969
70-
71-
70+
71+
72+
7273
73-
74-
75-
76-
77-
78-
74+
75+
76+
77+
78+
79+
80+
81+
7982
8083
81-
webapp@1.2.9
84+
webapp@1.3.11_1
8285

unity-project/Assets/unity3d-ddp-client/README.md.meta

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

unity-project/Assets/unity3d-ddp-client/account/DdpAccount.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public DdpAccount(DdpConnection connection) {
2222
private JSONObject GetPasswordObj(string password) {
2323
string digest = BitConverter.ToString(
2424
new SHA256Managed().ComputeHash(Encoding.UTF8.GetBytes(password)))
25-
.Replace("-", "");
25+
.Replace("-", "").ToLower();
2626

2727
JSONObject passwordObj = JSONObject.Create();
2828
passwordObj.AddField("digest", digest);

unity-project/ProjectSettings/GraphicsSettings.asset

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,31 @@
33
--- !u!30 &1
44
GraphicsSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 5
6+
serializedVersion: 7
77
m_Deferred:
88
m_Mode: 1
99
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
1010
m_DeferredReflections:
1111
m_Mode: 1
1212
m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0}
13+
m_ScreenSpaceShadows:
14+
m_Mode: 1
15+
m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
1316
m_LegacyDeferred:
1417
m_Mode: 1
1518
m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
19+
m_DepthNormals:
20+
m_Mode: 1
21+
m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
22+
m_MotionVectors:
23+
m_Mode: 1
24+
m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0}
25+
m_LightHalo:
26+
m_Mode: 1
27+
m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0}
28+
m_LensFlare:
29+
m_Mode: 1
30+
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
1631
m_AlwaysIncludedShaders:
1732
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1833
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
@@ -21,8 +36,23 @@ GraphicsSettings:
2136
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
2237
- {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
2338
m_PreloadedShaders: []
24-
m_ShaderSettings:
25-
useScreenSpaceShadows: 1
39+
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
40+
type: 0}
41+
m_ShaderSettings_Tier1:
42+
useCascadedShadowMaps: 1
43+
standardShaderQuality: 2
44+
useReflectionProbeBoxProjection: 1
45+
useReflectionProbeBlending: 1
46+
m_ShaderSettings_Tier2:
47+
useCascadedShadowMaps: 1
48+
standardShaderQuality: 2
49+
useReflectionProbeBoxProjection: 1
50+
useReflectionProbeBlending: 1
51+
m_ShaderSettings_Tier3:
52+
useCascadedShadowMaps: 1
53+
standardShaderQuality: 2
54+
useReflectionProbeBoxProjection: 1
55+
useReflectionProbeBlending: 1
2656
m_BuildTargetShaderSettings: []
2757
m_LightmapStripping: 0
2858
m_FogStripping: 0

0 commit comments

Comments
 (0)