Merge remote-tracking branch 'origin/main' into main

# Conflicts: # src/com/plato/Model/GameRelated/Reversi/Reversi.java
AP2020Fall · Jan 23, 2021 · 7e76ccd · 7e76ccd
2 parents 401fba3 + 80310ed
commit 7e76ccd
Show file tree

Hide file tree

Showing 47 changed files with 3,867 additions and 1,418 deletions.
diff --git a/pom.xml b/pom.xml
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>15-ea+5</version>
+            <version>15.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
@@ -122,12 +122,12 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-base</artifactId>
-            <version>15-ea+5</version>
+            <version>15.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-graphics</artifactId>
-            <version>15-ea+5</version>
+            <version>15.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>

diff --git a/src/com/Resources/JSONs/AccountRelated/Gamer.json b/src/com/Resources/JSONs/AccountRelated/Gamer.json
@@ -7,8 +7,12 @@
       "month": 1,
       "day": 14
     },
-    "frnds": [],
-    "faveGames": [],
+    "frnds": [
+      "dorrin2"
+    ],
+    "faveGames": [
+      "BattleSea"
+    ],
     "firstName": "1",
     "lastName": "1",
     "username": "dorrin1",
@@ -26,7 +30,9 @@
       "month": 1,
       "day": 16
     },
-    "frnds": [],
+    "frnds": [
+      "dorrin1"
+    ],
     "faveGames": [],
     "firstName": "2",
     "lastName": "2",

diff --git a/src/com/Resources/JSONs/AccountRelated/Message.json b/src/com/Resources/JSONs/AccountRelated/Message.json
@@ -33,5 +33,153 @@
       "phoneNum": "00011122233",
       "pfpUrl": "https://i.imgur.com/vMppUMs.png"
     }
+  },
+  {
+    "text": "message",
+    "dateTime": {
+      "date": {
+        "year": 2021,
+        "month": 1,
+        "day": 23
+      },
+      "time": {
+        "hour": 17,
+        "minute": 11,
+        "second": 51,
+        "nano": 456495000
+      }
+    },
+    "gamer": {
+      "awardsFromEvents": 0,
+      "money": 20.0,
+      "accountStartDate": {
+        "year": 2021,
+        "month": 1,
+        "day": 14
+      },
+      "frnds": [],
+      "faveGames": [
+        "BattleSea"
+      ],
+      "firstName": "1",
+      "lastName": "1",
+      "username": "dorrin1",
+      "password": "11",
+      "userID": "270774",
+      "email": "[email protected]",
+      "phoneNum": "00011122233",
+      "pfpUrl": "https://i.imgur.com/vMppUMs.png"
+    }
+  },
+  {
+    "text": "hello",
+    "dateTime": {
+      "date": {
+        "year": 2021,
+        "month": 1,
+        "day": 23
+      },
+      "time": {
+        "hour": 17,
+        "minute": 11,
+        "second": 56,
+        "nano": 385798000
+      }
+    },
+    "gamer": {
+      "awardsFromEvents": 0,
+      "money": 20.0,
+      "accountStartDate": {
+        "year": 2021,
+        "month": 1,
+        "day": 14
+      },
+      "frnds": [],
+      "faveGames": [
+        "BattleSea"
+      ],
+      "firstName": "1",
+      "lastName": "1",
+      "username": "dorrin1",
+      "password": "11",
+      "userID": "270774",
+      "email": "[email protected]",
+      "phoneNum": "00011122233",
+      "pfpUrl": "https://i.imgur.com/vMppUMs.png"
+    }
+  },
+  {
+    "text": "Specifies the start angle value for this RotateTransition.",
+    "dateTime": {
+      "date": {
+        "year": 2021,
+        "month": 1,
+        "day": 23
+      },
+      "time": {
+        "hour": 17,
+        "minute": 12,
+        "second": 17,
+        "nano": 23902000
+      }
+    },
+    "gamer": {
+      "awardsFromEvents": 0,
+      "money": 20.0,
+      "accountStartDate": {
+        "year": 2021,
+        "month": 1,
+        "day": 14
+      },
+      "frnds": [],
+      "faveGames": [
+        "BattleSea"
+      ],
+      "firstName": "1",
+      "lastName": "1",
+      "username": "dorrin1",
+      "password": "11",
+      "userID": "270774",
+      "email": "[email protected]",
+      "phoneNum": "00011122233",
+      "pfpUrl": "https://i.imgur.com/vMppUMs.png"
+    }
+  },
+  {
+    "text": "It is not possible to change fromAngle of a running RotateTransition. If the value of fromAngle is changed for a running RotateTransition, the animation has to be stopped and started again to pick up the new value",
+    "dateTime": {
+      "date": {
+        "year": 2021,
+        "month": 1,
+        "day": 23
+      },
+      "time": {
+        "hour": 17,
+        "minute": 12,
+        "second": 25,
+        "nano": 894376000
+      }
+    },
+    "gamer": {
+      "awardsFromEvents": 0,
+      "money": 20.0,
+      "accountStartDate": {
+        "year": 2021,
+        "month": 1,
+        "day": 14
+      },
+      "frnds": [],
+      "faveGames": [
+        "BattleSea"
+      ],
+      "firstName": "1",
+      "lastName": "1",
+      "username": "dorrin1",
+      "password": "11",
+      "userID": "270774",
+      "email": "[email protected]",
+      "phoneNum": "00011122233",
+      "pfpUrl": "https://i.imgur.com/vMppUMs.png"
+    }
   }
 ]