Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 15:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38992 commits 76 branches 59 tags 1.2 GiB
Commit graph

38992 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
a40a562db2 handle two conner cases where preload would get called twice 2016-02-11 09:33:52 -08:00
Brad Davis
ff3c934c6c Merge pull request #7067 from hyperlogic/tony/vive-support 
Re-enable OpenVR support
 2016-02-10 19:04:35 -08:00
Clément Brisset
618712538a Merge pull request #7074 from birarda/integrate-new-hrtf 
use the existing counter in AudioMixer to send client stats, remove some now dead code
 2016-02-10 17:55:53 -08:00
Stephen Birarda
edfb65acf6 more stats printing removal from audio-mixer 2016-02-10 17:38:56 -08:00
Stephen Birarda
6707535ced remove unused and incorrect stats from DS stats 2016-02-10 17:33:56 -08:00
Stephen Birarda
49a8b88e24 Merge pull request #7072 from huffman/fix-ac-script-store-in-memory 
Update domain server to store temporary AC scripts in memory
 2016-02-10 16:30:55 -08:00
Anthony J. Thibault
c8e6aee3e7 OpenVr: fix for conflict between openvr and oculus display plugins 
* Call vr::VR_Shutdown() when ref-count goes to zero.  The ref-count
  is ncessary because the vr::IVRSystem poitner is shared between the
  the openvr input and display plugins.
* OpenVR plugins options will display in the menu if vr::VR_IsHmdPresent() is true.
  This is faster then initializing all of openvr and less likely to conflict with the
  oculus display plugin.
 2016-02-10 16:28:03 -08:00
Ryan Huffman
811859e46f Update domain server to store temporary AC scripts in memory 2016-02-10 15:26:01 -08:00
Stephen Birarda
97cd65cf80 don't use usecTimestampNow for per second actions 2016-02-10 15:07:58 -08:00
Chris Collins
b1c6d1d256 Merge pull request #7070 from sethalves/no-sink-upon-server-restart 
don't sink through floor when server restarts
 2016-02-10 14:42:28 -08:00
Seth Alves
5dd044dc29 Merge pull request #7041 from imgntn/cellscience 
Change the way cellscience entities intitialize & audio plays
 2016-02-10 14:22:30 -08:00
Seth Alves
66584c8e13 Merge pull request #7064 from birarda/integrate-new-hrtf 
cleanup new AM percentage stats in DS
 2016-02-10 14:21:42 -08:00
Andrew Meadows
d121dab937 Merge pull request #7057 from sethalves/grab-then-equip 
Grab then equip
 2016-02-10 14:16:31 -08:00
Seth Alves
11d296a477 if we are told to clear the octree, disable physics until we have (re)loaded entities 2016-02-10 14:08:35 -08:00
Seth Alves
3b1db7a522 Merge pull request #7061 from AndrewMeadows/crash-fix 
Fix crash when deleting many moving dynamic objects.
 2016-02-10 13:58:03 -08:00
Seth Alves
49f2724608 don't return void 2016-02-10 13:49:03 -08:00
Brad Hefta-Gaub
d7db08d150 Merge pull request #7042 from howard-stearns/virtualBaton 
Virtual baton
 2016-02-10 13:48:34 -08:00
Andrew Meadows
8ddbce1ee2 Merge pull request #7059 from sethalves/clamp-ik-dt 
avoid crazy ik-induced shaking / orbits
 2016-02-10 13:32:53 -08:00
James B. Pollack
b07c32e116 Merge pull request #7062 from jherico/webentitiies 
Ensure the QML content gets destroyed on deletion of a QML surface
 2016-02-10 13:27:59 -08:00
Howard Stearns
989192e9fd Make randomize clearer. 2016-02-10 12:53:05 -08:00
James B. Pollack
9a34b68bff add ownership hack to own and handoff movement 2016-02-10 12:50:11 -08:00
Howard Stearns
31d72ffb8d 2 is magic. 2016-02-10 12:17:58 -08:00
Seth Alves
af6bb50f74 fix warning 2016-02-10 12:09:28 -08:00
Howard Stearns
4241f4b305 Convert all simple one-liners containing ') { ' to instead take up three lines. 2016-02-10 12:03:07 -08:00
Stephen Birarda
8598360f2e allow string values to be graphable in DS stats 2016-02-10 11:50:23 -08:00
Brad Hefta-Gaub
5120076add Merge pull request #7060 from jherico/qml 
Small QML fixes
 2016-02-10 11:39:45 -08:00
