Browse Source

minor typos

Johnathan Jenkins 9 years ago
parent
commit
d78fc4020f
39 changed files with 54 additions and 54 deletions
  1. 1 1
      CMake/Modules/CheckHost.cmake
  2. 1 1
      CMake/Modules/GenerateExportHeader.cmake
  3. 1 1
      CMake/Modules/Urho3D-CMake-common.cmake
  4. 2 2
      CMake/Toolchains/emscripten.toolchain.cmake
  5. 1 1
      Docs/Doxyfile.in
  6. 1 1
      Docs/GettingStarted.dox
  7. 2 2
      Docs/Reference.dox
  8. 3 3
      Source/Extras/OgreMaxscriptExport/ogre/lib/OgreBipedLib.ms
  9. 3 3
      Source/Extras/OgreMaxscriptExport/ogre/lib/OgreSkeletonLib_skelfns.ms
  10. 1 1
      Source/Samples/07_Billboards/Billboards.cpp
  11. 1 1
      Source/Samples/18_CharacterDemo/Character.cpp
  12. 2 2
      Source/Samples/43_HttpRequestDemo/HttpRequestDemo.cpp
  13. 2 2
      Source/Tools/SpritePacker/SpritePacker.cpp
  14. 3 3
      Source/Urho3D/AngelScript/Addons.cpp
  15. 1 1
      Source/Urho3D/Graphics/OpenGL/OGLGraphics.cpp
  16. 1 1
      Source/Urho3D/Graphics/Renderer.cpp
  17. 1 1
      Source/Urho3D/LuaScript/pkgs/ToDoxHook.lua
  18. 3 3
      Source/Urho3D/LuaScript/pkgs/ToZerobraneStudioHook.lua
  19. 1 1
      Source/Urho3D/Math/Color.h
  20. 1 1
      Source/Urho3D/Math/Ray.cpp
  21. 1 1
      Source/Urho3D/Navigation/CrowdManager.cpp
  22. 1 1
      Source/Urho3D/Navigation/DynamicNavigationMesh.h
  23. 1 1
      Source/Urho3D/Scene/Animatable.h
  24. 1 1
      Source/Urho3D/Scene/Node.cpp
  25. 1 1
      Source/Urho3D/Scene/ValueAnimation.cpp
  26. 1 1
      Source/Urho3D/UI/ListView.h
  27. 2 2
      Source/Urho3D/UI/UIElement.h
  28. 1 1
      Source/Urho3D/Urho2D/ConstraintMouse2D.h
  29. 1 1
      Source/Urho3D/Urho2D/TileMapDefs2D.h
  30. 1 1
      bin/Data/LuaScripts/02_HelloGUI.lua
  31. 1 1
      bin/Data/LuaScripts/07_Billboards.lua
  32. 1 1
      bin/Data/LuaScripts/18_CharacterDemo.lua
  33. 2 2
      bin/Data/LuaScripts/43_HttpRequestDemo.lua
  34. 1 1
      bin/Data/Scripts/02_HelloGUI.as
  35. 1 1
      bin/Data/Scripts/07_Billboards.as
  36. 1 1
      bin/Data/Scripts/18_CharacterDemo.as
  37. 2 2
      bin/Data/Scripts/43_HttpRequestDemo.as
  38. 1 1
      bin/Data/Scripts/Editor/EditorScene.as
  39. 1 1
      bin/Data/Scripts/NinjaSnowWar/GameObject.as

+ 1 - 1
CMake/Modules/CheckHost.cmake

