Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 13:16:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51434 commits 74 branches 59 tags 1.2 GiB
Commit graph

51434 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
446aaf3bce Turn off cpu mip map to add instrumentation to master 2017-02-02 11:58:02 -08:00
Anthony J. Thibault
5890503ec0 Can now grab tablet in 2d mode even when it embedded in geometry 2017-02-02 10:56:56 -08:00
Anthony J. Thibault
9df887de2a You can no longer scale the tablet with double-grab 2017-02-02 10:16:02 -08:00
samcake
1af7c9d95d Merge branch 'blue' of https://github.com/samcake/hifi into purple 2017-02-02 10:09:36 -08:00
samcake
e77b920592 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-02 10:08:05 -08:00
Dante Ruiz
2cc1ee008d added clicking sounds to tablet menus 2017-02-02 17:46:42 +00:00
Dante Ruiz
2af72f1a50 fixed tablet buliding up when flying fast 2017-02-02 17:03:53 +00:00
sam
569378bdeb REcompiling for windows... 2017-02-02 01:57:43 -08:00
sam
387621e586 Merge branch 'blue' of https://github.com/samcake/hifi into purple 2017-02-01 22:01:39 -08:00
sam
3aa239b004 More instrumentation during texture load 2017-02-01 22:00:03 -08:00
Seth Alves
f4e57898c6 Merge pull request #9575 from thoys/patch-9 
Readme fix, default AC parameters example
 2017-02-01 20:25:51 -08:00
Howard Stearns
49af783553 Merge pull request #9590 from sethalves/fix-pal-audio-meter 
hook pal audio meter up again
 2017-02-01 20:23:56 -08:00
Howard Stearns
4c9d8199b7 Merge pull request #9588 from zfox23/PAL_FixIdentityChangeSpam 
PAL: Fix Spam upon Identity Change
 2017-02-01 20:23:03 -08:00
Seth Alves
f907af1b9b Merge pull request #9587 from hyperlogic/bug-fix/tablet-ui-network-2d-tablet 
Tablet-ui: fix tablet orientation for users in 2d desktop mode
 2017-02-01 20:17:40 -08:00
Seth Alves
0dead3b458 Merge pull request #9589 from hyperlogic/bug-fix/tablet-ui-button-click-volume 
tablet-ui: reduced volume of button click
 2017-02-01 20:16:38 -08:00
Seth Alves
4ae163ac60 hook pal audio meter up again 2017-02-01 19:01:55 -08:00
Anthony J. Thibault
de55a5dfe6 tablet-ui: reduced volume of button click 2017-02-01 18:47:50 -08:00
Zach Fox
5ea3c5dffd Skipped this line 2017-02-01 18:13:24 -08:00
sam
2ecda8b64e Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-01 18:03:07 -08:00
Anthony J. Thibault
9d124983a6 Tablet-ui: fix tablet orientation for users in 2d desktop mode 
Double 180 flip.  Once before to account for -z forward of camera.
Once after to account for avatar 180 flip.
 2017-02-01 17:48:28 -08:00
Triplelexx
05e3acf1a3 Merge remote-tracking branch 'upstream/master' into 21146 2017-02-02 01:16:51 +00:00
Triplelexx
1a58dad3ad change age check 
check for equal to -1 instead of < 1, think this would be more suitable
if undefined is returned.
 2017-02-02 01:12:55 +00:00
Zach Fox
4af5118654 First pass 2017-02-01 17:04:21 -08:00
Seth Alves
d9bdbb92ef use tablet model from distribution rather than from s3 2017-02-01 16:55:29 -08:00
Stephen Birarda
823d74d2d4 don't auto-bid for sim ownership on entity creation in ESI 2017-02-01 16:53:37 -08:00
samcake
3108360094 Merge branch 'blue' of https://github.com/samcake/hifi into purple 2017-02-01 16:36:40 -08:00
Seth Alves
6671324a33 fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked 2017-02-01 16:29:12 -08:00
Faye Li
3e165d5fbb Merge pull request #9578 from fayeli/users-jump-to 
Rework users.js for Tablet: better jump to user & who can find me toggle
 2017-02-01 16:23:58 -08:00
Chris Collins
b585699540 Merge pull request #9582 from hyperlogic/feature/tablet-ui-2d-desktop-deadspot 
tablet-ui: Added 6 pixel deadspot for bringing up the tablet in desktop mode.
 2017-02-01 16:04:33 -08:00
samcake
f34f1312ab Few fixes 2017-02-01 15:53:49 -08:00
Faye Li
4f04865963 load tablet users in default scripts 2017-02-01 15:37:54 -08:00
Faye Li
80c8748046 Revert "replace old user.js" 
This reverts commit 2340f56b53.
 2017-02-01 15:37:01 -08:00
Faye Li
2340f56b53 replace old user.js 2017-02-01 15:26:40 -08:00
Chris Collins
eabd41d0e9 Merge pull request #9579 from hyperlogic/bug-fix/tablet-ui-keyboard-focus 
tablet-ui: Fix for keyboard focus
 2017-02-01 15:26:02 -08:00
samcake
6bdf50f2db moving mip map gen to cpu 2017-02-01 15:16:37 -08:00
Faye Li
c24b6e5e5e missing words 2017-02-01 15:13:52 -08:00
Faye Li
c16a9a955e display correct username 2017-02-01 14:53:03 -08:00
Anthony J. Thibault
ffaf7a10e8 tablet-ui: Added 6 pixel deadspot for bringing up the tablet in desktop mode. 2017-02-01 14:44:14 -08:00
Faye Li
9a22055c27 initialise the toggle button with correct info 2017-02-01 14:30:16 -08:00
Faye Li
3c3ff908b4 handling the visibility toggle event 2017-02-01 14:22:13 -08:00
Anthony J. Thibault
2760065ee1 Bug fix for previous commit 2017-02-01 13:51:31 -08:00
Faye Li
6d55b3c82d visibility toggle drop down 2017-02-01 13:45:17 -08:00
Anthony J. Thibault
9be6fe2192 tablet-ui: Fix for keyboard focus box still being visible sometimes 2017-02-01 13:44:12 -08:00
David Kelly
82efb97654 Merge pull request #9580 from zfox23/PAL_VirtualKeyboard 
PAL: Raise virtual keyboard when editing DisplayName in HMD
 2017-02-01 14:16:03 -07:00
Zach Fox
8b1161b0b0 Fix it 2017-02-01 12:32:30 -08:00
Faye Li
378fdaec8b the missing commit - fix typo and added user info 2017-02-01 11:27:48 -08:00
Anthony J. Thibault
ca79397ee8 tablet-ui: Fix for keyboard focus 
Don't allow clicks on non-web entities from stealing focus away from web overlays.
 2017-02-01 11:22:17 -08:00
Ryan Huffman
d0393aeea0 Merge pull request #9577 from birarda/bug/domain-settings-save-row 
only check if keys are empty, not all fields in DS settings
 2017-02-01 10:59:52 -08:00
Faye Li
d78c274472 Merge branch 'master' into users-jump-to 2017-02-01 10:59:32 -08:00
Faye Li
4e209399da fix conflict 2017-02-01 10:58:03 -08:00