Blender Git Loki

Merge branch 'master' into soc-2014-bge

BGE: python API cleanup - initialization for bge with submodules, closes D615

BGE: python API cleanup - adding proper initialization to GameTypes

BGE: python API cleanup - replace BLI_program_path with BKE_appdir_program_path

Merge branch 'master' into soc-2014-bge

Conflicts:
source/blender/blenkernel/intern/object.c
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp

gameengine vehicle controller: removing partially removed constant

fixing previously bad merge

Merge branch 'master' into soc-2014-bge

Conflicts:
source/blender/blenkernel/intern/object.c

Adding the official bullet documentation by erwin coumans for v2.82 (current one)

Merge remote-tracking branch 'origin/master' into soc-2014-bge

Merge remote-tracking branch 'origin/master' into soc-2014-bge

Conflicts:
source/gameengine/Ketsji/KX_PythonInit.cpp

gameengine vehicle controller: cleanup formatting

gameengine physics: adding vehicle controller to the UI

gameengine physics: removing triangle mesh collision option for character controllers

gameengine physics: removing compound option for character controllers

Merge remote-tracking branch 'origin/master' into soc-2014-bge

attempting to fix slowparent rotation in the viewport

slow parent in game engine: fix for negative values

fixing slow parent motion in the game engine

gamengine: removing useless comment