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

866 commits

Author SHA1 Message Date
David Rowe
591db37a21 Fix up navigation footer fonts 2016-11-15 15:09:33 +13:00
David Rowe
e4b8d34080 Add navigation bar to marketplace pages 2016-11-15 14:38:03 +13:00
David Rowe
1eeec2a3a1 Fix up script injection methods 2016-11-15 10:24:38 +13:00
David Rowe
e7d9f98ca4 Get script injection working in new marketplaces window 2016-11-15 09:23:51 +13:00
David Rowe
1caca601f2 Update user instructions 2016-11-10 20:39:29 +13:00
David Rowe
5eff7c9e15 Merge branch 'master' into 21089 2016-11-10 14:42:21 +13:00
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
d33ac21aaa Merge branch 'master' into 21089 2016-11-08 08:23:10 +13: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 Rowe
de5e02310b Provide keyboard in marketplaces window 2016-11-03 09:00:40 +13: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
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
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
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
Ryan Huffman
727fabeab2 Fix away.js logging all Messages 2016-10-25 15:28:11 -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
Anthony J. Thibault
ae301602e7 Fix for incorrect tip texture URLs. 2016-10-21 14:49:46 -07:00
Anthony J. Thibault
c431c69d60 Merge branch 'master' into feature/controller-display 2016-10-21 13:48:07 -07:00
Anthony J. Thibault
60f728585a away.js now shows hand controllers in away mode. 
* controllerDisplayManager is now part of default scripts.
* Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers
  and sendLocalMessage.
* removed previous version of controllerDisplayManger from tutorial.
 2016-10-21 10:40:39 -07:00
Anthony J. Thibault
2193c5faad Integrated controller display from tutorial scripts + assets 2016-10-20 18:24:58 -07:00
Howard Stearns
ca0d6587b5 Merge pull request #8869 from hyperlogic/bug-fix/edit-picking-with-hand-controllers 
edit.js: Fix for picking and manipulating objects via hand controllers.
 2016-10-20 16:59:56 -07:00