Merge branch 'dev' of github.com:ucsd-cse125-sp24/group3 into dev

ucsd-cse125-sp24 · Jun 7, 2024 · 1d25e1f · 1d25e1f
2 parents d09095e + 71cd0aa
commit 1d25e1f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/config.json b/config.json
@@ -14,14 +14,14 @@
   "server": {
     "lobby_name": "Hope you're doing well!",
     "lobby_broadcast": true,
-    "max_players": 4,
+    "max_players": 2,
     "disable_dm": false,
-    "skip_intro": true
+    "skip_intro": false
   },
   "client": {
     "default_name": "Conan O'Brien",
     "lobby_discovery": true,
-    "fullscreen": false,
+    "fullscreen": true,
     "draw_bboxes": false,
     "fps_counter": true,
     "presentation": false,

diff --git a/src/client/client.cpp b/src/client/client.cpp
@@ -1432,7 +1432,6 @@ void Client::lightingPass() {
         }
 
         if (!sharedObject->pointLightInfo.has_value()) {
-            std::cout << "got a torch without point light info for some reason" << std::endl;
             continue;
         }                
 

diff --git a/src/server/game/servergamestate.cpp b/src/server/game/servergamestate.cpp
@@ -1079,7 +1079,8 @@ bool ServerGameState::hasObjectCollided(Object* object, glm::vec3 newCornerPosit
 					otherObj->type == ObjectType::WeaponCollider ||
 					otherObj->type == ObjectType::Slime ||
 					otherObj->type == ObjectType::TeleporterTrap ||
-					otherObj->type == ObjectType::Torchlight) {
+					otherObj->type == ObjectType::Torchlight ||
+					otherObj->type == ObjectType::Mirror) {
 					continue;
 				}