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

Author: Ayuto

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

@@ -83,3 +83,4 @@
     render_fx = m_nRenderFX
     render_mode_prop = m_nRenderMode
     move_type = movetype
+    parent_inthandle = m_pParent

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

@@ -0,0 +1,11 @@
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 294
+        offset_windows = 293
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 295
+        offset_windows = 294

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

@@ -1,3 +1,19 @@
+srv_check = False
+
+
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 313
+        offset_windows = 307
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 314
+        offset_windows = 308
+
+
 [property]
 
     primary_ammo_count = m_iPrimaryReserveAmmoCount

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

@@ -4,9 +4,9 @@ srv_check = False
 [function]
 
     [[add_account]]
-        identifier_windows = 55 8B EC 83 E4 F8 83 EC 3C 53 56 8B F1 57 8B 06 8B 80 2A 2A 2A 2A FF D0
+        identifier_windows = 55 8B EC 83 E4 F8 83 EC 44 53 56 8B F1 57 8B 06
         # identifier_linux = _ZN9CCSPlayer10AddAccountEibbPKc
-        identifier_linux = 55 89 E5 57 56 53 81 EC 8C 00 00 00 8B 5D 08 0F B6 55 14
+        identifier_linux = 55 89 E5 57 56 53 81 EC BC 00 00 00 8B 5D 08 0F B6 45 10
         arguments = INT, BOOL, BOOL, STRING
 
     [[buy_internal]]

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

@@ -0,0 +1,11 @@
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 282
+        offset_windows = 281
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 283
+        offset_windows = 282

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

@@ -1,11 +1,11 @@
 [virtual_function]
 
-    # _ZN6CKnife13PrimaryAttackEv
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
     [[primary_attack]]
         offset_linux = 274
         offset_windows = 273
 
-    # _ZN6CKnife15SecondaryAttackEv
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
     [[secondary_attack]]
         offset_linux = 275
         offset_windows = 274

addons/source-python/data/source-python/entities/orangebox/cstrike/CKnife.ini renamed to addons/source-python/data/source-python/entities/orangebox/cstrike/CBaseCombatWeapon.ini

@@ -0,0 +1,11 @@
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 274
+        offset_windows = 273
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 275
+        offset_windows = 274

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

@@ -0,0 +1,11 @@
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 274
+        offset_windows = 273
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 275
+        offset_windows = 274

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

@@ -0,0 +1,11 @@
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 283
+        offset_windows = 282
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 284
+        offset_windows = 283