Commit graph

49339 commits

Author SHA1 Message Date
Clément Brisset
e85d81da3c Merge pull request #8982 from Atlante45/installer
Launch Interface after Sandbox content loaded
2016-11-02 11:30:50 -07:00
Clément Brisset
9d555270d1 Merge pull request #8985 from huffman/fix/tutorial-went-to-trigger
Fix tutorial tracking wentToEntry if you haven't finished the tutorial
2016-11-02 11:26:41 -07:00
Seth Alves
844cc03dcb fix names of model-entity joint setters 2016-11-02 10:24:01 -07:00
Ryan Huffman
54496c2eff Fix tutorial tracking wentToEntry if you haven't finished the tutorial 2016-11-02 09:02:39 -07:00
Dante Ruiz
a948e03ed8 changed old icon to new icon 2016-11-02 08:23:10 -07:00
David Rowe
8ccf645d1c Make script event bridge available to OverlayWindow 2016-11-02 21:41:06 +13:00
Brad Hefta-Gaub
56b3ac8c89 Merge pull request #8972 from sethalves/fix-for-2159
lock around audio-client quit flag to avoid shutdown race
2016-11-02 00:14:33 -07:00
David Rowe
c578cd4b6d Inject keyboard raising and lowering script into marketplaces window 2016-11-02 17:06:40 +13:00
David Rowe
41c7f714e2 Add keyboard control to marketplaces window 2016-11-02 16:49:45 +13:00
David Kelly
ec0382daf7 PR feedback
Completely deleting hrtfs incorrectly.  This seems to be better, we
only want to delete HRTF for the QUuid() stream for the killed node in each
node's list of HRTFs.
2016-11-01 18:29:31 -07:00
Atlante45
46102d93c6 Launch interface on install after content loading 2016-11-01 18:15:27 -07:00
Atlante45
e78d907db0 Add clo to launch interface after content loads 2016-11-01 18:15:27 -07:00
samcake
49f1590e01 Start detecting all the gpus 2016-11-01 16:51:57 -07:00
Ryan Huffman
26e0d02d60 Remove unused 'first' variable 2016-11-01 16:40:41 -07:00
Ryan Huffman
bbef071723 Update interface to default to HMD display plugin 2016-11-01 16:23:53 -07:00
Dante Ruiz
1a83cc2c3e fixed deleted comment 2016-11-02 00:12:23 +01:00
Dante Ruiz
d29b1c34b1 fixed coding standard conflicts 2016-11-02 00:07:58 +01:00
Dante Ruiz
e9d10b609d removed bad commit 2016-11-02 00:05:38 +01:00
Howard Stearns
486cf01a55 Merge pull request #8975 from zfox23/AddSnapshotText
Add "Snapshot" text to snapshot cards in Address Bar Dialog
2016-11-01 15:33:53 -07:00
Anthony Thibault
a9c88f2383 Merge pull request #8957 from AndrewMeadows/dont-mirror-eyes
fix broken eyes in mirrored animations
2016-11-01 15:28:48 -07:00
David Kelly
c1feac971b CR feedback 2016-11-01 15:17:07 -07:00
David Kelly
0b80610e65 Needed to properly remove hrtfs for avatar audio 2016-11-01 15:09:14 -07:00
Zach Fox
b98c6cb50f Change 'Snapshot' to 'snapshot' and use smaller font 2016-11-01 14:49:18 -07:00
howard-stearns
4c34214e2d Merge branch 'master' of https://github.com/highfidelity/hifi into use-snapshot-data-from-file 2016-11-01 14:45:37 -07:00
David Rowe
10490a9fad Default collision shap to hull per submesh instead of static 2016-11-02 10:45:00 +13:00
howard-stearns
52cc03c5a2 Get snapshot location data from file, which now uses shareable place info. 2016-11-01 14:44:39 -07:00
Dante Ruiz
86abd9120e Fixed menu out of view with HMD and Xbox controller 2016-11-01 14:30:48 -07:00
Zach Fox
c4b59eafbb Add 'Snapshot' text. My very first commit! 2016-11-01 14:09:25 -07:00
Ryan Huffman
ba7eac5281 Override getSubdeviceNames in OculusControllerManager 2016-11-01 13:53:10 -07:00
Ryan Huffman
3147ea9e33 Update help window to auto select xbox or vive controller tab on availability of device 2016-11-01 13:43:55 -07:00
Ryan Huffman
16d91833e8 Add optional url query to InfoView 2016-11-01 13:43:32 -07:00
Ryan Huffman
e4341d7a02 Add vive and xbox controller checking to PluginUtils 2016-11-01 13:42:37 -07:00
Ryan Huffman
ba0dbeac80 Add InputManager::getSubdeviceNames 2016-11-01 13:36:20 -07:00
Seth Alves
137730dc50 coding standard 2016-11-01 11:59:28 -07:00
Chris Collins
3625f329d9 Merge pull request #8971 from hyperlogic/bug-fix/deterministic-plugin-load-order
Load plugins in alphabetical order.
2016-11-01 11:30:04 -07:00
Seth Alves
ae17135a07 lock around quit flag to avoid shutdown race 2016-11-01 11:14:16 -07:00
samcake
861944ba71 Try uing DXGI on windows instead of com 2016-11-01 11:12:47 -07:00
David Kelly
404c08b0c7 Un-do of previous commit
Seems to add an artifact when using our test scripts.  Will work on that
as a separate issue, as it would be an existing issue in any case.
2016-11-01 10:46:22 -07:00
Anthony J. Thibault
09511111cf Load plugins in alphabetical order. 2016-11-01 10:23:54 -07:00
Chris Collins
4d798edfb0 Merge pull request #8959 from highfidelity/RC-25
Beta Release 25 - Includes up to Developer Release 5622
2016-11-01 09:16:57 -07:00
David Kelly
fb2968a419 Reset bytes sent counter when setting avatar sound
It could be past the end of the buffer if you changed sounds, and the
new one is shorter.  Won't happen with our current tests, but that could
change, and in general no reason it couldn't happen.
2016-11-01 09:12:35 -07:00
Ryan Huffman
5f8cee787f Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename 2016-11-01 09:07:56 -07:00
Ryan Huffman
0cc98d4501 Add VersionInfo.rc to interface 2016-11-01 09:00:08 -07:00
Ryan Huffman
ea31a8e3b4 Add VersionInfo.rc.in 2016-11-01 08:59:56 -07:00
Ryan Huffman
b7f5fc2516 Update 'Sandbox' to 'High Fidelity Sandbox' in task manager 2016-11-01 08:58:29 -07:00
humbletim
f9747d8a44 match requested hash key url when populating batch-loaded script contents 2016-11-01 11:46:09 -04:00
David Rowe
0c6ed67e3b Tidying 2016-11-02 00:05:30 +13:00
David Rowe
35448b6c09 Update Clara.io instructions 2016-11-02 00:05:10 +13:00
David Rowe
667a777695 Use Clara.io API for FBX downloads 2016-11-01 23:43:15 +13:00
samcake
d5f44befc6 Merge branch 'master' of https://github.com/highfidelity/hifi into red-backup-many-stereo-paths 2016-10-31 17:41:07 -07:00