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

Author: Ayuto

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

@@ -56,13 +56,13 @@ srv_check = False
 [instance_attribute]
 
     [[mvps]]
-        offset_windows = 9708
-        offset_linux = 9732
+        offset_windows = 9740
+        offset_linux = 9764
         type = INT
 
     [[clan_tag]]
-        offset_windows = 8552
-        offset_linux = 8576
+        offset_windows = 8576
+        offset_linux = 8600
         type = STRING_ARRAY
 
 

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

@@ -1,3 +1,12 @@
 [input]
 
     fire_win_condition = FireWinCondition
+
+
+[keyvalue]
+
+    bot_max_vision_distance = botmaxvisiondistance
+    disable_auto_generated_dm_spawns = disableautogenerateddmspawns
+    hostage_count = hostagecount
+    pet_population = petpopulation
+    use_normal_spawns_for_dm = usenormalspawnsfordm

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

@@ -0,0 +1,9 @@
+[input]
+
+    set_timer = SetTimer
+
+
+[property]
+
+    glow_trail = m_pGlowTrail
+    main_glow = m_pMainGlow

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

@@ -0,0 +1,28 @@
+[input]
+
+    explode = Explode
+    fade_and_respawn = FadeAndRespawn
+    socketed = Socketed
+
+
+[property]
+
+    bounce_die = m_bBounceDie
+    capture_in_progress = m_bCaptureInProgress
+    emit = m_bEmit
+    fired_grabbed_output = m_bFiredGrabbedOutput
+    forward = m_bForward
+    held = m_bHeld
+    launched = m_bLaunched
+    struck_entity = m_bStruckEntity
+    weapon_launched = m_bWeaponLaunched
+    last_bounce_time = m_flLastBounceTime
+    last_capture_time = m_flLastCaptureTime
+    next_damage_time = m_flNextDamageTime
+    radius = m_flRadius
+    speed = m_flSpeed
+    spawner = m_hSpawner
+    bounce_count = m_nBounceCount
+    max_bounces = m_nMaxBounces
+    state = m_nState
+    glow_trail = m_pGlowTrail

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

@@ -0,0 +1,71 @@
+Building
+========
+
+On this page you will learn on how to build the Source.Python binaries
+(``source-python.so``, ``source-python.dll``, ``core.so`` and ``core.dll``) on
+your own. This allows you to do tests or contribute to the C++ side of
+Source.Python by applying fixes, making improvements or exposing useful stuff
+to the Python side.
+
+
+Linux
+-----
+
+To build Source.Python on Linux, you need the following requirements:
+
+* `CMake 2.8 or later <https://cmake.org/download/>`_
+* `Git <https://git-scm.com/downloads>`_
+* `GCC (our buildbot uses 4.8) <https://gcc.gnu.org/>`_
+
+Once you have installed the requirements, follow these steps to build Source.Python:
+
+1. Create a clone of the `Source.Python repository <https://github.com/Source-Python-Dev-Team/Source.Python/>`_.
+2. Navigate to the ``src`` directory.
+3. Start the ``Build.sh`` script.
+4. Choose the game for which you want to build Source.Python.
+
+.. note::
+
+    By default only one CPU core is used to build the binaries. If you wish to
+    use more, set the variable ``NUM_CORES`` to the number of core you would
+    like to use. This will speed up the build process, but also requires more
+    ressoures.
+
+You can shorten these steps by simply passing the game's name to the script
+e.g. ``./Build.sh css``.
+
+If the build finished successfully, it will say something like this:
+``[100%] Built target core``.
+
+The compiled binaries are stored in ``src/Builds/Linux/<game>/Release``.
+
+
+Windows
+-------
+
+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>`_
+* `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:
+
+1. Create a clone of the `Source.Python repository <https://github.com/Source-Python-Dev-Team/Source.Python/>`_.
+2. Navigate to the ``src`` directory.
+3. Start the ``Build.bat`` script.
+4. Choose the game for which you want to build Source.Python.
+5. Go to ``src/Builds/Windows/<game>``.
+6. Open ``source-python.sln``.
+7. Switch the build mode to ``Release``.
+8. Hit ``F7`` to start the build.
+
+If the build finished successfully, it will say something like that:
+``========== Build: 3 succeeded, 0 failed, 0 up-to-date, 1 skipped ========== ``.
+
+You can shorten these steps if you have installed the Microsoft Build Tools.
+In that case you can simply start the script and pass the game's name e.g.
+``Build.bat css``.
+
+However, in both cases the compiled binaries are stored in ``src/Builds/Windows/<game>/Release``.