@@ -74,7 +74,7 @@ else ()
     endif ()
     if ("$ENV{USE_CCACHE}" AND NOT DEFINED CCACHE_VERSION)
         execute_process (COMMAND ccache --version COMMAND head -1 RESULT_VARIABLE CCACHE_EXIT_CODE OUTPUT_VARIABLE CCACHE_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-        string (REGEX MATCH "[^ .]+\\.[^.]+\\.[^ ]+" CCACHE_VERSION "${CCACHE_VERSION}")    # Stringify as it could be empty when an error has occured
+        string (REGEX MATCH "[^ .]+\\.[^.]+\\.[^ ]+" CCACHE_VERSION "${CCACHE_VERSION}")    # Stringify as it could be empty when an error has occurred
         if (CCACHE_EXIT_CODE EQUAL 0)
            set (CCACHE_VERSION ${CCACHE_VERSION} CACHE INTERNAL "ccache version")
        endif ()

+ 1 - 1
CMake/Modules/GenerateExportHeader.cmake

@@ -78,7 +78,7 @@
 # ``OTHER_NAME_EXPORT``, ``OTHER_NAME_NO_EXPORT`` and ``OTHER_NAME_DEPRECATED``
 # etc.
 #
-# The ``BASE_NAME`` may be overridden by specifiying other options in the
+# The ``BASE_NAME`` may be overridden by specifying other options in the
 # function.  For example:
 #
 # .. code-block:: cmake

+ 1 - 1
CMake/Modules/Urho3D-CMake-common.cmake

@@ -833,7 +833,7 @@ macro (create_symlink SOURCE DESTINATION)
             # Fallback to copy only one time
             execute_process (${COMMAND})
             if (TARGET ${TARGET_NAME})
-                # Fallback to copy everytime the target is built
+                # Fallback to copy every time the target is built
                 add_custom_command (TARGET ${TARGET_NAME} POST_BUILD ${COMMAND})
             endif ()
         else ()

+ 2 - 2
CMake/Toolchains/emscripten.toolchain.cmake

@@ -53,7 +53,7 @@ endif ()
 if (NOT EMCC_VERSION)
     execute_process (COMMAND ${EMSCRIPTEN_ROOT_PATH}/emcc${TOOL_EXT} --version RESULT_VARIABLE EXIT_CODE OUTPUT_VARIABLE EMCC_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
     if (EXIT_CODE EQUAL 0)
-        string (REGEX MATCH "[^ .]+\\.[^.]+\\.[^ ]+" EMCC_VERSION "${EMCC_VERSION}")    # Stringify as it could be empty when an error has occured
+        string (REGEX MATCH "[^ .]+\\.[^.]+\\.[^ ]+" EMCC_VERSION "${EMCC_VERSION}")    # Stringify as it could be empty when an error has occurred
     else ()
         message (FATAL_ERROR "Could not determine the emcc version. Make sure you have installed and activated the Emscripten SDK correctly.")
     endif ()
@@ -118,7 +118,7 @@ foreach (LANG C CXX)
     # The ABI info could not be checked as per normal as CMake does not understand the test build output from Emscripten, so bypass it also
     set (CMAKE_${LANG}_ABI_COMPILED TRUE)
     set (CMAKE_${LANG}_SIZEOF_DATA_PTR 4)   # Assume it is always 32-bit for now (we could have used our CheckCompilerToolChains.cmake module here)
-    # There could be a bug in CMake itself where setting CMAKE_EXECUTABLE_SUFFIX variable outside of the scope, where it processes the platform configuration files, does not being honored by try_compile() command and as a result all the check macros that depend on try_compile() do not work properly when the CMAKE_EXECUTABLE_SUFFIX variable is only being set later futher down the road; At least one of the CMake devs has the opinion that this is the intended behavior but it is an unconvincing explanation because setting CMAKE_EXECUTABLE_SUFFIX variable later does have the desired effect everywhere else EXCEPT the try_compile() command
+    # There could be a bug in CMake itself where setting CMAKE_EXECUTABLE_SUFFIX variable outside of the scope, where it processes the platform configuration files, does not being honored by try_compile() command and as a result all the check macros that depend on try_compile() do not work properly when the CMAKE_EXECUTABLE_SUFFIX variable is only being set later further down the road; At least one of the CMake devs has the opinion that this is the intended behavior but it is an unconvincing explanation because setting CMAKE_EXECUTABLE_SUFFIX variable later does have the desired effect everywhere else EXCEPT the try_compile() command
     # We are forced to set CMAKE_EXECUTABLE_SUFFIX_C and CMAKE_EXECUTABLE_SUFFIX_CXX here as a workaround; we could not just set CMAKE_EXECUTABLE_SUFFIX directly because CMake processes platform configuration files after the toolchain file and since we tell CMake that we are cross-compiling for 'Linux' platform via CMAKE_SYSTEM_NAME variable, CMake initializes the CMAKE_EXECUTABLE_SUFFIX to empty string (as expected for Linux platform); the workaround avoids our setting from being overwritten by platform configuration files by using the C and CXX language variants of the variable
     # The executable suffix needs to be .js for the below Emscripten-specific compiler setting to be effective
     set (CMAKE_EXECUTABLE_SUFFIX_${LANG} .js)

+ 1 - 1
Docs/Doxyfile.in

@@ -1670,7 +1670,7 @@ UML_LOOK               = NO
 # the class node. If there are many fields or methods and many nodes the 
 # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS 
 # threshold limits the number of items for each type to make the size more 
-# managable. Set this to 0 for no limit. Note that the threshold may be 
+# manageable. Set this to 0 for no limit. Note that the threshold may be 
 # exceeded by 50% before the limit is enforced.
 
 UML_LIMIT_NUM_FIELDS   = 10

+ 1 - 1
Docs/GettingStarted.dox

@@ -662,7 +662,7 @@ The default <generator> when not specified is 'generic', which let CMake to dete
 
 The default <platform> when not specified is 'native'. The possible values are: 'android', 'web', 'ios', 'mingw', 'rpi'. Naturally this influences the compiler toolchain being used in the generated build tree.
 
-When using the 'rake cmake' task, the <option>=\<value> pairs are optional build options supported by our build scripts as usual. However, the format here does not expect a leading '-D' for each pair. When using the 'rake make' task, the <option>=\<value> pairs are optional build options supported by the respective build tools. For example on iOS platform using 'xcodebuild' build tool, one could pass the '-sdk' option as follows: 'rake make ios sdk=iphonesimulator'. Note the absense of leading '-' character in the example. To build a specific built-in target in the project, use the 'target' option, e.g. 'rake make target=install'. In a multi-config project, such as Xcode project or VS solution, use the 'config' option to choose which build configuration to use, e.g. 'rake make config=Release'. For Xcode project building using 'rake make' task, you may optional install the 'xcpretty' filter to address the verbosity of the 'xcodebuild' tool from its standard output stream. On the other hand, pass the 'unfilter' option to get the output from 'xcodebuild' tool unfiltered regardless the 'xcpretty' is installed or not. You can pass the 'clean_first' option to perform a clean build. By default this task invokes the respective build tool to use all the logical CPU cores available, but you can use the 'numjobs' option to override this default.
+When using the 'rake cmake' task, the <option>=\<value> pairs are optional build options supported by our build scripts as usual. However, the format here does not expect a leading '-D' for each pair. When using the 'rake make' task, the <option>=\<value> pairs are optional build options supported by the respective build tools. For example on iOS platform using 'xcodebuild' build tool, one could pass the '-sdk' option as follows: 'rake make ios sdk=iphonesimulator'. Note the absence of leading '-' character in the example. To build a specific built-in target in the project, use the 'target' option, e.g. 'rake make target=install'. In a multi-config project, such as Xcode project or VS solution, use the 'config' option to choose which build configuration to use, e.g. 'rake make config=Release'. For Xcode project building using 'rake make' task, you may optional install the 'xcpretty' filter to address the verbosity of the 'xcodebuild' tool from its standard output stream. On the other hand, pass the 'unfilter' option to get the output from 'xcodebuild' tool unfiltered regardless the 'xcpretty' is installed or not. You can pass the 'clean_first' option to perform a clean build. By default this task invokes the respective build tool to use all the logical CPU cores available, but you can use the 'numjobs' option to override this default.
 
 Use the 'build_tree' option to set the path to the desired build tree location. When not specified then the build tree location would be defaulted to '../<platform>-Build', relative to the project root. To avoid repeating the customized build tree locations for each platform, you can set and export them as environment variables. The '<platform_>build_tree' option takes precedence over normal 'build_tree' option. For example with these commands below, the native and RPI build tree will be generated in the ~/custom-native-Build and ~/custom-rpi-Build, respectively, and then build from there.
 

+ 2 - 2
Docs/Reference.dox

@@ -2462,7 +2462,7 @@ Box2D fixtures are implemented through the CollisionShape2D base class for 2D ph
 - Friction: \ref CollisionShape2D::SetFriction "SetFriction()" and \ref CollisionShape2D::GetFriction "GetFriction()"
 - Restitution (bounciness): \ref CollisionShape2D::SetRestitution "SetRestitution()" and \ref CollisionShape2D::GetRestitution "GetRestitution()"
 
-CollisionShape2D class also provides readonly acces to these properties:
+CollisionShape2D class also provides readonly access to these properties:
 - Mass: \ref CollisionShape2D::GetMass "GetMass()"
 - Inertia: \ref CollisionShape2D::GetInertia "GetInertia()"
 - Center of mass: \ref CollisionShape2D::GetMassCenter "GetMassCenter()"
@@ -2638,7 +2638,7 @@ Except Tile, objects are not visible (although you can display them for debuggin
 - to create a background from Tile sprites
 - etc.
 
-Additionaly Sprite2D resource from a Tile object is retrieved using \ref TileMapObject2D::GetTileSprite "GetTileSprite()".
+Additionally Sprite2D resource from a Tile object is retrieved using \ref TileMapObject2D::GetTileSprite "GetTileSprite()".
 
 If need be you can access the grid id (relative to the tilesets used) of a Tile object using \ref TileMapObject2D::GetTileGid "GetTileGid()".
 

+ 3 - 3
Source/Extras/OgreMaxscriptExport/ogre/lib/OgreBipedLib.ms

@@ -117,7 +117,7 @@ function writeTrack bone_name boneId firstframe lastframe samplerate IKsamplerat
 	if (not g_MAX) then
 		format "retrieving key information for % ...\n" (bone_name) ;
 
-	-- gets bone acording to the parameter boneId
+	-- gets bone according to the parameter boneId
 	bname = bone_name ;
 	replaceSpaces bname ;
 	d = getNodeByName bname ;
@@ -184,7 +184,7 @@ function writeTrack bone_name boneId firstframe lastframe samplerate IKsamplerat
 				Tform = flipYZTransform Tform ;
 			)
 			
-			-- substracts position of the initial transform
+			-- subtracts position of the initial transform
 			Tform.pos -= initTform.pos ;
 			Tform.pos = Tform.pos * scale ;
 			
@@ -368,7 +368,7 @@ function computeBonesList phy sk exportHelpers =
 ------------------
 function writeB bone_name id scale flipYZ outFile =
 (
-	-- gets bone acording to the parameter boneId
+	-- gets bone according to the parameter boneId
 	bname = bone_name ;
 	replaceSpaces bname;
 	d = getNodeByName bname ;

+ 3 - 3
Source/Extras/OgreMaxscriptExport/ogre/lib/OgreSkeletonLib_skelfns.ms

@@ -53,7 +53,7 @@ function writeTrack sk boneId firstframe lastframe length scale flipYZ outFile=
 	-- displays information in the maxscript listener
 	format "retrieving key information for % ...\n" (skinOps.GetBoneName sk boneId 1) ;
 	
-	-- gets bone acording to the parameter boneId
+	-- gets bone according to the parameter boneId
 	bname= skinOps.GetBoneName sk boneId 1 ;
 	replaceSpaces bname ;
 	d = getNodeByName bname ;
@@ -114,7 +114,7 @@ function writeTrack sk boneId firstframe lastframe length scale flipYZ outFile=
 				Tform = flipYZTransform Tform ;
 			)
 			
-			-- substracts position of the initial transform
+			-- subtracts position of the initial transform
 			Tform.pos -= initTform.pos ;
 			Tform.pos = Tform.pos * scale ;
 			
@@ -151,7 +151,7 @@ function writeTrack sk boneId firstframe lastframe length scale flipYZ outFile=
 
 function writeB sk id scale flipYZ outFile =
 (
-	-- gets bone acording to the parameter boneId
+	-- gets bone according to the parameter boneId
 	bname= skinOps.GetBoneName sk id 1 ;
 	replaceSpaces bname ;
 	d = getNodeByName bname ;

+ 1 - 1
Source/Samples/07_Billboards/Billboards.cpp

@@ -160,7 +160,7 @@ void Billboards::CreateScene()
             bb->enabled_ = true;
         }
 
-        // After modifying the billboards, they need to be "commited" so that the BillboardSet updates its internals
+        // After modifying the billboards, they need to be "committed" so that the BillboardSet updates its internals
         billboardObject->Commit();
     }
 

+ 1 - 1
Source/Samples/18_CharacterDemo/Character.cpp

@@ -103,7 +103,7 @@ void Character::FixedUpdate(float timeStep)
         Vector3 brakeForce = -planeVelocity * BRAKE_FORCE;
         body->ApplyImpulse(brakeForce);
 
-        // Jump. Must release jump control inbetween jumps
+        // Jump. Must release jump control between jumps
         if (controls_.IsDown(CTRL_JUMP))
         {
             if (okToJump_)

+ 2 - 2
Source/Samples/43_HttpRequestDemo/HttpRequestDemo.cpp

@@ -91,10 +91,10 @@ void HttpRequestDemo::HandleUpdate(StringHash eventType, VariantMap& eventData)
         // Initializing HTTP request
         if (httpRequest_->GetState() == HTTP_INITIALIZING)
             return;
-        // An error has occured
+        // An error has occurred
         else if (httpRequest_->GetState() == HTTP_ERROR)
         {
-            text_->SetText("An error has occured.");
+            text_->SetText("An error has occurred.");
             UnsubscribeFromEvent("Update");
         }
         // Get message data

+ 2 - 2
Source/Tools/SpritePacker/SpritePacker.cpp

@@ -168,7 +168,7 @@ void Run(Vector<String>& arguments)
         ErrorExit("An input and output file must be specified.");
 
     if (frameWidth ^ frameHeight)
-        ErrorExit("Both frameHeight and frameWidth must be ommited or specified.");
+        ErrorExit("Both frameHeight and frameWidth must be omitted or specified.");
 
     // take last input file as output
     if (inputFiles.Size() > 1)
@@ -362,7 +362,7 @@ void Run(Vector<String>& arguments)
             subTexture.SetInt("offsetY", packerInfo->offsetY);
         }
 
-        URHO3D_LOGINFO("Transfering " + packerInfo->path + " to sprite sheet.");
+        URHO3D_LOGINFO("Transferring " + packerInfo->path + " to sprite sheet.");
 
         File file(context, packerInfo->path);
         Image image(context);

+ 3 - 3
Source/Urho3D/AngelScript/Addons.cpp

@@ -927,7 +927,7 @@ bool CScriptArray::operator==(const CScriptArray &other) const
         if( cmpContext == 0 )
         {
             // TODO: Ideally this context would be retrieved from a pool, so we don't have to
-            //       create a new one everytime. We could keep a context with the array object
+            //       create a new one every time. We could keep a context with the array object
             //       but that would consume a lot of resources as each context is quite heavy.
             cmpContext = objType->GetEngine()->CreateContext();
         }
@@ -1136,7 +1136,7 @@ int CScriptArray::Find(asUINT startAt, void *value) const
         if( cmpContext == 0 )
         {
             // TODO: Ideally this context would be retrieved from a pool, so we don't have to
-            //       create a new one everytime. We could keep a context with the array object
+            //       create a new one every time. We could keep a context with the array object
             //       but that would consume a lot of resources as each context is quite heavy.
             cmpContext = objType->GetEngine()->CreateContext();
         }
@@ -1309,7 +1309,7 @@ void CScriptArray::Sort(asUINT startAt, asUINT count, bool asc)
         if( cmpContext == 0 )
         {
             // TODO: Ideally this context would be retrieved from a pool, so we don't have to
-            //       create a new one everytime. We could keep a context with the array object
+            //       create a new one every time. We could keep a context with the array object
             //       but that would consume a lot of resources as each context is quite heavy.
             cmpContext = objType->GetEngine()->CreateContext();
         }

+ 1 - 1
Source/Urho3D/Graphics/OpenGL/OGLGraphics.cpp

@@ -1839,7 +1839,7 @@ void Graphics::SetDepthBias(float constantBias, float slopeScaledBias)
 #ifndef GL_ES_VERSION_2_0
         if (slopeScaledBias != 0.0f)
         {
-            // OpenGL constant bias is unreliable and dependant on depth buffer bitdepth, apply in the projection matrix instead
+            // OpenGL constant bias is unreliable and dependent on depth buffer bitdepth, apply in the projection matrix instead
             glEnable(GL_POLYGON_OFFSET_FILL);
             glPolygonOffset(slopeScaledBias, 0.0f);
         }

+ 1 - 1
Source/Urho3D/Graphics/Renderer.cpp

@@ -687,7 +687,7 @@ void Renderer::Update(float timeStep)
         LoadShaders();
 
     // Queue update of the main viewports. Use reverse order, as rendering order is also reverse
-    // to render auxiliary views before dependant main views
+    // to render auxiliary views before dependent main views
     for (unsigned i = viewports_.Size() - 1; i < viewports_.Size(); --i)
         QueueViewport(0, viewports_[i]);
 

+ 1 - 1
Source/Urho3D/LuaScript/pkgs/ToDoxHook.lua

@@ -533,7 +533,7 @@ function writeFunction(file, func)
       local declaration = func.declarations[i]
       if declaration.type ~= "void" then
         line = line .. declaration.type .. declaration.ptr .. " " .. declaration.name
-        -- add paramter default value
+        -- add parameter default value
         if declaration.def ~= "" then
           line = line .. " = " .. declaration.def
         end

+ 3 - 3
Source/Urho3D/LuaScript/pkgs/ToZerobraneStudioHook.lua

@@ -95,15 +95,15 @@ function writeFunctionArgs(file, declarations)
   for i = 1, count do
     local declaration = declarations[i]
     if declaration.type ~= "void" then
-      -- add paramter type
+      -- add parameter type
       local param_str = declaration.type
       -- add pointer or reference
       if declaration.ptr ~= "" then
         param_str = param_str .. declaration.ptr
       end
-      -- add paramter name
+      -- add parameter name
       param_str = param_str .. " " .. declaration.name
-      -- add paramter default value
+      -- add parameter default value
       if declaration.def ~= "" then
         param_str = param_str .. " = " .. declaration.def
       end

+ 1 - 1
Source/Urho3D/Math/Color.h

@@ -115,7 +115,7 @@ public:
     /// Return negation.
     Color operator -() const { return Color(-r_, -g_, -b_, -a_); }
 
-    /// Substract a color.
+    /// Subtract a color.
     Color operator -(const Color& rhs) const { return Color(r_ - rhs.r_, g_ - rhs.g_, b_ - rhs.b_, a_ - rhs.a_); }
 
     /// Add-assign a color.

+ 1 - 1
Source/Urho3D/Math/Ray.cpp

@@ -392,7 +392,7 @@ bool Ray::InsideGeometry(const void* vertexData, unsigned vertexSize, unsigned v
 
     // If the closest face is a backface, that means that the ray originates from the inside of the geometry
     // NOTE: there may be cases where both are equal, as in, no collision to either. This is prevented in the most likely case
-    // (ray doesnt hit either) by this conditional
+    // (ray doesn't hit either) by this conditional
     if (currentFrontFace != M_INFINITY || currentBackFace != M_INFINITY)
         return currentBackFace < currentFrontFace;
 

+ 1 - 1
Source/Urho3D/Navigation/CrowdManager.cpp

@@ -276,7 +276,7 @@ void CrowdManager::SetQueryFilterTypesAttr(const VariantVector& value)
             unsigned prevNumAreas = numAreas_[queryFilterType];
             numAreas_[queryFilterType] = Min(value[index++].GetUInt(), (unsigned)DT_MAX_AREAS);
 
-            // Must loop thru based on previous number of areas, the new area cost (if any) can only be set in the next attribute get/set iteration
+            // Must loop through based on previous number of areas, the new area cost (if any) can only be set in the next attribute get/set iteration
             if (index + prevNumAreas <= value.Size())
             {
                 for (unsigned i = 0; i < prevNumAreas; ++i)

+ 1 - 1
Source/Urho3D/Navigation/DynamicNavigationMesh.h

@@ -116,7 +116,7 @@ private:
     UniquePtr<dtTileCacheAlloc> allocator_;
     /// Used by dtTileCache to compress the original tiles to use when reconstructing for changes.
     UniquePtr<dtTileCacheCompressor> compressor_;
-    /// Mesh processer used by Detour, in this case a 'pass-through' processor.
+    /// Mesh processor used by Detour, in this case a 'pass-through' processor.
     UniquePtr<dtTileCacheMeshProcess> meshProcessor_;
     /// Maximum number of obstacle objects allowed.
     unsigned maxObstacles_;

+ 1 - 1
Source/Urho3D/Scene/Animatable.h

@@ -47,7 +47,7 @@ public:
     /// Destruct.
     ~AttributeAnimationInfo();
 
-    /// Return attribute infomation.
+    /// Return attribute information.
     const AttributeInfo& GetAttributeInfo() const { return attributeInfo_; }
 
 protected:

+ 1 - 1
Source/Urho3D/Scene/Node.cpp

@@ -803,7 +803,7 @@ void Node::AddChild(Node* node, unsigned index)
         parent = parent->parent_;
     }
 
-    // Keep a shared ptr to the node while transfering
+    // Keep a shared ptr to the node while transferring
     SharedPtr<Node> nodeShared(node);
     Node* oldParent = node->parent_;
     if (oldParent)

+ 1 - 1
Source/Urho3D/Scene/ValueAnimation.cpp

@@ -530,7 +530,7 @@ Variant ValueAnimation::SubstractAndMultiply(const Variant& value1, const Varian
         return (value1.GetDouble() - value2.GetDouble()) * t;
 
     default:
-        URHO3D_LOGERROR("Invalid value type for spline interpolation's substract and multiply operation");
+        URHO3D_LOGERROR("Invalid value type for spline interpolation's subtract and multiply operation");
         return Variant::EMPTY;
     }
 }

+ 1 - 1
Source/Urho3D/UI/ListView.h

@@ -124,7 +124,7 @@ public:
     PODVector<UIElement*> GetSelectedItems() const;
     /// Return whether an item at index is seleccted.
     bool IsSelected(unsigned index) const;
-    /// Return whether an item at index has its children expanded (in hierachy mode only).
+    /// Return whether an item at index has its children expanded (in hierarchy mode only).
     bool IsExpanded(unsigned index) const;
 
     /// Return highlight mode.

+ 2 - 2
Source/Urho3D/UI/UIElement.h

@@ -92,9 +92,9 @@ enum LayoutMode
 /// Traversal mode for rendering.
 enum TraversalMode
 {
-    /// Traverse thru children having same priority first and recurse into their children before traversing children having higher priority.
+    /// Traverse through children having same priority first and recurse into their children before traversing children having higher priority.
     TM_BREADTH_FIRST = 0,
-    /// Traverse thru each child and its children immediately after in sequence.
+    /// Traverse through each child and its children immediately after in sequence.
     TM_DEPTH_FIRST
 };
 

+ 1 - 1
Source/Urho3D/Urho2D/ConstraintMouse2D.h

@@ -69,7 +69,7 @@ private:
     b2MouseJointDef jointDef_;
     /// Target.
     Vector2 target_;
-    /// Target setted.
+    /// Target set.
     bool targetSetted_;
 };
 

