diff options
| author | Melanie | 2011-10-11 22:22:49 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 22:22:49 +0100 |
| commit | 36ec9f0e942a3163e27c5206e9ccc58f9710acb0 (patch) | |
| tree | 113d612d318f2f4dbbeb5513c3c25723eb03f5bc /bin | |
| parent | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge (diff) | |
| parent | Add BulletSim physics option details to OpenSim.ini.example. Marked as in de... (diff) | |
| download | opensim-SC-36ec9f0e942a3163e27c5206e9ccc58f9710acb0.zip opensim-SC-36ec9f0e942a3163e27c5206e9ccc58f9710acb0.tar.gz opensim-SC-36ec9f0e942a3163e27c5206e9ccc58f9710acb0.tar.bz2 opensim-SC-36ec9f0e942a3163e27c5206e9ccc58f9710acb0.tar.xz | |
Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSim.ini.example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 0ef6880..925c343 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -149,9 +149,11 @@ | |||
| 149 | 149 | ||
| 150 | ;; Choose one of the physics engines below | 150 | ;; Choose one of the physics engines below |
| 151 | ;; OpenDynamicsEngine is by some distance the most developed physics engine | 151 | ;; OpenDynamicsEngine is by some distance the most developed physics engine |
| 152 | ;; BulletSim is incomplete and experimental but in active development | ||
| 152 | ;; basicphysics effectively does not model physics at all, making all objects phantom | 153 | ;; basicphysics effectively does not model physics at all, making all objects phantom |
| 153 | ;; Default is OpenDynamicsEngine | 154 | ;; Default is OpenDynamicsEngine |
| 154 | ; physics = OpenDynamicsEngine | 155 | ; physics = OpenDynamicsEngine |
| 156 | ; physics = BulletSim | ||
| 155 | ; physics = basicphysics | 157 | ; physics = basicphysics |
| 156 | ; physics = POS | 158 | ; physics = POS |
| 157 | 159 | ||