Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-15 10:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63477 commits 6 branches 1 tag 1.1 GiB
Commit graph

63477 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Conklin II
36a76dad2b
Merge pull request #12125 from druiz17/fix-tablet-model 
Add adjustments to tablet model and screen offset
 2018-01-10 14:55:08 -08:00
John Conklin II
428c8e6737
Merge pull request #12137 from SamGondelman/RC62 
Keep requesting render update until textures load (RC62)
 2018-01-10 14:54:15 -08:00
Nissim Hadar
dff47f38a7 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-10 13:36:09 -08:00
Nissim Hadar
8396997dec Renamed enum element. 2018-01-10 13:35:57 -08:00
SamGondelman
6072780d24 keep requesting render update until textures load 
(cherry picked from commit df574c6bc9)
 2018-01-10 13:27:19 -08:00
SamGondelman
df574c6bc9 keep requesting render update until textures load 2018-01-10 13:19:53 -08:00
Cain Kilgore
104ac0ffae
Indents, man 2018-01-10 20:30:41 +00:00
MiladNazeri
b73106fa7e
Merge pull request #12120 from cain-kilgore/21666 
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
 2018-01-10 12:30:21 -08:00
Cain Kilgore
b26e31a362
Copy paste? Never! 2018-01-10 20:27:19 +00:00
MiladNazeri
2220b976dc
Merge pull request #12130 from cain-kilgore/21665 
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
 2018-01-10 12:06:58 -08:00
Anthony J. Thibault
250e4032b0 Bug fix to prevent wrists entering the avatar's torso. 
This was inadvertently disabled in PR #11978.

(cherry picked from commit ae997928c1)
 2018-01-10 12:04:50 -08:00
MiladNazeri
bf61d8c7b3
Merge pull request #12115 from ctrlaltdavid/deprecations 
Update JSDoc with some deprecations
 2018-01-10 12:04:21 -08:00
luiscuenca
e54f7d5a45 Fix Pal Master Volume overlap 2018-01-10 13:03:54 -07:00
Anthony J. Thibault
ae997928c1 Bug fix to prevent wrists entering the avatar's torso. 
This was inadvertently disabled in PR #11978.
 2018-01-10 11:51:44 -08:00
Nissim Hadar
ea10bfba6c Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-10 11:49:53 -08:00
Nissim Hadar
c99a936720 Bumped up protocol version. 2018-01-10 11:45:37 -08:00
Cain Kilgore
057c708637
Spaces instead of Tabs 
(Damnit VS Re-install!)
 2018-01-10 19:24:52 +00:00
Anthony J. Thibault
220b7f5e55 Merge branch 'master' into bug-fix/better-third-person-camera 2018-01-10 10:14:09 -08:00
Dante Ruiz
d0bff29471 fixing merge conflict 2018-01-10 10:11:53 -08:00
Howard Stearns
fafc98f51c
Merge pull request #12098 from ElderOrb/FB11123 
FB11123 Make the certificate GOLD (and change title to Proof of Prove…
 2018-01-10 10:01:15 -08:00
Andrew Meadows
7060cd9a90
Merge pull request #12122 from druiz17/fix-double-set-tablet-root 
don't call setQmlTabletRoot twice
 2018-01-10 09:53:09 -08:00
Nissim Hadar
9f25b01b10 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-10 09:30:05 -08:00
Sam Gateau
539ee82937
Merge pull request #12033 from Zvork/compactvb 
More compact representation of meshes on GPU
 2018-01-10 09:11:33 -08:00
Sam Gateau
d4dc1e352f
Merge pull request #12124 from AndrewMeadows/no-misc-stats 
more context for update performance stats
 2018-01-10 09:10:26 -08:00
Sam Gateau
8c80247925
Merge pull request #12123 from SamGondelman/meta 
Model meta render item is only withTypeShape if visual geometry request fails
 2018-01-10 09:09:19 -08:00
Sam Gateau
6d6aad4aa8
Merge pull request #12060 from SamGondelman/burp5 
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
 2018-01-10 09:08:54 -08:00
NissimHadar
7fbb945892
Merge pull request #12055 from NissimHadar/keylightInheritance 
Keylight inheritance
 2018-01-10 08:40:14 -08:00
Ken Cooke
660032d8fb Fix bug in how emitAudioPacket() determines mono/stereo. 
Compressed bytes were counted as if audio samples.
 2018-01-10 06:54:27 -08:00
Cain Kilgore
330b266ca8 Merge branch 'master' of https://github.com/highfidelity/hifi into 21665 2018-01-10 11:33:06 +00:00
Cain Kilgore
38afc5a25b WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal 2018-01-10 11:31:46 +00:00
Olivier Prat
5ae4b99b90 Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2018-01-10 11:20:00 +01:00
Olivier Prat
2960ad845c Fixed weird rendering bug. 2018-01-10 10:55:45 +01:00
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
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
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
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