Merge pull request #166 from jasonrohrer/master

v365 merge

build/buildAndPostWindows.sh

@@ -90,9 +90,35 @@ echo -n 0 > settings/reportWildBugToUser.ini
 # don't use internal updater
 echo -n 1 > settings/useSteamUpdate.ini
 
+cd ..
 
+rm steamLatest.tar.gz
+tar czf steamLatest.tar.gz steamLatest
 
-/c/steamSDK/tools/ContentBuilder/builder/steamcmd.exe +login "jasonrohrergames" +run_app_build -desc OneLifeClient_Windows_v$2 /c/cpp/OneLife/build/steam/app_build_windows_595690.vdf +quit
+
+echo
+echo -n "Press ENTER to scp steamLatest bundle to web server."
+
+read userIn
+
+
+
+scp steamLatest.tar.gz jcr15@onehouronelife.com: 
+
+
+# new, run remotely
+
+echo "Please ssh to server and run:"
+echo "~/checkout/OneLifeWorking/scripts/runWindowsSteamDepotBuild.sh $2"
+echo ""
+echo -n "Press ENTER when done"
+
+read userIn
+
+
+
+# Old, run locally
+# /c/steamSDK/tools/ContentBuilder/builder/steamcmd.exe +login "jasonrohrergames" +run_app_build -desc OneLifeClient_Windows_v$2 /c/cpp/OneLife/build/steam/app_build_windows_595690.vdf +quit
 
 echo
 echo "Steam depot build is done."

build/steam/app_build_windows_ON_SERVER_595690.vdf

@@ -0,0 +1,25 @@
+"appbuild"
+{
+	"appid"	"595690"
+
+	"desc" "Replaced On Command Line" // description for this build
+
+	"buildoutput" "/home/jcr15/steamOutput" // build output folder for .log, .csm & .csd files, relative to location of this file
+
+	"contentroot" "/home/jcr15/steamLatest" // root content folder, relative to location of this file
+
+	// NOT auto-setting this build to live with setlive public
+	// we need to make sure that all other platforms are built and ready
+	// to deploy, so we have to make this build live manually
+
+	"setlive"	"" // branch to set live after successful build, non if empty
+
+	"preview" "0" // to enable preview builds
+
+	"local"	""	// set to flie path of local content server 
+
+	"depots"
+	{
+		"595692" "depot_build_windows_ON_SERVER_595692.vdf"
+	}
+}

build/steam/depot_build_windows_ON_SERVER_595692.vdf

@@ -0,0 +1,111 @@
+// script for windows client depot
+// this is built on a windows machine
+
+"DepotBuildConfig"
+{
+	// Set your assigned depot ID here
+	"DepotID" "595692"
+
+	// Set a root for all content.
+	// All relative paths specified below (LocalPath in FileMapping entries, and FileExclusion paths)
+	// will be resolved relative to this root.
+	// If you don't define ContentRoot, then it will be assumed to be
+	// the location of this script file, which probably isn't what you want
+
+	// this is the location of the latest data as created by 
+	// generateDataOnlyDiffBundle
+	"ContentRoot"	"/home/jcr15/steamLatest"
+
+	// include all files recursivley
+  "FileMapping"
+  {
+  	// This can be a full path, or a path relative to ContentRoot
+    "LocalPath" "*"
+
+    // This is a path relative to the install folder of your game
+    "DepotPath" "."
+
+    // If LocalPath contains wildcards, setting this means that all
+    // matching files within subdirectories of LocalPath will also
+    // be included.
+    "recursive" "1"
+  }
+
+	// but exclude all symbol files  
+	// This can be a full path, or a path relative to ContentRoot
+   //"FileExclusion" "*.pdb"
+
+
+
+ // these files will be modified during runtime
+ // don't overwrite them with default values during update/verify
+
+
+	"FileProperties" 
+    { 
+      "LocalPath" "settings\\borderless.ini" 
+      "Attributes" "userconfig" 
+    }
+
+	"FileProperties" 
+    { 
+      "LocalPath" "settings\\customServerAddress.ini" 
+      "Attributes" "userconfig" 
+    }
+
+	"FileProperties" 
+    { 
+      "LocalPath" "settings\\customServerPort.ini" 
+      "Attributes" "userconfig" 
+    }
+
+
+	"FileProperties" 
+    { 
+      "LocalPath" "settings\\fullscreen.ini" 
+      "Attributes" "userconfig" 
+    }
+
+
+	"FileProperties" 
+    { 
+      "LocalPath" "settings\\loginSuccess.ini" 
+      "Attributes" "userconfig" 
+    }
+
+
+	"FileProperties" 
+    { 
+      "LocalPath" "settings\\musicLoudness.ini" 
+      "Attributes" "userconfig" 
+    }
+
+
+	"FileProperties" 
+    { 
+      "LocalPath" "settings\\soundEffectsLoudness.ini" 
+      "Attributes" "userconfig" 
+    }
+
+
+	"FileProperties" 
+    { 
+      "LocalPath" "settings\\tutorialDone.ini" 
+      "Attributes" "userconfig" 
+    }
+
+
+	"FileProperties" 
+    { 
+      "LocalPath" "settings\\twinCode.ini" 
+      "Attributes" "userconfig" 
+    }
+
+
+	"FileProperties" 
+    { 
+      "LocalPath" "settings\\useCustomServer.ini" 
+      "Attributes" "userconfig" 
+    }
+
+}

