Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-05 07:52:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48018 commits 25 branches 0 tags 1.1 GiB
Commit graph

1089 commits

Author SHA1 Message Date
Seth Alves
42d13f7e77 Merge pull request #9024 from huffman/fix/userdata-showing-old-data 
Fix userData in edit.js sometimes showing wrong value when locked
 2016-11-07 13:37:03 -08:00
Ryan Huffman
c4f35bf7bf Fix userData in edit.js sometimes showing wrong value when locked 2016-11-07 11:39:36 -08:00
David Rowe
852218815b Display "content loading" while there are pending GPU texture transfers 2016-11-07 13:40:49 +13:00
Brad Hefta-Gaub
206f1ead1a Merge pull request #8990 from howard-stearns/centered-toolbar 
centered toolbar
 2016-11-03 14:18:32 -07:00
howard-stearns
8eb6699420 help script 2016-11-02 16:50:37 -07:00
Seth Alves
d0c0cdd82f polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again 2016-11-02 16:31:34 -07:00
David Kelly
a8832fafeb Merge pull request #8934 from howard-stearns/more-reliable-crowds 
More reliable crowds
 2016-10-28 16:17:35 -07:00
Brad Hefta-Gaub
dc836cbefc Merge pull request #8949 from ctrlaltdavid/21090 
Fix comment typo
 2016-10-28 13:29:47 -07:00
David Rowe
9a79345493 Fix comment typo 2016-10-29 09:04:50 +13:00
howard-stearns
a64a1e2ee0 update agent script reference 2016-10-28 10:20:29 -07:00
howard-stearns
3d8bf7f11c Merge branch 'master' of https://github.com/highfidelity/hifi into more-reliable-crowds 2016-10-28 10:18:46 -07:00
Ryan Huffman
b8cf4e9c0e Merge pull request #8943 from ctrlaltdavid/21090 
QA READY: Revise loading progress bar
 2016-10-28 08:24:40 -07:00
David Rowe
b548e6441c Animate progress bar without regard for amount of content left to load 2016-10-28 18:57:54 +13:00
David Rowe
610159fcbe Improve bar for 4K displays 2016-10-28 18:20:33 +13:00
David Rowe
73b2bc433d Improve bar positions 2016-10-28 18:03:13 +13:00
Stephen Birarda
c41af25776 Merge pull request #8939 from huffman/fix/tutorial-fixes 
Tutorial fixes
 2016-10-27 21:43:55 -07:00
Ryan Huffman
d933155c71 Fix trigger highlight configuration 2016-10-27 20:16:34 -07:00
David Rowe
edc9b1fa07 Update bar graph for desktop and HMD displays 2016-10-28 15:50:50 +13:00
David Rowe
c9e4fddeab Remove background image 2016-10-28 14:17:18 +13:00
David Rowe
0824142987 Add "loading" text 2016-10-28 14:12:24 +13:00
David Rowe
4befab1151 JSLint progress bar code 2016-10-28 11:34:00 +13:00
Ryan Huffman
69e7dababc Collapse multiline dict to one line in controllerDisplay 2016-10-27 15:16:38 -07:00
Ryan Huffman
c0e372c380 Remove annotation API from controller display 2016-10-27 14:58:20 -07:00
Ryan Huffman
1f25ba8f1f Update controller tips and trigger highlight in tutorial 2016-10-27 14:58:20 -07:00
Ryan Huffman
e9099b77a5 Add more debug to tutorial, new firecrackers, and adjust fuse 2016-10-27 14:58:20 -07:00
howard-stearns
59630f8eca Merge branch 'master' of https://github.com/highfidelity/hifi into more-reliable-crowds 2016-10-27 12:32:46 -07:00
howard-stearns
1efef36e03 spread out the start/stop of crowds, and allow control over how many are 
listening
 2016-10-27 12:31:36 -07:00
howard-stearns
237870d7c4 spread out the start and stop of crowds 2016-10-27 12:31:10 -07:00
howard-stearns
d69ea6b252 allow crowd-agent STOP command to take a delay time before it acts 2016-10-27 12:29:04 -07:00
Ryan Huffman
1782f97dbd Fix away.js not unsubscribing on shutdown 2016-10-27 11:12:46 -07:00
Ryan Huffman
a801832a55 Fix away.js allowing any user to disable away.js 2016-10-27 11:12:31 -07:00
Howard Stearns
047b02141f Merge pull request #8908 from howard-stearns/improve-domain-check 
Improve domain check
 2016-10-25 19:45:37 -07:00
Howard Stearns
58d14decbb linting 2016-10-25 19:07:52 -07:00
Howard Stearns
d8c5cdd910 fix reporting 2016-10-25 18:42:04 -07:00
howard-stearns
f7742b99a9 update crowd-agent reference 2016-10-25 15:35:11 -07:00
howard-stearns
65ac73bfc0 use s3 instead of gh-pages 2016-10-25 15:29:48 -07:00
Ryan Huffman
727fabeab2 Fix away.js logging all Messages 2016-10-25 15:28:11 -07:00
howard-stearns
6116060858 Merge branch 'master' of https://github.com/highfidelity/hifi into improve-domain-check 2016-10-25 14:58:58 -07:00
howard-stearns
9561142c43 improvements 2016-10-25 14:58:27 -07:00
howard-stearns
2fbb2338c5 don't complain about other's finishedSound messages 2016-10-25 14:56:05 -07:00
Ryan Downe Karpf
7a4302057a Merge pull request #8900 from huffman/fix/disable-controller-hide-on-equip 
Update vive controller display to not hide on equip
 2016-10-25 13:16:31 -07:00
Brad Hefta-Gaub
1bbf0179dd Merge pull request #8894 from ZappoMan/xboxLasers 
Adds support for "lasers" to the Oculus+xbox controller
 2016-10-25 09:18:00 -07:00
Ryan Huffman
af749605ea Update vive controller display to not hide on equip 2016-10-25 08:27:20 -07:00
Chris Collins
325cd0ae61 Merge pull request #8870 from ctrlaltdavid/21084 
Reinstate "reload" button for entity scripts in entities editor
 2016-10-24 22:17:14 -07:00
Brad Hefta-Gaub
ed4279783d CR feedback 2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
76ca3aa546 fix residual head laser 2016-10-24 15:25:06 -07:00
Brad Hefta-Gaub
779f326452 cleanup 2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
a25d50387e gak 2016-10-24 14:47:10 -07:00
Brad Hefta-Gaub
0f8967970a Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546 more work on extra lasers 2016-10-24 07:46:04 -07:00