+ 1 - 1
Source/Urho3D/Urho2D/TileMapDefs2D.h

@@ -66,7 +66,7 @@ struct URHO3D_API TileMapInfo2D
     /// Convert tile index to position.
     Vector2 TileIndexToPosition(int x, int y) const;
     /// Convert position to tile index, if out of map return false.
-    bool PositionToTileIndex(int& x, int& y, const Vector2& positon) const;
+    bool PositionToTileIndex(int& x, int& y, const Vector2& position) const;
 };
 
 /// Tile map layer type.

+ 1 - 1
bin/Data/LuaScripts/02_HelloGUI.lua

@@ -136,7 +136,7 @@ function CreateDraggableFish()
     -- See "Event list" in documentation's Main Page for reference on available Events and their eventData
     SubscribeToEvent(draggableFish, "DragBegin",
         function (eventType, eventData)
-            -- Get UIElement relative position where input (touch or click) occured (top-left = IntVector2(0,0))
+            -- Get UIElement relative position where input (touch or click) occurred (top-left = IntVector2(0,0))
             dragBeginPosition = IntVector2(eventData["ElementX"]:GetInt(), eventData["ElementY"]:GetInt())
         end)
 

+ 1 - 1
bin/Data/LuaScripts/07_Billboards.lua

@@ -107,7 +107,7 @@ function CreateScene()
             bb.enabled = true
         end
 
