Merge branch 'master' into player_settings_update

Author: satoon101

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

@@ -13,3 +13,4 @@
     _clip = m_iClip1
     _secondary_fire_clip = m_iClip2
     flip_view_model = LocalWeaponData.m_bFlipViewModel
+    world_model_index = m_iWorldModelIndex

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

@@ -0,0 +1,4 @@
+[property]
+
+    owner_handle = m_hOwner
+    weapon_handle = m_hWeapon

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

@@ -56,25 +56,34 @@ srv_check = False
 [instance_attribute]
 
     [[mvps]]
-        offset_windows = 9740
-        offset_linux = 9764
+        offset_windows = 9748
+        offset_linux = 9772
         type = INT
 
     [[clan_tag]]
-        offset_windows = 8576
-        offset_linux = 8600
+        offset_windows = 8584
+        offset_linux = 8608
         type = STRING_ARRAY
 
 
 [property]
 
+    stamina = cslocaldata.m_flStamina
+    shots_fired = cslocaldata.m_iShotsFired
     armor = m_ArmorValue
     has_defuser = m_bHasDefuser
+    has_helmet = m_bHasHelmet
     has_nightvision = m_bHasNightVision
+    in_bomb_zone = m_bInBombZone
+    in_buy_zone = m_bInBuyZone
+    in_rescue_zone = m_bInHostageRescueZone
+    is_defusing = m_bIsDefusing
     nightvision_on = m_bNightVisionOn
     flash_duration = m_flFlashDuration
     flash_alpha = m_flFlashMaxAlpha
     cash = m_iAccount
+    player_class = m_iClass
+    player_state = m_iPlayerState
     ragdoll = m_hRagdoll
 
     [[eye_angle]]

addons/source-python/data/source-python/entities/orangebox/tf/CEconEntity.ini

@@ -0,0 +1,3 @@
+[property]
+
+    item_definition_index = m_AttributeManager.m_Item.m_iItemDefinitionIndex

addons/source-python/data/source-python/entities/orangebox/tf/CTFPlayer.ini

@@ -1,3 +1,13 @@
+[virtual_function]
+
+    # _ZN9CTFPlayer10BumpWeaponEP17CBaseCombatWeapon
+    [[bump_weapon]]
+        offset_linux = 400
+        offset_windows = 399
+        arguments = POINTER
+        return_type = BOOL
+
+
 [property]
 
     ragdoll = m_hRagdoll

addons/source-python/data/source-python/weapons/csgo.ini

@@ -9,6 +9,7 @@
     #       can also be incgrenade or even simply setting a player on fire
     #       no real way to determine this, unfortunately
     inferno = "molotov"
+    knife_default_ct = "knife"
 
 
 [projectiles]

addons/source-python/data/source-python/weapons/hl2mp.ini

@@ -3,6 +3,11 @@
     ammoprop = "localdata.m_iAmmo."
     myweapons = "m_hMyWeapons."
 
+
+[special names]
+    npc_tripmine = "slam"
+
+
 [projectiles]
     crossbow_bolt = "crossbow"
     grenade_ar2 = "smg1"

addons/source-python/docs/source-python/source/contributing/reporting-a-bug.rst

@@ -0,0 +1,16 @@
+Reporting a bug
+===============
+
+If you think you found a bug, please let us know! This is very important for
+us, because it helps to improve Source.Python. We prefer bugs to be reported via
+`Github <https://github.com/Source-Python-Dev-Team/Source.Python/issues>`_.
+
+When reporting a bug, please consider the following points:
+
+1. Precisly describe your problem.
+2. Provide the output of the server command ``sp info``.
+3. Post your SP log file.
+4. If your server crashes, add ``-debug`` to your command line and post the resulting ``debug.log``.
+5. Add instructions on how to reproduce the bug.
+
+Thank you!

addons/source-python/docs/source-python/source/general/reporting-a-bug.rst

@@ -26,6 +26,7 @@ General
    general/config-auth
    general/sp-commands
    general/known-issues
+   general/reporting-a-bug
    general/credits
 
 
@@ -51,7 +52,6 @@ Contributing to Source.Python
    contributing/building
    contributing/contributing
    contributing/coding-conventions
-   contributing/reporting-a-bug
    contributing/todos