Seth Alves
|
75f4959b79
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-12 09:08:51 -07:00 |
|
Sam Gateau
|
a6a43b90ee
|
Merge pull request #12554 from NissimHadar/addRecursionToAutotester
Pull test images from GitHub
|
2018-03-12 08:59:07 -07:00 |
|
Seth Alves
|
22f1ec5c82
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-10 14:49:25 -08:00 |
|
NissimHadar
|
cb24fe6166
|
Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester
|
2018-03-09 18:15:03 -08:00 |
|
NissimHadar
|
84cc4c18a4
|
Added date/time to testResultsFolder.
|
2018-03-09 18:13:26 -08:00 |
|
SimonWalton-HiFi
|
e95afe78a2
|
Merge pull request #12614 from SimonWalton-HiFi/loghandler
Loghandler
|
2018-03-09 17:42:23 -08:00 |
|
Seth Alves
|
274c3224a2
|
fix going to a dns name or ip address
|
2018-03-09 16:58:50 -08:00 |
|
Simon Walton
|
cc166dbece
|
LogHandler regexps - use vector of values
|
2018-03-09 15:44:56 -08:00 |
|
Seth Alves
|
c781f88239
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-09 15:43:14 -08:00 |
|
Seth Alves
|
5b5ea11a18
|
changes to openUrl aren't needed for serverless domains
|
2018-03-09 15:43:05 -08:00 |
|
Simon Walton
|
d4cf22fbaf
|
LogHandler class stores regexps - code tweaks
Code standard changes from review.
|
2018-03-09 15:29:10 -08:00 |
|
Simon Walton
|
4b27cd73ff
|
LogHandler class stores regexps rather than always recreating
General efficiency tweaks; move to C++11.
|
2018-03-09 15:29:09 -08:00 |
|
John Conklin II
|
42a686ad93
|
Merge pull request #12578 from druiz17/use-correct-audio-api
use correct scripting api for audio in Audio.qml
|
2018-03-09 13:41:20 -08:00 |
|
Seth Alves
|
e102db109d
|
unmange merge
|
2018-03-09 13:04:50 -08:00 |
|
Sam Gateau
|
d0de5b2d96
|
Merge pull request #12496 from AndrewMeadows/faster-raypick
faster per-entity raypick culling and time-boxed picks
|
2018-03-09 13:01:52 -08:00 |
|
Seth Alves
|
621e6a62d6
|
merge from upstream
|
2018-03-09 12:07:24 -08:00 |
|
Seth Alves
|
58bc42990c
|
merge from upstream
|
2018-03-09 12:03:26 -08:00 |
|
John Conklin II
|
9044c9b472
|
Merge pull request #12600 from zfox23/preventSendingEmptyKeys
Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
|
2018-03-09 11:38:59 -08:00 |
|
Zach Fox
|
8d047184bb
|
Merge pull request #12592 from zfox23/fixUncertifiedPurchases
Don't default unknown Marketplace item types to 'Entity'
|
2018-03-09 11:11:12 -08:00 |
|
Dante Ruiz
|
e21c4988fb
|
stereo checkbox text change
|
2018-03-09 10:11:25 -08:00 |
|
Dante Ruiz
|
3a39fca268
|
made requested changes
|
2018-03-09 10:09:51 -08:00 |
|
John Conklin II
|
6969f014fc
|
Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one
clear wallet when picking a new one
|
2018-03-09 10:09:41 -08:00 |
|
Zach Fox
|
2b137f94a6
|
Merge pull request #12596 from zfox23/fixFontsAgain
Fix font loading for MacOS via completely different font loading method
|
2018-03-09 09:49:56 -08:00 |
|
Dante Ruiz
|
c49d0557fc
|
fixing check box issues
|
2018-03-09 09:29:37 -08:00 |
|
Brad Hefta-Gaub
|
6b55fa1fcd
|
Merge pull request #12539 from ctrlaltdavid/21702
Remove deprecated Window.location.protocolVersion() function from API
|
2018-03-09 08:52:55 -08:00 |
|
Brad Hefta-Gaub
|
8e44b429d8
|
Merge pull request #12472 from 1P-Cusack/FogBugz/Case_4315_VFXTabSupport
[Case 4315] Resolves Particle Tab Color Picker visual inconstency
|
2018-03-09 08:49:07 -08:00 |
|
Brad Hefta-Gaub
|
5437ffb2c8
|
Merge pull request #12536 from ctrlaltdavid/21700
Remove deprecated Window.openFileChanged() signal from API
|
2018-03-09 08:47:57 -08:00 |
|
Brad Hefta-Gaub
|
806e077387
|
Merge pull request #12609 from Atlante45/new-master
Merge RC65 back into master
|
2018-03-09 08:47:12 -08:00 |
|
Dante Ruiz
|
8703e9e002
|
Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api
|
2018-03-09 08:42:50 -08:00 |
|
Andrew Meadows
|
858b02f29d
|
more readable code
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
3f1944eb8a
|
fix variable name typo
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
9eecd3cb80
|
update styluses first: they are cheap
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
f83c6000df
|
use 'auto' for very long type
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
24635b0451
|
remove unused debug cruft variable
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
7a39bd5c81
|
remove tab whitespace
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
9fbe7ec194
|
time-box Picks and solve in round-robin sequence
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
7a19f48b9c
|
move rayHitsSphere logic to AABox method
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
2750f3ee71
|
remove unused cruft and avoid useless work
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
6ab85d5800
|
cleanup and a few small optimizations
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
79b9fec900
|
add rayHitsSphere() util method
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
81de668c1e
|
faster per-entity raypick culling
|
2018-03-09 08:35:18 -08:00 |
|
NissimHadar
|
77901e5089
|
Corrected MacOS warnings.
|
2018-03-08 20:11:35 -08:00 |
|
NissimHadar
|
aad41a56b2
|
Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester
|
2018-03-08 19:33:54 -08:00 |
|
Atlante45
|
69fb830480
|
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
|
2018-03-08 17:23:17 -08:00 |
|
John Conklin II
|
cad53a0203
|
Merge pull request #12585 from druiz17/small-tablet-changes
tablet scale and position changes
|
2018-03-08 15:36:06 -08:00 |
|
John Conklin II
|
fe0d354d26
|
Merge pull request #12599 from zfox23/RC65_preventSendingEmptyKeys
RC65: Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
|
2018-03-08 15:30:19 -08:00 |
|
NissimHadar
|
6026044526
|
Merge pull request #12558 from NissimHadar/shadowControlsOffZvork
Shadow control for zones, models and shapes
|
2018-03-08 15:04:19 -08:00 |
|
howard-stearns
|
9d805283d1
|
clear wallet when picking a new one
|
2018-03-08 14:24:44 -08:00 |
|
Zach Fox
|
409f5293bf
|
Try this
|
2018-03-08 13:51:34 -08:00 |
|
Zach Fox
|
086431d0e7
|
Merge branch 'master' of github.com:highfidelity/hifi into fixFontsAgain
|
2018-03-08 13:50:19 -08:00 |
|