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

Author: Ayuto

LICENSE

@@ -2,6 +2,6 @@
 
 [virtual_function]
     [[set_name]]
-        offset_linux = 66
-        offset_windows = 28
+        offset_linux = 67
+        offset_windows = 29
         arguments = STRING

addons/source-python/data/source-python/client/csgo/CBaseClient.ini

@@ -72,6 +72,7 @@
     maxs = m_Collision.m_vecMaxs
     mins = m_Collision.m_vecMins
     solid_type = m_Collision.m_nSolidType
+    solid_flags = m_Collision.m_usSolidFlags
     collision_group = m_CollisionGroup
     rotation = m_angRotation
     render = m_clrRender

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

@@ -2,8 +2,8 @@
 
     disable = Disable
     enable = Enable
-    end_touch = EndTouch
-    start_touch = StartTouch
+    input_end_touch = EndTouch
+    input_start_touch = StartTouch
     toggle = Toggle
 
 

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

@@ -20,28 +20,6 @@
         arguments = STRING, INT, INT, INT
         return_type = POINTER
 
-    # _ZN11CBasePlayer14FlashlightIsOnEv
-    [[is_flashlight_on]]
-        offset_linux = 375
-        offset_windows = 374
-        return_type = BOOL
-
-    # _ZN11CBasePlayer20SetFlashlightEnabledEb
-    [[set_flashlight]]
-        offset_linux = 374
-        offset_windows = 373
-        arguments = BOOL
-
-    # _ZN11CBasePlayer17FlashlightTurnOffEb
-    [[turn_flashlight_off]]
-        offset_linux = 377
-        offset_windows = 376
-
-    # _ZN11CBasePlayer16FlashlightTurnOnEb
-    [[turn_flashlight_on]]
-        offset_linux = 376
-        offset_windows = 375
-
     # _ZN11CBasePlayer8PreThinkEv
     [[pre_think]]
         offset_linux = 353

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

@@ -41,30 +41,6 @@ srv_check = False
         offset_windows = 489
         arguments = INT, INT
 
-    # _ZN11CBasePlayer14FlashlightIsOnEv
-    [[is_flashlight_on]]
-        offset_linux = 398
-        offset_windows = 397
-        return_type = BOOL
-
-    # _ZN11CBasePlayer20SetFlashlightEnabledEb
-    [[set_flashlight]]
-        offset_linux = 397
-        offset_windows = 396
-        arguments = BOOL
-
-    # _ZN11CBasePlayer17FlashlightTurnOffEb
-    [[turn_flashlight_off]]
-        offset_linux = 400
-        offset_windows = 399
-        arguments = BOOL
-
-    # _ZN11CBasePlayer16FlashlightTurnOnEb
-    [[turn_flashlight_on]]
-        offset_linux = 399
-        offset_windows = 398
-        arguments = BOOL
-
     # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
     [[run_command]]
         offset_linux = 469

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

@@ -20,36 +20,12 @@
         arguments = STRING, INT, BOOL, POINTER
         return_type = POINTER
 
-    # _ZN11CBasePlayer14FlashlightIsOnEv
-    [[is_flashlight_on]]
-        offset_linux = 380
-        offset_windows = 379
-        return_type = BOOL
-
     # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
     [[run_command]]
         offset_linux = 454
         offset_windows = 453
         arguments = POINTER, POINTER
 
-    # _ZN11CBasePlayer20SetFlashlightEnabledEb
-    [[set_flashlight]]
-        offset_linux = 379
-        offset_windows = 378
-        arguments = BOOL
-
-    # _ZN11CBasePlayer17FlashlightTurnOffEb
-    [[turn_flashlight_off]]
-        offset_linux = 382
-        offset_windows = 381
-        arguments = BOOL
-
-    # _ZN11CBasePlayer16FlashlightTurnOnEb
-    [[turn_flashlight_on]]
-        offset_linux = 381
-        offset_windows = 380
-        arguments = BOOL
-
     # _ZN11CBasePlayer8PreThinkEv
     [[pre_think]]
         offset_linux = 356

addons/source-python/data/source-python/entities/l4d2/CBasePlayer.ini

@@ -14,28 +14,6 @@
         arguments = STRING, INT
         return_type = POINTER
 
-    # _ZN11CBasePlayer14FlashlightIsOnEv
-    [[is_flashlight_on]]
-        offset_linux = 355
-        offset_windows = 354
-        return_type = BOOL
-
-    # _ZN11CBasePlayer20SetFlashlightEnabledEb
-    [[set_flashlight]]
-        offset_linux = 354
-        offset_windows = 353
-        arguments = BOOL
-
-    # _ZN11CBasePlayer17FlashlightTurnOffEv
-    [[turn_flashlight_off]]
-        offset_linux = 357
-        offset_windows = 356
-
-    # _ZN11CBasePlayer16FlashlightTurnOnEv
-    [[turn_flashlight_on]]
-        offset_linux = 356
-        offset_windows = 355
-
     # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
     [[run_command]]
         offset_linux = 420

addons/source-python/data/source-python/entities/orangebox/cstrike/CBasePlayer.ini

@@ -19,3 +19,6 @@
         offset_linux = 419
         offset_windows = 418
         arguments = POINTER, POINTER
+
+[property]
+    armor = m_ArmorValue

addons/source-python/data/source-python/entities/orangebox/hl2mp/CBasePlayer.ini

@@ -2,19 +2,19 @@
 
     # _ZN11CBasePlayer11Weapon_DropEP17CBaseCombatWeaponPK6VectorS4_
     [[drop_weapon]]
-        offset_linux = 265
-        offset_windows = 264
+        offset_linux = 266
+        offset_windows = 265
         arguments = POINTER, POINTER, POINTER
 
     # _ZN11CBasePlayer8PreThinkEv
     [[pre_think]]
-        offset_linux = 334
-        offset_windows = 333
+        offset_linux = 336
+        offset_windows = 335
 
     # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
     [[run_command]]
-        offset_linux = 420
-        offset_windows = 419
+        offset_linux = 422
+        offset_windows = 421
         arguments = POINTER, POINTER