Commit graph

39035 commits

Author SHA1 Message Date
Chris Collins
c6bc91f8b2 Merge pull request #7084 from jherico/toolTabs
Allow closed tabs to delete properly
2016-02-11 13:20:20 -08:00
Brad Hefta-Gaub
894c75f8fc Merge pull request #7066 from zzmp/fix/circle3d-radii
Add radius as property to circle3d
2016-02-11 13:07:24 -08:00
Brad Hefta-Gaub
d14b9ab9b6 Merge pull request #7065 from zzmp/fix/circle3d-click
Fix circle3d FindRayIntersection
2016-02-11 13:07:00 -08:00
Chris Collins
ca15638463 Merge pull request #7080 from ZappoMan/fixPersistMono
add support for persisting the mono preview mode option
2016-02-11 13:03:49 -08:00
Chris Collins
38ba852c2e Merge pull request #7075 from Atlante45/fix/add-to-scene
Fix "Add to scene" option while dropping model
2016-02-11 13:02:36 -08:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Chris Collins
a4afa03fe5 Merge pull request #7077 from sethalves/clean-up-grab-signaling
Clean up grab signaling + various fixes
2016-02-11 10:20:56 -08:00
Stephen Birarda
62e842bf2b Merge pull request #7052 from huffman/bugsplat
BugSplat integration
2016-02-11 10:10:44 -08:00
samcake
99e9b3ecdd Merge pull request #7043 from zzmp/fix/render-ui
Revamp the render engine ui
2016-02-11 09:57:51 -08:00
Clément Brisset
911591c0ea Merge pull request #7082 from birarda/hrtf-map-crash
fix for HRTF map crash
2016-02-11 09:57:20 -08:00
Ryan Huffman
d226416306 Update params to MiniDmpSender to be const 2016-02-11 09:46:31 -08:00
Ryan Huffman
71b72aceb8 Fix CHECKED_FOR_BUGSPLAT_ONCE 2016-02-11 09:46:12 -08:00
Stephen Birarda
52cd4ae1a5 make sure the AudioMixerClientData exists before using it 2016-02-11 09:34:21 -08:00
Clément Brisset
c3218a3af9 Merge pull request #7069 from AndrewMeadows/another-crash-fix
Fix crash when propagating simulation ownership on deleted objects
2016-02-11 09:29:08 -08:00
Zach Pomerantz
3bace3cdbb Rework the qml for brevity 2016-02-11 08:48:01 -08:00
Zach Pomerantz
9c5881345a Disable the AO gpuTimer pending cpp fix 2016-02-11 08:48:00 -08:00
Zach Pomerantz
86412c1890 Fix default debug buffer size 2016-02-11 08:47:59 -08:00
Zach Pomerantz
dbc59ccc2b Revamp render engine debug JS script 2016-02-11 08:47:59 -08:00
Zach Pomerantz
991d6328ef Fix JSON integration for JobConfig 2016-02-11 08:47:58 -08:00
Zach Pomerantz
5f395654f0 Integrate JobConfig with JSON/qml 2016-02-11 08:47:51 -08:00
Zach Pomerantz
eb6ff725c4 Fix circle3d FindRayIntersection to scale by radius 2016-02-11 08:24:48 -08:00
Ryan Huffman
3355019cbe Add custom bugsplat flags 2016-02-11 08:17:20 -08:00
Ryan Huffman
813d5e5ba0 Add headers and proper bugsplat checking to cmake files 2016-02-11 08:17:05 -08:00
Brad Hefta-Gaub
118b95af14 Merge pull request #7079 from sethalves/remove-assert
remove incorrect assert
2016-02-10 22:28:59 -08:00
Brad Hefta-Gaub
d77d102384 add support for persisting the mono preview mode option 2016-02-10 22:01:17 -08:00
Seth Alves
3a2b082a7f remove incorrect assert 2016-02-10 20:47:22 -08:00
Seth Alves
ffce38769f properties hold local velocities, not world-frame ones 2016-02-10 19:16:08 -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
Seth Alves
6a646f1c24 put isMoving back and change all uses to isMovingRelativeToParent 2016-02-10 19:01:41 -08:00
Seth Alves
880aedd444 update to track grab-script changes 2016-02-10 19:01:25 -08:00
Seth Alves
3fe01ccf10 cleanups 2016-02-10 18:32:05 -08:00
Seth Alves
ecf22cd8b8 update toybox toys to use changed grab entityMethod calls 2016-02-10 18:22:20 -08:00
Seth Alves
3e71efcdbb all code that asks isMoving appears to mean relative to parent 2016-02-10 18:21:44 -08:00
Atlante45
913172b490 Fix extension checking 2016-02-10 18:17:13 -08:00
Andrew Meadows
ac60917b54 sigh... protect againt null MotionStates 2016-02-10 17:58:38 -08:00
Andrew Meadows
fed03edde3 manually removing contact manifolds was a bad idea 2016-02-10 17:58:38 -08:00
Andrew Meadows
532f0683e8 remove all contact info before removing objects 2016-02-10 17:58:38 -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
Seth Alves
3f922240d0 clean up handling of success flag and some debugging prints 2016-02-10 16:42:13 -08:00
Seth Alves
1ae47b17f0 size-cull parent entities by their queryAABox rather than their dimensions to avoid having the entity-server send a child but not the parent 2016-02-10 16:41:35 -08:00
Seth Alves
8e16bda7bb start to clean up grab generated signals 2016-02-10 16:40:50 -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