-        -- After modifying the billboards, they need to be "commited" so that the BillboardSet updates its internals
+        -- After modifying the billboards, they need to be "committed" so that the BillboardSet updates its internals
         billboardObject:Commit()
 
         table.insert(billboardNodes, smokeNode)

+ 1 - 1
bin/Data/LuaScripts/18_CharacterDemo.lua

@@ -416,7 +416,7 @@ function Character:FixedUpdate(timeStep)
         local brakeForce = planeVelocity * -BRAKE_FORCE
         body:ApplyImpulse(brakeForce)
 
-        -- Jump. Must release jump control inbetween jumps
+        -- Jump. Must release jump control between jumps
         if self.controls:IsDown(CTRL_JUMP) then
             if self.okToJump then
                 body:ApplyImpulse(Vector3(0.0, 1.0, 0.0) * JUMP_FORCE)

+ 2 - 2
bin/Data/LuaScripts/43_HttpRequestDemo.lua

@@ -51,9 +51,9 @@ function HandleUpdate(eventType, eventData)
         -- Initializing HTTP request
         if httpRequest.state == HTTP_INITIALIZING then
             return
-        -- An error has occured
+        -- An error has occurred
         elseif httpRequest.state == HTTP_ERROR then
-            text.text = "An error has occured."
+            text.text = "An error has occurred."
             UnsubscribeFromEvent("Update")
         -- Get message data
         else