Seth Alves
9d21c3d549 Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip 2016-02-10 11:35:25 -08:00
Chris Collins
db06674f7e Merge pull request #7058 from hyperlogic/tony/moving-platform-bugfixes 
SpatiallyNestable: bug fixes for kinematic entities
 2016-02-10 11:34:32 -08:00
Brad Davis
a4f2fc58fd Ensure the QML content gets destroyed on deletion of a QML surface 2016-02-10 11:27:18 -08:00
Seth Alves
6fea0b9396 also make sure tau is >= 1.0 2016-02-10 11:20:56 -08:00
Anthony J. Thibault
90f0821c2b OpenVR: reduce thread contention, fix sensor reset 2016-02-10 11:14:26 -08:00
Stephen Birarda
a9fc69b4ac cleanup percentage calculation for AM mix stats 2016-02-10 10:49:13 -08:00
Andrew Meadows
84fb983da7 don't forget to remove from _outgoingChanges 2016-02-10 10:36:35 -08:00
Andrew Meadows
132169395c use const reference for std:vector 2016-02-10 10:36:34 -08:00
Andrew Meadows
4bcb7b1ba9 more correct profiling 2016-02-10 10:36:34 -08:00
Andrew Meadows
9b467e94da constify and explicit override 2016-02-10 10:36:34 -08:00
James B. Pollack
22c53fc395 full voiceover vol 2016-02-10 10:05:26 -08:00
Brad Davis
4d1c24abb7 Fix OverlayWindow loading issues 2016-02-10 10:02:20 -08:00
Seth Alves
b3b053ce18 if delta-time is more than 1/30th of a second, clamp it to avoid crazy ik induced orbits when main thread is blocked 2016-02-10 09:52:29 -08:00
Brad Hefta-Gaub
9e3a13795a Merge pull request #7054 from howard-stearns/editjs-ToolWindow-initial-position 
Fix ToolWindow's initial position (e.g., as used by edit.js).
 2016-02-10 09:30:06 -08:00
Brad Hefta-Gaub
c1f2f8fca8 Merge pull request #7055 from huffman/fix-console-logs 
Make console log more robust
 2016-02-10 09:29:54 -08:00
Ryan Huffman
ef95fafabe Update console log to include some previous history 2016-02-10 08:42:28 -08:00
Ken Cooke
a875542142 Merge pull request #7053 from birarda/integrate-new-hrtf 
Integrate the new audio HRTF in AudioMixer
 2016-02-10 07:34:50 -08:00
Anthony J. Thibault
b9a16cec25 Re-enable OpenVR plugin 
* Enabled preview window
* rendering is only mono for some-reason.
 2016-02-09 18:49:18 -08:00
James B. Pollack
d920a3d721 updates 2016-02-09 18:05:14 -08:00
Anthony J. Thibault
727e289ecd SpatiallyNestable: bug fixes for kinematic entities 
* Kinematic entities were being simulated with position in the local frame but velocity in the global frame.
* Also, because getVelocity() was returning non-zero values when the parent was moving, kinematic objects were being simulated even if they should have been at rest.
* Bug fix for calculating velocity direction was incorrect, if the parent frame was rotated.
 2016-02-09 17:58:54 -08:00
Stephen Birarda
26fd0c305a push the length threshold to 1e-30 2016-02-09 17:14:23 -08:00
Stephen Birarda
a8841b475f specify float instead of implicitly converted double 2016-02-09 17:05:16 -08:00
Stephen Birarda
1a7738353a use a length check against source listener distance 2016-02-09 17:01:18 -08:00
Seth Alves
c2cbca88cb allow grabbing with one hand and then equipping with other 2016-02-09 16:54:32 -08:00