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

Author: Ayuto

.gitignore

@@ -30,6 +30,7 @@ addons/source-python/bin/
 addons/source-python/data/custom/
 addons/source-python/data/plugins/
 addons/source-python/data/source-python/settings/
+addons/source-python/data/source-python-data.zip
 addons/source-python/packages/custom/
 addons/source-python/plugins/
 cfg/source-python/*

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

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

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

@@ -79,7 +79,7 @@
     elasticity = m_flElasticity
     ground_entity = m_hGroundEntity
     owner_handle = m_hOwnerEntity
-    team = m_iTeamNum
+    team_index = m_iTeamNum
     render_fx = m_nRenderFX
     render_mode_prop = m_nRenderMode
     move_type = movetype

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

@@ -5,13 +5,13 @@ srv_check = False
 
     # _ZN17CBaseCombatWeapon13PrimaryAttackEv
     [[primary_attack]]
-        offset_linux = 314
-        offset_windows = 308
+        offset_linux = 313
+        offset_windows = 307
 
     # _ZN17CBaseCombatWeapon13SecondaryAttackEv
     [[secondary_attack]]
-        offset_linux = 315
-        offset_windows = 309
+        offset_linux = 314
+        offset_windows = 308
 
 
 [property]

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

@@ -18,33 +18,33 @@ srv_check = False
 
     # _ZN11CBasePlayer13GiveNamedItemEPKciP13CEconItemViewb
     [[give_named_item]]
-        offset_linux = 450
-        offset_windows = 449
+        offset_linux = 451
+        offset_windows = 450
         arguments = STRING, INT, POINTER, BOOL
         return_type = POINTER
 
     # _ZN11CBasePlayer21IncrementAssistsCountEi
     [[increment_assists_count]]
-        offset_linux = 492
-        offset_windows = 491
+        offset_linux = 493
+        offset_windows = 492
         arguments = INT
 
     # _ZN11CBasePlayer19IncrementDeathCountEi
     [[increment_death_count]]
-        offset_linux = 493
-        offset_windows = 492
+        offset_linux = 494
+        offset_windows = 493
         arguments = INT
 
     # _ZN11CBasePlayer18IncrementFragCountEii
     [[increment_frag_count]]
-        offset_linux = 491
-        offset_windows = 490
+        offset_linux = 492
+        offset_windows = 491
         arguments = INT, INT
 
     # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
     [[run_command]]
-        offset_linux = 470
-        offset_windows = 469
+        offset_linux = 471
+        offset_windows = 470
         arguments = POINTER, POINTER
 
     # _ZN11CBasePlayer8PreThinkEv
@@ -61,8 +61,8 @@ srv_check = False
 [instance_attribute]
 
     [[assists]]
-        offset_windows = 3908
-        offset_linux = 3932
+        offset_windows = 3816
+        offset_linux = 3840
         type = INT
 
 

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

@@ -10,10 +10,10 @@ srv_check = False
         arguments = INT, BOOL, BOOL, STRING
 
     [[buy_internal]]
-        identifier_windows = 55 8B EC 83 E4 F8 81 EC 7C 01 00 00 53 56 57
+        identifier_windows = 55 8B EC 83 E4 F8 83 EC 0C 53 56 57 6A 01
         # indentifier_linux = _ZN9CCSPlayer26HandleCommand_Buy_InternalEPKcib
-        identifier_linux = 55 89 E5 57 56 53 81 EC 9C 01 00 00 0F B6 55 14
-        arguments = STRING, INT, BOOL
+        identifier_linux = 55 89 E5 83 EC 68 0F B6 55 14
+        arguments = INT, STRING, BOOL
         return_type = INT
 
     [[deafen]]
@@ -43,8 +43,8 @@ srv_check = False
 
     # _ZN9CCSPlayer5BlindEfff
     [[blind]]
-        offset_linux = 541
-        offset_windows = 538
+        offset_linux = 542
+        offset_windows = 539
         arguments = FLOAT, FLOAT, FLOAT
 
 
@@ -56,13 +56,13 @@ srv_check = False
 [instance_attribute]
 
     [[mvps]]
-        offset_windows = 11752
-        offset_linux = 11776
+        offset_windows = 11472
+        offset_linux = 11496
         type = INT
 
     [[clan_tag]]
-        offset_windows = 10588
-        offset_linux = 10612
+        offset_windows = 9524
+        offset_linux = 9548
         type = STRING_ARRAY
 
 

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

@@ -10,6 +10,8 @@
     #       no real way to determine this, unfortunately
     inferno = "molotov"
     knife_default_ct = "knife"
+    usp_silencer_off = "usp_silencer"
+    m4a1_silencer_off = "m4a1_silencer"
 
 
 [projectiles]

addons/source-python/docs/source-python/source/conf.py

@@ -310,9 +310,7 @@
 autodoc_member_order = 'groupwise'
 
 # Directives that should be used by default
-autodoc_default_flags = [
-    'private-members',
-]
+# autodoc_default_flags = []
 
 # Add names (e.g. magic methods) you always want to skip
 names_to_skip = [

addons/source-python/docs/source-python/source/contributing/building.rst

@@ -47,7 +47,7 @@ To build Source.Python on Windows, you need the following requirements:
 
 * `CMake 2.8 or later <https://cmake.org/download/>`_
 * `Git <https://git-scm.com/downloads>`_
-* `Visual C++ 2010 <http://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso>`_
+* `Visual C++ 2010 <https://my.visualstudio.com/Downloads?q=visual%20studio%202010&wt.mc_id=o~msft~vscom~older-downloads>`_
 * `Microsoft Build Tools (optional, to build directly via Build.bat) <https://www.microsoft.com/en-us/download/details.aspx?id=48159>`_
 
 Once you have installed the requirements, follow these steps to build Source.Python:

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

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

addons/source-python/docs/source-python/source/developing/modules/entities.entity.rst

@@ -1,7 +1,12 @@
 entities.entity module
 =======================
 
-.. automodule:: entities._base
+.. autoclass:: _entities._entity.BaseEntity
     :members:
     :undoc-members:
     :show-inheritance:
+    
+.. automodule:: entities._base
+    :members:
+    :undoc-members:
+    :show-inheritance:

addons/source-python/docs/source-python/source/general/installation.rst

@@ -4,8 +4,25 @@ Installation
 Requirements
 ------------
 
-1. On Linux GLIBC 2.17 or later is required. Check your version by typing ``ld -version``.
-2. On Windows `Visual C++ Redistributable for Visual Studio 2015 <https://www.microsoft.com/en-us/download/details.aspx?id=48145>`_ is required. Most machines already have a redistributable installed, so you only need to install it if Source.Python didn't load properly due to the missing redistributable.
+Linux
+^^^^^
+
+1. GLIBC 2.17 or later is required. Check your version by typing ``ld -version``.
+2. The 32 bit version of ``libz.so.1`` and ``libffi.so.6`` is required. See the table below to install the proper packages.
+
+================================= ================================== ======================================
+Distribution                      libz.so.1                          libffi.so.6
+================================= ================================== ======================================
+Debian/Ubuntu 32 bit              apt-get install zlib1g             apt-get install libffi6
+Debian/Ubuntu 64 bit              apt-get install zlib1g:i386        apt-get install libffi6:i386
+================================= ================================== ======================================
+
+
+
+Windows
+^^^^^^^
+
+1. `Visual C++ Redistributable for Visual Studio 2015 <https://www.microsoft.com/en-us/download/details.aspx?id=48145>`_ is required. Most machines already have a redistributable installed, so you only need to install it if Source.Python didn't load properly due to the missing redistributable.
 
 
 Installation steps

addons/source-python/packages/source-python/__init__.py

@@ -26,6 +26,45 @@
 # all respects for all other code used.  Additionally, the Source.Python
 # Development Team grants this exception to all derivative works.
 
+
+# =============================================================================
+# >> FILE ACCESS LOGGER
+# =============================================================================
+# If True, all calls to open() with a path to a Source.Python data file will be
+# logged in ../logs/file_access.log. The log entry will contain the file that
+# is being accessed and a full stack trace. The logger will be removed as soon
+# as setup_data_update() is called.
+# This is a debug option to ensure that no data files are being accessed before
+# the data has been updated. Release builds should have this option set to
+# False.
+LOG_FILE_OPERATIONS = False
+
+if LOG_FILE_OPERATIONS:
+    import builtins
+    import traceback
+    from paths import SP_DATA_PATH
+    from paths import LOG_PATH
+
+    LOG_FILE = LOG_PATH / 'file_access.log'
+
+    # Clear log file
+    LOG_FILE.open('w').close()
+
+    old_open = builtins.open
+
+    def new_open(f, *args, **kwargs):
+        if isinstance(f, str) and f.startswith(SP_DATA_PATH):
+            print(f)
+            with LOG_FILE.open('a') as log_f:
+                log_f.write('File access: {}\n'.format(f))
+                traceback.print_stack(file=log_f)
+                log_f.write('\n\n')
+
+        return old_open(f, *args, **kwargs)
+
+    builtins.open = new_open
+
+
 # =============================================================================
 # >> IMPORTS
 # =============================================================================
@@ -46,8 +85,10 @@ def load():
     setup_stdout_redirect()
     setup_core_settings()
     setup_logging()
-    setup_hooks()
+    setup_exception_hooks()
+    setup_data_update()
     setup_translations()
+    setup_data()
     setup_global_pointers()
     setup_sp_command()
     setup_auth()
@@ -65,6 +106,71 @@ def unload():
     unload_auth()
 
 
+# =============================================================================
+# >> DATA UPDATE
+# =============================================================================
+def setup_data_update():
+    """Setup data update."""
+    _sp_logger.log_debug('Setting up data update...')
+
+    if LOG_FILE_OPERATIONS:
+        builtins.open = old_open
+
+    from core.settings import _core_settings
+
+    if not _core_settings.auto_data_update:
+        _sp_logger.log_debug('Automatic data updates are disable.')
+        return
+
+    _sp_logger.log_info('Checking for data updates...')
+
+    from core.update import is_new_data_available, update_data
+    from translations.manager import language_manager
+
+    try:
+        if is_new_data_available():
+            _sp_logger.log_info('New data is available. Downloading...')
+            update_data()
+
+            # languages.ini is loaded before the data has been updated. Thus,
+            # we need to reload the file.
+            language_manager.reload()
+        else:
+            _sp_logger.log_info('No new data is available.')
+    except:
+        _sp_logger.log_exception(
+            'An error occured during the data update.', exc_info=True)
+
+def setup_data():
+    """Setup data."""
+    _sp_logger.log_debug('Setting up data...')
+
+    from core import GameConfigObj
+    from memory.manager import manager
+    from paths import SP_DATA_PATH
+
+    import players
+    players.BaseClient = manager.create_type_from_dict(
+        'BaseClient',
+        GameConfigObj(SP_DATA_PATH / 'client' / 'CBaseClient.ini'))
+
+    import listeners
+    listeners.BaseEntityOutput = manager.create_type_from_dict(
+        'BaseEntityOutput',
+        GameConfigObj(SP_DATA_PATH / 'entity_output' / 'CBaseEntityOutput.ini'))
+
+    try:
+        _fire_output = listeners.BaseEntityOutput.fire_output
+    except AttributeError:
+        from warnings import warn
+        warn(
+            'BaseEntityOutput.fire_output not found. '
+            'OnEntityOutput listener will not fire.'
+        )
+    else:
+        _fire_output.add_pre_hook(listeners._pre_fire_output)
+
+
 # =============================================================================
 # >> CORE SETTINGS
 # =============================================================================
@@ -121,24 +227,13 @@ def setup_logging():
 # =============================================================================
 # >> HOOKS
 # =============================================================================
-def setup_hooks():
+def setup_exception_hooks():
     """Set up hooks."""
-    _sp_logger.log_debug('Setting up hooks...')
+    _sp_logger.log_debug('Setting up exception hooks...')
 
     from hooks.exceptions import except_hooks
     from hooks.warnings import warning_hooks
 
-    # This is added to warn about BaseEntityOutput.fire_output.
-    # Sending the warning on its initial import will happen prior
-    #   to these hooks being setup.
-    from listeners._entity_output import _fire_output
-    if _fire_output is None:
-        from warnings import warn
-        warn(
-            'BaseEntityOutput.fire_output not found.  '
-            'OnEntityOutput listener will not fire.'
-        )
-
 
 # =============================================================================
 # >> TRANSLATIONS
@@ -390,6 +485,15 @@ def flush(self):
     if sys.stderr is None:
         sys.stderr = OutputRedirect()
 
+    from engines.server import engine_server
+
+    if not engine_server.is_dedicated_server():
+        # Return here for listen servers, because we only want to see the
+        # warning if reconnecting the output streams failed, which is only
+        # done on dedicated servers. For listen servers creating OutputRedirect
+        # instances is the proper fix.
+        return
+
     from warnings import warn
     warn(
         'sys.stdout and/or sys.stderr is None. All data will be redirected through '