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: