Merge remote-tracking branch 'refs/remotes/origin/master' into engine_sdk2013

Author: Ayuto

addons/source-python/data/source-python/entities/CBaseCombatCharacter.ini

@@ -13,4 +13,4 @@
 
     gun_offset = m_HackedGunPos
     hitgroup = m_LastHitGroup
-    active_weapon = m_hActiveWeapon
+    active_weapon_handle = m_hActiveWeapon

addons/source-python/data/source-python/entities/CBaseCombatWeapon.ini

@@ -9,7 +9,7 @@
     next_secondary_fire_attack = LocalActiveWeaponData.m_flNextSecondaryAttack
     ammoprop = LocalWeaponData.m_iPrimaryAmmoType
     secondary_fire_ammoprop = LocalWeaponData.m_iSecondaryAmmoType
-    owner = m_hOwner
-    clip = m_iClip1
-    secondary_fire_clip = m_iClip2
+    owner_handle = m_hOwner
+    _clip = m_iClip1
+    _secondary_fire_clip = m_iClip2
     flip_view_model = LocalWeaponData.m_bFlipViewModel

addons/source-python/data/source-python/entities/CBaseEntity.ini

@@ -77,7 +77,7 @@
     render = m_clrRender
     elasticity = m_flElasticity
     ground_entity = m_hGroundEntity
-    owner = m_hOwnerEntity
+    owner_handle = m_hOwnerEntity
     team = m_iTeamNum
     render_fx = m_nRenderFX
     render_mode_prop = m_nRenderMode

addons/source-python/data/source-python/entities/bms/CBaseCombatCharacter.ini

@@ -1,9 +1,8 @@
 [virtual_function]
 
     # _ZN20CBaseCombatCharacter13Weapon_SwitchEP17CBaseCombatWeaponi
-    # TODO: Validate these offsets.
     [[weapon_switch]]
-        offset_linux = 265
-        offset_windows = 264
+        offset_linux = 283
+        offset_windows = 282
         arguments = POINTER, INT
         return_type = BOOL

addons/source-python/data/source-python/entities/csgo/CBaseCombatWeapon.ini

@@ -0,0 +1,6 @@
+[property]
+
+    primary_ammo_count = m_iPrimaryReserveAmmoCount
+    secondary_ammo_count = m_iSecondaryReserveAmmoCount
+    ammoprop = m_iPrimaryAmmoType
+    secondary_fire_ammoprop = m_iSecondaryAmmoType

addons/source-python/docs/source-python/source/developing/modules/core.command.plugin.rst

@@ -0,0 +1,7 @@
+core.command.plugin module
+===========================
+
+.. automodule:: core.command.plugin
+    :members:
+    :undoc-members:
+    :show-inheritance:

addons/source-python/docs/source-python/source/developing/modules/core.command.rst

@@ -10,6 +10,7 @@ Submodules
    core.command.auth
    core.command.docs
    core.command.dump
+   core.command.plugin
 
 Module contents
 ---------------

addons/source-python/docs/source-python/source/developing/modules/filesystem.rst

@@ -0,0 +1,7 @@
+filesystem module
+==================
+
+.. automodule:: filesystem
+    :members:
+    :undoc-members:
+    :show-inheritance:

addons/source-python/docs/source-python/source/developing/modules/players._base.rst

@@ -0,0 +1,7 @@
+players._base module
+====================
+
+.. automodule:: players._base
+    :members:
+    :undoc-members:
+    :show-inheritance:

addons/source-python/docs/source-python/source/developing/modules/players.engines.csgo.rst

@@ -0,0 +1,10 @@
+players.engines.csgo package
+=============================
+
+Module contents
+---------------
+
+.. automodule:: players.engines.csgo
+    :members:
+    :undoc-members:
+    :show-inheritance:

addons/source-python/docs/source-python/source/developing/modules/players.engines.orangebox.cstrike.rst

@@ -0,0 +1,7 @@
+players.engines.orangebox.cstrike module
+=========================================
+
+.. automodule:: players.engines.orangebox.cstrike
+    :members:
+    :undoc-members:
+    :show-inheritance:

addons/source-python/docs/source-python/source/developing/modules/players.engines.orangebox.rst

@@ -0,0 +1,18 @@
+players.engines.orangebox package
+==================================
+
+Submodules
+----------
+
+.. toctree::
+   :titlesonly:
+
+   players.engines.orangebox.cstrike
+
+Module contents
+---------------
+
+.. automodule:: players.engines.orangebox
+    :members:
+    :undoc-members:
+    :show-inheritance:

addons/source-python/docs/source-python/source/developing/modules/players.engines.rst

@@ -0,0 +1,19 @@
+players.engines package
+========================
+
+Subpackages
+-----------
+
+.. toctree::
+    :titlesonly:
+
+    players.engines.csgo
+    players.engines.orangebox
+
+Module contents
+---------------
+
+.. automodule:: players.engines
+    :members:
+    :undoc-members:
+    :show-inheritance:

addons/source-python/docs/source-python/source/developing/modules/players.games.base.rst

@@ -7,15 +7,15 @@ Subpackages
 .. toctree::
     :titlesonly:
 
-    players.games
-    players.weapons
+    players.engines
 
 Submodules
 ----------
 
 .. toctree::
    :titlesonly:
 
+   players._base
    players.bots
    players.constants
    players.dictionary

addons/source-python/docs/source-python/source/developing/modules/players.games.csgo.rst

@@ -0,0 +1,10 @@
+weapons.engines.csgo package
+=============================
+
+Module contents
+---------------
+
+.. automodule:: weapons.engines.csgo
+    :members:
+    :undoc-members:
+    :show-inheritance:

addons/source-python/docs/source-python/source/developing/modules/players.games.cstrike.rst

@@ -0,0 +1,18 @@
+weapons.engines package
+========================
+
+Subpackages
+-----------
+
+.. toctree::
+    :titlesonly:
+
+    weapons.engines.csgo
+
+Module contents
+---------------
+
+.. automodule:: weapons.engines
+    :members:
+    :undoc-members:
+    :show-inheritance:

addons/source-python/docs/source-python/source/developing/modules/players.games.rst

@@ -10,6 +10,7 @@ Submodules
    weapons.constants
    weapons.default
    weapons.dictionary
+   weapons.engines
    weapons.entity
    weapons.instance
    weapons.manager

addons/source-python/docs/source-python/source/developing/modules/players.rst

@@ -20,8 +20,5 @@
 # Get the sp.auth logger
 auth_logger = _sp_logger.auth
 
-# Get the auth language strings
-_auth_strings = LangStrings('_core/auth_strings')
-
 if not AUTH_CFG_PATH.exists():
     AUTH_CFG_PATH.mkdir()

addons/source-python/docs/source-python/source/developing/modules/players.weapons.projectiles.rst

@@ -1,3 +1,5 @@
+# ../commands/typed.py
+
 #: .. todo:: Add the ability to define prefixes for messages.
 #: .. todo:: Add callback to the Node class. It could be called when a sub-command is required.
 

addons/source-python/docs/source-python/source/developing/modules/players.weapons.rst

@@ -1,4 +1,4 @@
-# ../core/commands/command.py
+# ../core/command/__init__.py
 
 """Registers the "sp" server command and all of its sub-commands."""
 

addons/source-python/docs/source-python/source/developing/modules/players.weapons.types.rst

@@ -5,9 +5,6 @@
 # =============================================================================
 # >> IMPORTS
 # =============================================================================
-# Python Imports
-#   Warnings
-from warnings import warn
 # Source.Python Imports
 #   Commands
 from commands.typed import TypedServerCommand
@@ -29,50 +26,22 @@
 def _sp_plugin_load(command_info, plugin):
     """Load a plugin."""
     _core_command.load_plugin(plugin)
-    
-@_core_command.server_sub_command(['load'])
-def _sp_load(command_info, plugin):
-    """Load a plugin."""
-    warn('"sp load" will be removed soon. Use "sp plugin load" instead.',
-        DeprecationWarning)
-    _core_command.load_plugin(plugin)
 
 @_core_command.server_sub_command(['plugin', 'unload'])
 def _sp_plugin_unload(command_info, plugin):
     """Unload a plugin."""
     _core_command.unload_plugin(plugin)
 
-@_core_command.server_sub_command(['unload'])
-def _sp_unload(command_info, plugin):
-    """Unload a plugin."""
-    warn('"sp unload" will be removed soon. Use "sp plugin unload" instead.',
-        DeprecationWarning)
-    _core_command.unload_plugin(plugin)
-
 @_core_command.server_sub_command(['plugin', 'reload'])
 def _sp_plugin_reload(command_info, plugin):
     """Reload a plugin."""
     _core_command.reload_plugin(plugin)
 
-@_core_command.server_sub_command(['reload'])
-def _sp_reload(command_info, plugin):
-    """Reload a plugin."""
-    warn('"sp reload" will be removed soon. Use "sp plugin reload" instead.',
-        DeprecationWarning)
-    _core_command.reload_plugin(plugin)
-
 @_core_command.server_sub_command(['plugin', 'list'])
 def _sp_plugin_list(command_info):
     """List all currently loaded plugins."""
     _core_command.print_plugins()
 
-@_core_command.server_sub_command(['list'])
-def _sp_list(command_info):
-    """List all currently loaded plugins."""
-    warn('"sp list" will be removed soon. Use "sp plugin list" instead.',
-        DeprecationWarning)
-    _core_command.print_plugins()
-
 
 # =============================================================================
 # >> DESCRIPTIONS