Zach Fox
|
5ab737f66d
|
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
Commerce: Owner Verification for Certified Entities
|
2017-10-27 12:28:04 -07:00 |
|
Zach Fox
|
3fae121335
|
Merge pull request #11670 from zfox23/stagingSetting
Make it easier to switch between STABLE and STAGING Metaverses
|
2017-10-27 12:03:29 -07:00 |
|
Brad Hefta-Gaub
|
f21a284324
|
Merge pull request #11700 from SamGondelman/face
Billboardables face avatar instead of facing away
|
2017-10-26 20:40:29 -07:00 |
|
Zach Fox
|
9481824d0a
|
Fix enabled status of wear button
|
2017-10-26 17:02:09 -07:00 |
|
Zach Fox
|
8cb60fc62c
|
Small edit.js changes
|
2017-10-26 16:44:21 -07:00 |
|
SamGondelman
|
755ce183e0
|
fix is facing avatar
|
2017-10-26 14:16:31 -07:00 |
|
Zach Fox
|
002141724b
|
Return to using NetworkingConstants
|
2017-10-26 14:12:36 -07:00 |
|
Zach Fox
|
3e95484c4c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting
|
2017-10-26 13:58:50 -07:00 |
|
Brad Hefta-Gaub
|
e6dca8de86
|
Merge pull request #11698 from kencooke/audio-sample-sound-fix
Tighter version of sample sound
|
2017-10-26 13:45:19 -07:00 |
|
Zach Fox
|
d24f241b88
|
Fix silly javascript error
|
2017-10-26 13:31:15 -07:00 |
|
Bradley Austin Davis
|
becd99a964
|
Merge pull request #11584 from SamGondelman/pointerEvents
First step of cleaning up PointerEvents
|
2017-10-26 12:01:03 -07:00 |
|
Ken Cooke
|
2156729a75
|
Tighter version of sample sound
|
2017-10-26 11:48:40 -07:00 |
|
Sam Gateau
|
6051a3913f
|
Merge pull request #11684 from NissimHadar/bugFix8610
Bug fix 8610
|
2017-10-26 10:55:29 -07:00 |
|
Liv
|
c571af6bb2
|
Merge pull request #11689 from ctrlaltdavid/21580
Remove stopwatch source in favor of using source in hifi-content repo
|
2017-10-26 09:38:51 -07:00 |
|
Ken Cooke
|
4eb8b826c2
|
Merge pull request #11681 from luiscuenca/case6443
6443 Audio Menu Sample Sound won't play while domain is loading
|
2017-10-26 08:40:30 -07:00 |
|
Ken Cooke
|
30d6185625
|
Merge pull request #11687 from ctrlaltdavid/21577
Fix script reload icon not working in Windows developer builds
|
2017-10-26 08:35:59 -07:00 |
|
Seth Alves
|
807b4c4ed2
|
Merge pull request #11686 from NissimHadar/hazeZone
Reduced haze background blend range to 27,000 metres.
|
2017-10-26 08:13:24 -07:00 |
|
luiscuenca
|
b7c375f396
|
Cleaning
|
2017-10-25 19:09:37 -07:00 |
|
luiscuenca
|
3d3077978e
|
Simplyfied and fixed null pointer
|
2017-10-25 18:47:10 -07:00 |
|
Clément Brisset
|
61a2d80117
|
Merge pull request #11676 from Atlante45/new-master
Merge stable back into master
|
2017-10-25 18:37:50 -07:00 |
|
David Rowe
|
7cb6bae1e6
|
Remove stopwatch source in favor of using source in hifi-content repo
|
2017-10-26 14:09:50 +13:00 |
|
Seth Alves
|
0f31631f17
|
Merge pull request #11677 from druiz17/fix-fargrab
Make non-dynamic entities collisionless during far-grab
|
2017-10-25 17:31:02 -07:00 |
|
Sam Gondelman
|
863a2041a6
|
Merge branch 'master' into pointerEvents
|
2017-10-25 17:22:19 -07:00 |
|
David Rowe
|
da33c4fcf2
|
Fix script reload icon not working in Windows developer builds
|
2017-10-26 11:41:52 +13:00 |
|
Zach Fox
|
2f28cf1443
|
Remove unnecessary newline
|
2017-10-25 15:20:31 -07:00 |
|
Zach Fox
|
3f0108528d
|
Remove unnecessary newline
|
2017-10-25 15:19:56 -07:00 |
|
Nissim Hadar
|
2ec62ecc9b
|
Reduced haze background blend range to 27,000 metres.
|
2017-10-25 15:12:01 -07:00 |
|
Brad Hefta-Gaub
|
b53f1d5027
|
Merge pull request #11679 from ZappoMan/fixDPISetting
Fix dpi setting in edit.js
|
2017-10-25 14:14:11 -07:00 |
|
Nissim Hadar
|
bfab466827
|
Bug 8610.
|
2017-10-25 14:13:53 -07:00 |
|
Nissim Hadar
|
8d11ace1a6
|
Bug 8610.
|
2017-10-25 13:46:59 -07:00 |
|
luiscuenca
|
a1c9285c90
|
Fixed bug on case 6443
|
2017-10-25 13:13:50 -07:00 |
|
Atlante45
|
ff547f4e4f
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2017-10-25 13:03:46 -07:00 |
|
Zach Fox
|
14150c09ac
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting
|
2017-10-25 12:59:36 -07:00 |
|
Dante Ruiz
|
8d07f2a6a3
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-fargrab
|
2017-10-25 12:53:14 -07:00 |
|
ZappoMan
|
dcb6530b8a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixDPISetting
|
2017-10-25 12:39:57 -07:00 |
|
Brad Hefta-Gaub
|
0c9184566e
|
Merge pull request #11678 from AndrewMeadows/fix-broken-build
fix compile errors after merge
|
2017-10-25 12:39:34 -07:00 |
|
Stephen Birarda
|
a28f2f19e0
|
Merge pull request #11674 from utkarshgautamnyu/fix/JSBaker
Fixed issue with QTextStream in JSBaker
|
2017-10-25 14:06:43 -05:00 |
|
ZappoMan
|
226b974ce8
|
DPI is not a decimal
|
2017-10-25 11:59:29 -07:00 |
|
Andrew Meadows
|
c14bbb76e6
|
fix compile errors after merge
|
2017-10-25 11:57:44 -07:00 |
|
Dante Ruiz
|
2ec8f3f625
|
made non-dynamic entities collisionless during far-grab
|
2017-10-25 11:29:32 -07:00 |
|
Ryan Downe Karpf
|
4cefd3937b
|
Merge pull request #11589 from highfidelity/RC-57
Beta Release 57 - Includes up to Developer Release 7288
|
2017-10-25 10:53:24 -07:00 |
|
Andrew Meadows
|
2d0b94817c
|
Merge pull request #11336 from 1P-Cusack/21389_PR2
WL21389 PR2: Representation of collision shapes need updating (details below).
|
2017-10-25 10:41:21 -07:00 |
|
Seth Alves
|
66e38af1b3
|
Merge pull request #11671 from ElderOrb/case8553
8380 Mouse Disappears when switching between HMD and Desktop Mode while in Create
|
2017-10-25 10:31:31 -07:00 |
|
Zach Fox
|
91333cdf7b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
|
2017-10-25 10:26:50 -07:00 |
|
Zach Fox
|
d7bdbfb37b
|
Fix unix build errors
|
2017-10-25 09:53:59 -07:00 |
|
Seth Alves
|
815f680475
|
Merge pull request #11675 from ZappoMan/fixRayPick
fix ray pick in cases where origin is inside of outer bounding box
|
2017-10-25 07:07:36 -07:00 |
|
Brad Hefta-Gaub
|
18a74cea91
|
Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
2017-10-23: Merge RC57 into Master
|
2017-10-24 21:19:01 -07:00 |
|
Brad Hefta-Gaub
|
bcad2302c4
|
Merge pull request #11667 from druiz17/crash-keyboard
Fix keyboard related crash.
|
2017-10-24 21:17:49 -07:00 |
|
Brad Hefta-Gaub
|
ef78711b7b
|
Merge pull request #11663 from AndrewMeadows/shape-sharing
fix incorrect collision shape sharing for some ModelEntityItem configurations
|
2017-10-24 21:04:57 -07:00 |
|
Brad Hefta-Gaub
|
2a865f3a45
|
Merge pull request #11666 from SamGondelman/mirrorMode
Fix backwards HUD in mirror mode
|
2017-10-24 21:03:29 -07:00 |
|