documentation/changeLog.txt

@@ -3,6 +3,61 @@ This file only list changes to game code.  Changes to content can be found here:
 http://onehouronelife.com/updateLog.php
 
 
+Version 365    2021-October-28
+
+--Sound effects can now be OGG files (in sounds folder) to deal with longer
+  sounds, like snippets of music, without wasting disk space.
+
+--Emotes can now +hideHead of emoting person.
+
+--Support for rideable objects that +hideRider.
+
+--More robust implementation of +neverDrop, so that object isn't manually
+  dropable or swappable even if use-on-bare-ground transition defined (that
+  transition only applies when object force-dropped, like when holder is
+  wounded).
+
+--Support for HELL arrow.
+
+--Fixed a memory leak in server newConnection ipAddress tracking.
+
+--Added support for +giveClue
+
+
+
+Server Fixes
+
+--Web bots hammering the server will no longer fill up possible player slots,
+  since we notice that they aren't sending OHOL protocol messages and
+  disconnect them immediately (before, we gave them a 10-second grace period to
+  send a valid message, which consumed a connection slot).  They will also not
+  prevent the server from shutting down gracefully, since we now only wait
+  until 0 active players (and no 0 active players and 0 new connections) before
+  shutting down.
+
+--Added an ipBanList, for IP addresses that make 10 bad connections to a server
+  in a row (badly formatted messages, failure to login in a timely manner, 
+  etc.).  After 10 bad connections, that IP is insta-rejected for 5 minutes
+  before it can try making another connection.  If a bot is hammering the
+  server long-term, that cool-down time for the IP will grow over time, beyond
+  5 minutes.
+
+--All server outbound web requests (to various utility servers, like stats 
+  server, ticket server, etc.) now have a timeout of 10 seconds each.  A
+  firewall bug was causing some of these to never finish, leaving a bunch of
+  clients hanging in an unfinished login limbo state.  Now the login process is
+  more robust, and will always finish, even in the face of unresponsive utility
+  servers.
+
+--Another fix to Eve placement to prevent eastward jump-backs:  we now use
+  west-of-homeland Eve placements to keep pushing the last-eve position further
+  west, so if we ever have to default to the walking grid later (because there
+  are no first homelands left), then the new walking grid will start to the
+  west of the last non-grid Eve spawn.  Thanks Teliot.
+
+
+
+
 
 Version 364    2021-May-26
 

documentation/html/index.php

@@ -204,7 +204,7 @@ function showLogo( $inImageFile, $inText ) {
 <br>
 <br>
 
-<center><iframe title="YouTube video player" width="640" height="390" src="https://www.youtube.com/embed/ym1eIhprFlU?rel=0" frameborder="0" allowfullscreen></iframe></center>   
+<center><iframe title="YouTube video player" width="640" height="390" src="https://www.youtube.com/embed/Hu7kXKuShks?rel=0" frameborder="0" allowfullscreen></iframe></center>   
 
 <br>
 <br>

gameSource/LivingLifePage.cpp

@@ -655,6 +655,7 @@ static void updatePersonHomeLocation( int inPersonID, int inX, int inY ) {
     }
 
 
+char isAncientHomePosHell = false;
 
 static void addAncientHomeLocation( int inX, int inY ) {
     removeHomeLocation( inX, inY );
@@ -5313,6 +5314,7 @@ ObjectAnimPack LivingLifePage::drawLiveObject(
                 }
 
             // rideable object
+            if( ! heldObject->hideRider )
             holdingPos =
                 drawObjectAnim( inObj->displayID, 2, curType, 
                                 timeVal,
@@ -6221,7 +6223,12 @@ void LivingLifePage::drawHomeSlip( doublePair inSlipPos, int inIndex ) {
         if( inIndex == 1 ) {
             doublePair bellPos = distPos;
             bellPos.y += 20;    
-            handwritingFont->drawString( "BELL", bellPos, alignCenter );
+
+            const char *arrowWord = "BELL";
+            if( isAncientHomePosHell ) {
+                arrowWord = "HELL";
+                }
+            handwritingFont->drawString( arrowWord, bellPos, alignCenter );
             }
 
         if( temporary ) {
@@ -14424,13 +14431,18 @@ void LivingLifePage::step() {
 
                     if( d > 32 ) {
                         addAncientHomeLocation( posX, posY );
+                        isAncientHomePosHell = false;
 
                         // play sound in distance
                         ObjectRecord *monObj = getObject( monumentID );
 
                         if( monObj != NULL && 
                             monObj->creationSound.numSubSounds > 0 ) {    
-
+
+                            if( strstr( monObj->description, "+hellArrow" ) ) {
+                                isAncientHomePosHell = true;
+                                }
+
                             doublePair realVector = 
                                 getVectorFromCamera( lrint( posX ),
                                                      lrint( posY ) );