Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-05 07:23:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76939 commits 6 branches 1 tag 1.1 GiB
Commit graph

76939 commits

This branch
This branch
All branches
Author SHA1 Message Date
danteruiz
87cfbe48d1 fix webSurfaceIntersection 2019-03-07 13:11:18 -08:00
Wayne Chen
2b51f19d70
Merge pull request #12 from wayne-chen/pushToTalk 
removing debug print statement
 2019-03-07 12:55:20 -08:00
Wayne Chen
44674d4baf Merge branch 'pushToTalk' of https://github.com/wayne-chen/hifi into pushToTalk 2019-03-07 12:54:49 -08:00
Wayne Chen
472c7ffab4 removing debug statement 2019-03-07 12:54:32 -08:00
John Conklin II
9a4b95faa2
Merge pull request #15111 from luiscuenca/flowDataOnFst 
Load flow bone data from FST file
 2019-03-07 12:48:36 -08:00
Wayne Chen
13f23a57bf
Merge pull request #11 from wayne-chen/pushToTalk 
adding Controller.Actions.TogglePushToTalk + rebase with master
 2019-03-07 12:39:18 -08:00
Wayne Chen
b94b6d06a2
Merge branch 'ptt' into pushToTalk 2019-03-07 12:38:59 -08:00
Wayne Chen
b4f16daa29 Merge branch 'pushToTalk' of https://github.com/wayne-chen/hifi into pushToTalk 2019-03-07 12:37:25 -08:00
Wayne Chen
b83e9f70e6 adding PushToTalk action 2019-03-07 12:36:56 -08:00
r3tk0n
a62cadc541 Fix typo. 2019-03-07 12:35:04 -08:00
NissimHadar
684f9929a9 Improved error message. 2019-03-07 12:22:07 -08:00
NissimHadar
8acec5c9e9 Increased threshold to 0.9999 2019-03-07 12:21:40 -08:00
r3tk0n
55efc315f1 Fix activation / deactivation criteria for PTT controller module. 2019-03-07 11:45:59 -08:00
r3tk0n
9d59e68d45 Enable pushToTalk.js controller module. 2019-03-07 11:41:20 -08:00
r3tk0n
2536fcaa17 Add pushToTalk.js controllerModule. 2019-03-07 11:41:19 -08:00
Wayne Chen
7b197c975c updating compile failure + icons/settings update 2019-03-07 11:41:19 -08:00
Wayne Chen
0cb9e7eb36 exposing setting pushingToTalk 2019-03-07 11:41:19 -08:00
Wayne Chen
9613cfb6b9 changing text display 2019-03-07 11:41:19 -08:00
Wayne Chen
066d1797cf Push to talk changes + rebased with master (#7) 
Push to talk changes + rebased with master
 2019-03-07 11:41:19 -08:00
Wayne Chen
eeb900b761 laying groundwork for audio app + fixing deadlocks 2019-03-07 11:41:19 -08:00
r3tk0n
d8478e0b17 Initial implementation (deadlocks still occurring in Audio.cpp) 2019-03-07 11:41:18 -08:00
NissimHadar
53d682d40e Merge branch 'master' of github.com:highfidelity/hifi into 21559-increaseComparisonThreshold 2019-03-07 11:32:12 -08:00
r3tk0n
f444f383eb Enable pushToTalk.js controller module. 2019-03-07 11:31:48 -08:00
r3tk0n
36f62f05d1 Add pushToTalk.js controllerModule. 2019-03-07 11:31:28 -08:00
John Conklin II
abb61b7e90
Merge pull request #15124 from SamGondelman/shapes 
Case 21605: Fix shapes app and debugAvatarMixer
 2019-03-07 11:07:45 -08:00
Howard Stearns
ab8f6273ad
Merge pull request #15113 from howard-stearns/stock-to-master 
Stock to master
 2019-03-07 11:02:53 -08:00
Anthony Thibault
96a696203c
Merge pull request #15101 from amantley/bugAvatarHovers 
Fixed: Avatar hovers off ground while running
 2019-03-07 10:52:20 -08:00
danteruiz
05dc30a740 more requested changes 2019-03-07 10:49:37 -08:00
Shannon Romano
d11c04a19d
Merge pull request #15117 from SamGondelman/wearables 
Case 21596: Fix wearable scale on position change
 2019-03-07 10:29:47 -08:00
danteruiz
9ca3805499 making requested changes 2019-03-07 10:27:16 -08:00
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -08:00
Sam Gateau
6841668040
Merge pull request #15071 from NissimHadar/21507-replaceQNetworkAccessManagerWithPython 
Case 21507: replace Qt network access manager with python
 2019-03-07 10:04:26 -08:00
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -08:00
Sam Gondelman
dc4e2645da
even better! 2019-03-07 08:05:32 -08:00
SamGondelman
380df059ff fix shapes app 2019-03-06 18:18:39 -08:00
Wayne Chen
aabdb98d2f
Merge pull request #10 from wayne-chen/pushToTalk 
updating compile failure + icons/settings update
 2019-03-06 17:30:15 -08:00
amantley
fcf1e34175
Merge pull request #15114 from amantley/ikEnabledFix 
Ik enabled fix
 2019-03-06 20:29:38 -05:00
Wayne Chen
e218e4bead updating compile failure + icons/settings update 2019-03-06 17:29:32 -08:00
danteruiz
a0bd2f67ec fix stylus gizmo intersection 2019-03-06 17:20:36 -08:00
Shannon Romano
d068630728
Merge pull request #15108 from sabrina-shanman/crash_physics-fst 
(case 21585) Fix crash when FST model used as both graphics and physics model
 2019-03-06 17:06:38 -08:00
SamGondelman
96eb137df2 fix debugAvatarMixer.js 2019-03-06 15:53:25 -08:00
amantley
474a97d0fc now update the ikOverlayAlpha every frame 2019-03-06 15:15:30 -08:00
SamGondelman
0f3e1b9157 fix wearable scale on position change 2019-03-06 14:53:21 -08:00
Anthony Thibault
c5e9a7d1ab Added unit test for AnimPose() ctor using matrix with negative determinant 2019-03-06 14:26:50 -08:00
Anthony Thibault
5fcfa265d2 Remove alternate versions of AnimPose(mat4) constructor 2019-03-06 14:02:58 -08:00
David Back
cea17985ff new jointRotationOffset field 2019-03-06 13:55:20 -08:00
David Back
9cc1a7aaaa CR changes 2019-03-06 13:44:27 -08:00
David Back
d063825269 export unity material data to materialMap in fst 2019-03-06 13:44:27 -08:00
Howard Stearns
c6b2697b44 cleanup 2019-03-06 13:28:55 -08:00
Anthony Thibault
0dbc83049b Make AnimPose from mat4 work better for matrices with negative determinants. 
Took part of this code from glm::decompose() which references
https://opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp
 2019-03-06 13:28:14 -08:00