Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 11:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48994 commits 25 branches 0 tags 1.1 GiB
Commit graph

48994 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
7db8e8f31b Merge pull request #9156 from hyperlogic/out-of-body-revert 
Revert Out of Body experience
 2016-12-06 08:37:20 -08:00
David Kelly
c40aadfea4 whitespace 2016-12-05 17:13:12 -08:00
David Kelly
296d9b1ddf Merge branch 'dk/machineFingerprint' of https://github.com/davidkelly/hifi into dk/machineFingerprint 2016-12-05 17:10:19 -08:00
David Kelly
7880b5bfe0 Simple fallback now 
If the bios uuid isn't a valid UUID (on mac or windows it 'should be`)
then we read the fallback from the settings and use that, or create and
write one to the settings if it is missing.
 2016-12-05 17:05:39 -08:00
Ryan Downe Karpf
fa50e8eddd Merge pull request #9157 from howard-stearns/mic-icon-swap 
new mic unumute art
 2016-12-05 17:01:59 -08:00
Ryan Huffman
a81e7c2d2c Merge pull request #9148 from Polyrhythm/ryan/client-side-tests 
Client script test runner
 2016-12-05 16:23:17 -08:00
howard-stearns
7621672964 new mic unumute art 2016-12-05 16:00:03 -08:00
Anthony J. Thibault
89ae3b3d6e Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" 
This reverts commit efe9571ab8, reversing
changes made to 333e9ec7f4.
 2016-12-05 15:18:03 -08:00
Anthony J. Thibault
0c8105b551 Revert "Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1" 
This reverts commit 934148fea5, reversing
changes made to d2b32c3084.
 2016-12-05 15:17:53 -08:00
Anthony J. Thibault
49ce04e214 Revert "Merge pull request #9150 from hyperlogic/bug-fix/driving-while-flying-in-hmd" 
This reverts commit a69d77ffbe, reversing
changes made to 996d3f5875.
 2016-12-05 15:17:32 -08:00
Anthony J. Thibault
e8b5b56df7 Revert "Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode" 
This reverts commit 119653bceb, reversing
changes made to a69d77ffbe.
 2016-12-05 15:16:49 -08:00
Bradley Austin Davis
2ca4d0ab29 Fix drop in text rendering quality on texture memory constrained systems 2016-12-05 14:12:57 -08:00
Andrew Meadows
119653bceb Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode 
Fix for reset sensors while in desktop mode.
 2016-12-05 13:46:53 -08:00
Andrew Meadows
a69d77ffbe Merge pull request #9150 from hyperlogic/bug-fix/driving-while-flying-in-hmd 
Fix for driving/turning while flying in HMD mode
 2016-12-05 13:46:29 -08:00
Ryan Jones
094857949d tabs -> spaces, remove raw ptr, remove unnecessary spec diff 2016-12-05 12:57:21 -08:00
David Kelly
4d0f2c1ebb annoying whitespace 2016-12-05 11:45:36 -08:00
David Kelly
54716f70e5 Now works on mac, small build change for that 
Plus does nothing for linux, but there's a comment.
 2016-12-05 11:11:30 -08:00
Ryan Huffman
996d3f5875 Merge pull request #9135 from druiz17/nearGrab 
Fixed pressing the grip button causes a near grabbed object to drop
 2016-12-05 11:07:15 -08:00
Clément Brisset
1db14c924d Merge pull request #9146 from kencooke/audio-update-wasapi 
Updated the Qt audio plugins
 2016-12-05 10:55:22 -08:00
Anthony J. Thibault
6d82410bc5 Fix for away.js teleporting user when in desktop mode 
away.js calls MyAvatar.centerBody, however centerBody is only meaningful in HMD mode.
To guard against this, MyAvatar::centerBody is now a no-op if the application is not in HMD mode.
 2016-12-05 10:53:20 -08:00
Anthony J. Thibault
349f0355ae Fix for reset sensors while in desktop mode. 
Previously hitting ' a.k.a. reset sensors, would teleport you to the last
position you were in before you switched into desktop mode, or the spawn location.

This fixes that behavior but not re-centering the avatar while in desktop mode.
 2016-12-05 10:42:20 -08:00
Brad Davis
dc1b154482 Merge pull request #9149 from samcake/blue 
Fix the lighting problem at the outline of the shapes
 2016-12-05 10:29:08 -08:00
Anthony J. Thibault
a0f93dad2c Fix for driving/turning while flying in HMD mode 
The internal MyAvatar:_sensorToWorldMatrix was being updated properly, however
the MyAvatar::_sensorToWorldMatrixCache was not. To fix this I've introduced
a new "mode" to updateSensorToWorldMatrix that does not change the sensorToWorldMatrix at all,
but properly copies the value to the cache and also updates hand controller poses etc.
 2016-12-05 10:14:03 -08:00
Dante Ruiz
08301d488d clean up 2016-12-05 18:10:54 +00:00
Dante Ruiz
09d5dc382f better solution 2016-12-05 18:08:36 +00:00
Ryan Huffman
4766991cae Fix utils.js mergeObjects not checking hasOwnProperty 2016-12-05 08:22:15 -08:00
sam
310e26011f Fix the lighting problem at the outline of the shapes, use the depth buffer instead of the Linear depth buffer 2016-12-05 00:47:50 -08:00
Ryan Jones
39e1a3fb44 add client-side test runner 2016-12-04 20:53:06 -08:00
Ryan Jones
3eecba77f2 working menu item 2016-12-03 19:34:38 -08:00
Ken Cooke
b888ce890c Updated the Qt audio plugins 2016-12-03 07:26:55 -08:00
Ken Cooke
e93e1a7c4f Preliminary support for Ambisonic audio injectors. 
Supports 4-channel WAV files, presumed to be B-format (FuMa) first-order Ambisonic.
Supports WAV with arbitrary sample rate (needs optimization).
Supports soundfield volume and orientation set via script.
Supports localOnly client-side injection using simple (non-spatialized) test renderer.
 2016-12-02 18:20:57 -08:00
samcake
fe88ced776 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-02 18:00:30 -08:00
samcake
b0900c5d09 Revert "removing separate vertex format from the gl45backend to test if it avoids the crash" 
This reverts commit 56a1d57a94.
 2016-12-02 17:58:15 -08:00
Chris Collins
10c054165f Merge pull request #9144 from highfidelity/revert-9129-audio-dll 
Revert "Select Audio DLL at runtime"
 2016-12-02 17:21:42 -08:00
David Kelly
643353a31e Initial push 
Works on windows, have not tried it on mac.  Lots more to do, but
need to get it pushed to remote just in case.
 2016-12-02 15:46:20 -08:00
Brad Davis
5cbf7588ac Fixes for building on MSVC 2015 / Qt 5.8 2016-12-02 14:58:09 -08:00
samcake
acdce95bba Merge pull request #9140 from jherico/polyline_threading_fix 
Possible polyline crash fix
 2016-12-02 14:16:14 -08:00
Clément Brisset
3659e8e585 Revert "Select Audio DLL at runtime" 2016-12-02 14:15:11 -08:00
Ryan Huffman
fee9dcc981 Update bow collision hull with a simpler one 2016-12-02 09:27:53 -08:00
Chris Collins
6cb85e92b1 Merge pull request #9136 from samcake/hdr 
Fix a crash if current shader is null
 2016-12-02 09:14:07 -08:00
Ryan Huffman
d051cef1a5 Remove bow/entity.json 2016-12-02 08:40:39 -08:00
Ryan Huffman
680596d808 Move bow to unpublishedScripts 2016-12-02 08:18:47 -08:00
Ryan Huffman
56386718d4 Add 'projectile' to name of arrow in bow.js 2016-12-02 08:18:25 -08:00
Zach Pomerantz
d899391a1a fix audio hist array initializer for WIN32 2016-12-02 04:12:44 +00:00
Brad Davis
12ccbdac0b Actually render polylines 2016-12-01 19:46:08 -08:00
Seth Alves
8fe7c3156a Merge pull request #9138 from hyperlogic/bug-fix/3dsmax-fbx-reader-fixes 
Support for the 3ds Max object offset feature
 2016-12-01 19:39:05 -08:00
Brad Hefta-Gaub
934148fea5 Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1 
Added jsdocs for MyAvatar
 2016-12-01 18:11:25 -08:00
Anthony J. Thibault
35eeaad590 Added jsdocs for MyAvatar 
Not complete by any means, but it's a start.
 2016-12-01 17:38:43 -08:00
Seth Alves
d2b32c3084 Merge pull request #9057 from druiz17/childParent 
fixed children of parent object not being added back when performing an undo
 2016-12-01 16:59:06 -08:00
Anthony J. Thibault
68b103b46b Fix for missing fields in static initializer. 2016-12-01 15:21:49 -08:00