Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 12:04:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
76886 commits 69 branches 56 tags 1.2 GiB
Commit graph

7622 commits

Author SHA1 Message Date
r3tk0n
08bc47d722 Disable tablet button on off hand (translation hand). 2019-03-21 15:06:03 -07:00
r3tk0n
8f5a8d0caa Fix typo that broke fargrab. Grip or Trigger on off hand will now manipulate. 2019-03-21 14:38:11 -07:00
r3tk0n
c9ade7ccb8 Add grip to fargrab. 2019-03-15 16:09:01 -07:00
r3tk0n
39342b9771 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-11 16:27:05 -07:00
Shannon Romano
864c37d310
Merge pull request #15155 from sethalves/fix-clonables 
Fix cloneables
 2019-03-11 14:17:20 -07:00
Seth Alves
e515e9cc66 fix cloneEntity function 2019-03-11 12:38:54 -07:00
Seth Alves
2fb5e1ebc2 quiet some logging 2019-03-11 12:36:29 -07:00
Roxanne Skelly
e4e8a61328 Case 21326 - missing marketplaceInject.js 
The re-addition of marketplaceInject.js didn't merge from 80
for some reason.
 2019-03-11 10:46:51 -07:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Roxanne Skelly
e94d248ac5
Merge pull request #15126 from howard-stearns/domainUnlimited 
unlimited certified copies in a domain
 2019-03-08 10:23:42 -08:00
Shannon Romano
e776cf2627
Merge pull request #15127 from danteruiz/fix-websurface-module 
Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called
 2019-03-07 16:04:57 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo 
Case 21603: Tablet x button is nearly impossible to hit with stylus
 2019-03-07 16:03:13 -08:00
Shannon Romano
b567fd6cac
Merge pull request #15105 from danteruiz/disable-entity-scaling 
Case 20830: Disable entity scaling while grabbing
 2019-03-07 16:01:34 -08:00
Shannon Romano
37727c8b60
Merge pull request #14938 from dback2/draggableNumberDisabled 
Case 20662: Entity Properties - fix disabling draggable numbers
 2019-03-07 15:33:21 -08:00
danteruiz
87cfbe48d1 fix webSurfaceIntersection 2019-03-07 13:11:18 -08:00
danteruiz
05dc30a740 more requested changes 2019-03-07 10:49:37 -08:00
danteruiz
9ca3805499 making requested changes 2019-03-07 10:27:16 -08:00
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -08:00
SamGondelman
96eb137df2 fix debugAvatarMixer.js 2019-03-06 15:53:25 -08:00
Roxanne Skelly
a54171d60c
Merge pull request #15104 from roxanneskelly/79hero-master 
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
 2019-03-06 13:06:45 -08:00
Shannon Romano
fc2f1ff994
Merge pull request #14955 from thoys/fix/create/reloadCrash 
Case 18299: Remove workaround for Interactive window crash now that it is fixed
 2019-03-06 12:46:00 -08:00
danteruiz
272ca5dc1c disable entity scaling 2019-03-05 16:23:40 -08:00
Roxanne Skelly
fae6393663 Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42' 2019-03-05 15:11:25 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Wayne Chen
19ac8cae31 culling mute state 2019-03-04 14:18:10 -08:00
Wayne Chen
4187104b17 culling mute state 2019-03-04 14:12:09 -08:00
Seth Alves
216b53dcb0 attempt to take background noise into account when triggering mute warning 2019-03-04 13:47:55 -08:00
Seth Alves
f83f2b8226 keep muted warning in center of view for HMD 2019-03-04 13:47:55 -08:00
Seth Alves
3ecd86caee add a way to disble muted warning from audio panel. 
fix positioning of warning.  hide warning when removing timer.
 2019-03-04 13:47:55 -08:00
Seth Alves
d54d0280c2 rework audioMuteOverlay.js 2019-03-04 13:47:54 -08:00
Shannon Romano
6d297d91f6
Merge pull request #15073 from danteruiz/fix-tablet-button-rotation 
Case 21512: Very difficult to use the close button on the tablet (0.81.0)
 2019-03-04 10:49:16 -08:00
r3tk0n
12ffa41984 Prevent HUD and Web Surface lasers from interrupting FarGrab. 2019-03-02 13:55:06 -08:00
Simon Walton
83c9381575 Convert avatarPriority to trivalued (inherit, crowd, hero) 
Also tweaks from original reviewer comments.
 2019-03-01 17:25:46 -08:00
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo 
case 21485: removing quest-demo specific changes
 2019-03-01 15:03:44 -08:00
Jason Najera
d41c2d296b
Merge pull request #15043 from r3tk0n/fargrab-manipulation 
FarGrab Entity Rotation with Off-Hand
 2019-03-01 14:42:59 -08:00
danteruiz
618a1d5b83 fix tablet button and gizmos rotation 2019-03-01 14:31:12 -08:00
Jason Najera
6346df54af
Merge pull request #15061 from r3tk0n/away_bubble_protection 
[MS#21495] Enable Bubble/Shield on Away
 2019-03-01 11:17:48 -08:00
amer cerkic
6ebc57994b Merge branch 'master' into quest-demo 2019-03-01 10:23:41 -08:00
Shannon Romano
33e061b09b
Merge pull request #15022 from danteruiz/fix-tablet-scaling 
Case 21424: Tablet does not properly resize when scaling avatar.
 2019-03-01 09:37:47 -08:00
SamGondelman
8d5a3debfa fix chat.js textSize 2019-02-28 15:28:18 -08:00
r3tk0n
1476251dcb Enable bubble on AFK, respect user setting upon return from AFK. 2019-02-28 15:21:24 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo 2019-02-28 14:06:47 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
r3tk0n
a72b02cd25 Clean up code and add comments. 2019-02-28 13:08:05 -08:00
r3tk0n
3a5698236b Swap FarGrab from superpower to alternative version from PR#15043 2019-02-27 10:57:35 -08:00
r3tk0n
1ec887ffc2 Fix teleportation play area indicator not hiding on cancel. 2019-02-27 10:51:38 -08:00
r3tk0n
fcdfae5a67 Fix notion of hand dominance. 2019-02-27 08:39:35 -08:00
r3tk0n
7c515ccd45 Add 2x rotation multiplier. 2019-02-26 19:16:45 -08:00
r3tk0n
ca740c6254 Add a 2x multiplier for controller movement to entity rotation when manipulating with fargrab. 2019-02-26 18:44:00 -08:00
r3tk0n
52d80476a8 Fix activation criteria. 2019-02-26 17:55:16 -08:00