Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 09:02:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63562 commits 25 branches 0 tags 1.1 GiB
Commit graph

63562 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Prat
cc8a717a81 Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal 2018-01-10 10:07:32 +01:00
SamGondelman
c46531296f move key logic from onClicked to onReleased 2018-01-09 18:28:54 -08:00
Ken Cooke
c363a9281e Fix another bug in audio-mixer audio packet parsing. 
For SilentAudioFrame packets, numSamples was being read as channel flag.
 2018-01-09 16:54:14 -08:00
Ken Cooke
ad2a031060 Fix bug in audio-mixer audio packet parsing. 
Codec string was being read as channel flag.
 2018-01-09 16:44:48 -08:00
Zach Fox
928e3d2ef7
Merge pull request #12108 from zfox23/commerce_pagination 
Commerce: Support pagination at History endpoint; improve Purchases scrolling
 2018-01-09 15:57:34 -08:00
Zach Fox
5469025113 More more more 2018-01-09 15:53:25 -08:00
Nissim Hadar
bb04b68e42 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-09 15:51:46 -08:00
Nissim Hadar
5b1f8e83d4 Removed gcc warning. 2018-01-09 15:46:15 -08:00
Dante Ruiz
c4253f3b3b Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-09 15:31:38 -08:00
Nissim Hadar
0b1e321ccf Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-09 15:25:03 -08:00
Nissim Hadar
b53e411184 Corrected pushing of default lights. 2018-01-09 15:24:46 -08:00
Brad Hefta-Gaub
a7b56da570
Merge pull request #12103 from ZappoMan/emoteApp 
first cut at an emote app
 2018-01-09 15:23:14 -08:00
Zach Fox
530df5447d Even more proress 2018-01-09 15:19:50 -08:00
SamGondelman
a42b0cf485 comment out logging 2018-01-09 14:58:23 -08:00
Dante Ruiz
125eb9ce44 add new tablet model and adjust screen offset 2018-01-09 14:31:57 -08:00
Zach Fox
edf25c3e4e Remove code duplication... 2018-01-09 14:14:54 -08:00
Zach Fox
40a3f8b31b Progress 2018-01-09 14:13:36 -08:00
Melissa Brown
7b50480a43
Merge pull request #12070 from 1st-BrainStormer/master 
WL#21651: Extend MIDI javascript support.
 2018-01-09 14:06:15 -08:00
Melissa Brown
19802b33eb
Merge pull request #12109 from vladest/tablet_page_indicator 
Page indicator visible only when pages more than one
 2018-01-09 14:05:32 -08:00
Nissim Hadar
4ecb056210 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-09 13:44:13 -08:00
ZappoMan
4f1dc2f184 fix CR comments 2018-01-09 13:42:51 -08:00
Zach Fox
a6259a5ef5 Initial progress 2018-01-09 13:39:28 -08:00
Nissim Hadar
8042b4b3fb Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-09 13:28:14 -08:00
Nissim Hadar
c3f6faed00 Deal correctly with inheritance at top-most level. 2018-01-09 13:27:57 -08:00
Andrew Meadows
8c6edc749a provide more context for update perf stats 2018-01-09 12:59:32 -08:00
SamGondelman
7c56a9ffb2 model meta is only withTypeShape if visual geometry request fails 2018-01-09 12:43:43 -08:00
Zach Fox
d31dec7acb Fix unix build errors 2018-01-09 12:41:56 -08:00
Zach Fox
0bc483f7a6
Merge pull request #12096 from ElderOrb/FB5648 
5648 play audio notification to confirm purchase upon rezzing
 2018-01-09 12:32:28 -08:00
John Conklin II
b1790cccbe
Merge pull request #12113 from druiz17/fix-double-set-tablet-root 
Don't call setQmlTabletRoot twice for Web3dOverlays RC62
 2018-01-09 12:25:00 -08:00
Atlante45
776a2e8373 Fix concurrent access crash in avatar mixer 2018-01-09 11:24:34 -08:00
Zach Fox
360a7cc4c6 CR feedback 2018-01-09 11:08:18 -08:00
Anthony J. Thibault
e28f13c1db Merge branch 'master' into bug-fix/better-third-person-camera 2018-01-09 10:34:04 -08:00
Anthony Thibault
1f1ac71b73
Merge pull request #12111 from hyperlogic/bug-fix/oculus-touch-angular-velocity 
Oculus Touch: More accurate spin on thrown objects
 2018-01-09 10:13:34 -08:00
Nissim Hadar
e94982a470 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-09 10:10:27 -08:00
John Conklin II
fd6c5e72f0
Merge pull request #12119 from luiscuenca/toolbarFix 
Fix toolbar is visible on HMD mode
 2018-01-09 09:42:19 -08:00
Thijs Wenker
88d353a642
Merge pull request #12105 from misslivirose/feat/make-zones-lights-not-grabbable 
Make zones, lights, and particles not grabbable when created in edit.js
 2018-01-09 18:26:13 +01:00
John Conklin II
8d416133b4
Merge pull request #12112 from hyperlogic/bug-fix/oculus-touch-angular-velocity-rc62 
RC62 - Oculus Touch: More accurate spin on thrown objects
 2018-01-09 09:22:23 -08:00
Seth Alves
72ac1dd216 walk by default, put old walk speed back 2018-01-09 08:50:20 -08:00
Seth Alves
db307851f0 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-09 08:48:06 -08:00
Seth Alves
87dfe0efc3
Merge pull request #12097 from vladest/tablet_pagination_magnify 
Tablet pagination magnify
 2018-01-09 08:08:02 -08:00
Olivier Prat
db9e5fdae8 Merged from master but rendering seems broken 2018-01-09 11:05:34 +01:00
Cain Kilgore
4534419e53 Merge branch 'master' of https://github.com/highfidelity/hifi into 21667 2018-01-09 09:45:28 +00:00
Cain Kilgore
f78ee7c167 WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel 2018-01-09 09:44:12 +00:00
Cain Kilgore
0e3913baff Removed Window.menuHeight 2018-01-09 09:07:26 +00:00
Cain Kilgore
773461bd30 Merge branch 'master' of https://github.com/highfidelity/hifi into 21666 2018-01-09 08:33:44 +00:00
Cain Kilgore
46de7ed83b WL 21666 - Window.domainChanged() isn't emitted if domain isn't running 2018-01-09 08:32:59 +00:00
Alexander Ivash
7e87cb38e1 adjusted code to PR comments 2018-01-09 11:10:23 +03:00
Bruce Brown
e9f8dafbc8 Corrected bitwise operators, Removed midiRaw signal. 2018-01-08 20:10:22 -08:00
luiscuenca
9a81410762 refactor 2018-01-08 20:51:15 -07:00
luiscuenca
319913e6af Fix toolbar appears on HMD mode 2018-01-08 20:37:07 -07:00