Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51153 commits 2 branches 0 tags 1.1 GiB
Commit graph

19083 commits

Author SHA1 Message Date
Anthony J. Thibault
912e8aa04a Tablet buttons now work in toolbar. 
Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.
 2017-02-14 15:37:24 -08:00
Anthony J. Thibault
4503923665 Initial version of TabletProxy.toolbarMode boolean 
Copies all tablet buttons between the tablet and the system toolbar.

To test type this in the console:

    Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode = true;
 2017-02-14 15:36:03 -08:00
Anthony J. Thibault
5e25d073f3 WIP commit 2017-02-14 15:36:01 -08:00
David Rowe
625f5efdf8 Merge branch 'master' into 21164 
# Conflicts:
#	scripts/system/audio.js
 2017-02-15 10:00:52 +13:00
Chris Collins
442e8d68ef Merge pull request #9650 from kunalgosar/browserFix 
Added isAway (paused) property to myAvatar
 2017-02-14 11:16:07 -08:00
Seth Alves
e323971062 Merge pull request #9671 from druiz17/general 
Moved general preference settings to the tablet
 2017-02-14 10:11:33 -08:00
Brad Hefta-Gaub
f433347362 Merge pull request #9652 from sethalves/avatar-as-child-fixes 
some fixes for when an avatar is a child of something else
 2017-02-14 09:07:47 -08:00
Dante Ruiz
968ba1e03d updated file headers 2017-02-14 16:08:25 +00:00
Dante Ruiz
aa164bbf8f diff minimize 2017-02-14 15:55:32 +00:00
Dante Ruiz
9d5f392be3 removed more qml log errors 2017-02-14 07:46:34 -08:00
Dante Ruiz
773ade5b61 removing qml errors 2017-02-14 07:46:34 -08:00
Dante Ruiz
8fbcead6d1 removed/renamed some files 2017-02-14 07:46:33 -08:00
Dante Ruiz
948352cdb6 general preferences work on tablet 2017-02-14 07:46:33 -08:00
Dante Ruiz
888d4ff706 basic prefreneces done 2017-02-14 07:46:32 -08:00
Dante Ruiz
46cfa7cf13 saving work 2017-02-14 07:46:31 -08:00
Seth Alves
ba025d44e0 Merge pull request #9642 from AndrewMeadows/beware-humbletim 
fix performance problem for invalid "avatarEntityData"
 2017-02-14 06:33:48 -08:00
Seth Alves
2e2a3c60d0 Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes 2017-02-14 06:26:20 -08:00
Seth Alves
30c46b89a0 Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect 
Removed ColorOverlay from TabletButton, added more icon & text states
 2017-02-14 06:16:59 -08:00
Anthony J. Thibault
1c783031b1 Removed ColorOverlay from TabletButton, added more icon & text states 
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.

  * icon
  * hoverIcon
  * activeIcon
  * activeHoverIcon

  * text
  * hoverText
  * activeText
  * activeHoverText

Updated scripts to set new button states, if necessary.
 2017-02-13 15:09:46 -08:00
Anthony J. Thibault
adc50dd30f Added active versions of each tablet image, with black bg. 2017-02-13 13:55:33 -08:00
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08:00
Seth Alves
bc5f563f57 make _parentID and _parentJointIndex private to avoid accidental direct access 2017-02-12 11:37:29 -08:00
Seth Alves
1164a1b3bf some fixes for when an avatar is a child of something else 2017-02-12 08:27:39 -08:00
Kunal Gosar
c3f2f5779a fix if else syntax 2017-02-11 15:46:49 -08:00
Kunal Gosar
975d844eee syntax fix 2017-02-11 15:01:02 -08:00
Kunal Gosar
18e776bd29 emit signal only on change 2017-02-11 13:58:23 -08:00
David Rowe
77f0fb1491 Change the "Mute" tablet button to "Audio" 2017-02-11 22:40:19 +13:00
kunalgosar
9c537726e5 Fix stuck in pause error with browsers 2017-02-10 18:13:09 -08:00
David Rowe
a08347936e Make clicking the tablet mic icon or audio bar toggle the mute state 2017-02-11 15:11:27 +13:00
kunalgosar
691f61983a added isAway property to MyAvatar 2017-02-10 17:28:12 -08:00
David Rowe
acaf8c69c6 Better tablet mic muted and unmuted iconography 2017-02-11 11:07:31 +13:00
Andrew Meadows
d2315c15a1 avoid duplicate parse of AvatarEntityData entries 2017-02-10 13:14:20 -08:00
Andrew Meadows
563bf65e89 fix bug: performance problem for avatarEntities 2017-02-10 13:14:20 -08:00
Andrew Meadows
ee702f945f cleanup around when to send identityPacket 2017-02-10 13:14:20 -08:00
David Rowe
b5b92c1508 Make the tablet's mic icon reflect the current mute state 2017-02-11 09:53:02 +13:00
Atlante45
3a30de79aa CR 2017-02-09 13:04:43 -08:00
Atlante45
72ed1add94 CR log spam cleanup 2017-02-09 13:04:43 -08:00
Atlante45
6fbe3c9187 Windows specific changes 2017-02-09 13:04:43 -08:00
Atlante45
43d2501993 Add HMD friendly window for the ESS log 2017-02-09 13:04:43 -08:00
Atlante45
0f39356e94 Only users with perm rez can see the log 2017-02-09 13:04:43 -08:00
Atlante45
35f8afe456 Handle domain reconnections 2017-02-09 13:04:43 -08:00
Atlante45
191121888c Add log window to the ESS log 2017-02-09 13:04:43 -08:00
Atlante45
2962dd6dc2 Factor LogDialog 2017-02-09 13:04:43 -08:00
Atlante45
fcb74bce10 First draft for entity script server log streaming 2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
74f10a1e7f Merge pull request #9603 from huffman/feat/trace-thread-script 
Add thread names and scripts to chrome traces
 2017-02-09 13:00:05 -08:00
Brad Hefta-Gaub
bc22326ec8 Merge pull request #9640 from ZappoMan/avatarSimulationStats 
New stats for avatar simulation
 2017-02-09 12:58:30 -08:00
Brad Hefta-Gaub
bb4654506a CR 2017-02-09 11:37:21 -08:00
Brad Hefta-Gaub
57e0dadd65 CR 2017-02-09 11:35:00 -08:00
samcake
850be620f9 Merge pull request #9606 from samcake/blue 
More intrumentation, Pixel Format clean up and minor improvments in texture transfers
 2017-02-09 11:18:09 -08:00
Seth Alves
b34341b48e Merge pull request #9631 from AndrewMeadows/workaround-avatar-update-dos 
Remove avatarEntityData cruft from settings
 2017-02-09 10:40:00 -08:00