+ 1 - 1
bin/Data/Scripts/02_HelloGUI.as

@@ -140,7 +140,7 @@ void CreateDraggableFish()
 
 void HandleDragBegin(StringHash eventType, VariantMap& eventData)
 {
-    // Get UIElement relative position where input (touch or click) occured (top-left = IntVector2(0,0))
+    // Get UIElement relative position where input (touch or click) occurred (top-left = IntVector2(0,0))
     dragBeginPosition = IntVector2(eventData["ElementX"].GetInt(), eventData["ElementY"].GetInt());
 }
 

+ 1 - 1
bin/Data/Scripts/07_Billboards.as

@@ -112,7 +112,7 @@ void CreateScene()
             bb.enabled = true;
         }
 
-        // After modifying the billboards, they need to be "commited" so that the BillboardSet updates its internals
+        // After modifying the billboards, they need to be "committed" so that the BillboardSet updates its internals
         billboardObject.Commit();
     }
 

+ 1 - 1
bin/Data/Scripts/18_CharacterDemo.as

@@ -431,7 +431,7 @@ class Character : ScriptObject
             Vector3 brakeForce = -planeVelocity * BRAKE_FORCE;
             body.ApplyImpulse(brakeForce);
 
-            // Jump. Must release jump control inbetween jumps
+            // Jump. Must release jump control between jumps
             if (controls.IsDown(CTRL_JUMP))
             {
                 if (okToJump)

+ 2 - 2
bin/Data/Scripts/43_HttpRequestDemo.as

@@ -56,10 +56,10 @@ void HandleUpdate(StringHash eventType, VariantMap& eventData)
         // Initializing HTTP request
         if (httpRequest.state == HTTP_INITIALIZING)
             return;
-        // An error has occured
+        // An error has occurred
         else if (httpRequest.state == HTTP_ERROR)
         {
-            text.text = "An error has occured.";
+            text.text = "An error has occurred.";
             UnsubscribeFromEvent("Update");
         }
         // Get message data

+ 1 - 1
bin/Data/Scripts/Editor/EditorScene.as

@@ -1562,7 +1562,7 @@ bool ColorWheelSetupBehaviorForColoring()
             }
             else if (coloringPropertyName == "menuSpecularIntensity")
             {
-               // ColorWheel have only 0-1 range output of V-value(BW), and for huge-range values we devide in and multiply out 
+               // ColorWheel have only 0-1 range output of V-value(BW), and for huge-range values we divide in and multiply out 
                float scaledSpecular = light.specularIntensity * 0.1f; 
                coloringOldScalar = scaledSpecular;
                ShowColorWheelWithColor(Color(scaledSpecular,scaledSpecular,scaledSpecular));

+ 1 - 1
bin/Data/Scripts/NinjaSnowWar/GameObject.as

@@ -118,7 +118,7 @@ class GameObject : ScriptObject
                     onGround = true;
                 else
                 {
-                    // If contact is somewhere inbetween vertical/horizontal, is sliding a slope
+                    // If contact is somewhere between vertical/horizontal, is sliding a slope
                     if (level > 0.1)
                         isSliding = true;
                 }