samcake
|
4dc3685e35
|
Cosmetic change to the ui and adding more feature to the ConfigSlider
|
2018-03-08 14:50:07 -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 |
|
John Conklin II
|
260715d616
|
Merge pull request #12580 from elisa-lj11/RC65-blocks-image-bug
Fixed blocks importer textures being interpreted as image entities
|
2018-03-08 13:33:41 -08:00 |
|
Zach Fox
|
b273d78729
|
Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
|
2018-03-08 13:18:02 -08:00 |
|
Zach Fox
|
22f18dbf56
|
Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
|
2018-03-08 13:12:13 -08:00 |
|
Dante Ruiz
|
9f246ea314
|
Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api
|
2018-03-08 13:04:02 -08:00 |
|
John Conklin II
|
c5514f5120
|
Merge pull request #12570 from dback2/RC65
Redo entity scale handles to fix scaling into avatars causing undesirable physics/dimensions
|
2018-03-08 12:58:08 -08:00 |
|
NissimHadar
|
fda32e4aa4
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-08 12:16:36 -08:00 |
|
NissimHadar
|
a703b5a3b5
|
Added check to correct crashing when selecting ambient occlusion from menu.
|
2018-03-08 12:15:26 -08:00 |
|
NissimHadar
|
d1b87b3116
|
Added missing avatar shadows.
|
2018-03-08 12:14:42 -08:00 |
|
Zach Fox
|
a479439b23
|
Merge pull request #12572 from zfox23/sendMoney_connectionInstructions
Show Connection instructions in Send Money when 0 connections
|
2018-03-08 11:20:23 -08:00 |
|
Zach Fox
|
d0cc64f63d
|
Fix font loading for MacOS via different font loading method
|
2018-03-08 11:19:49 -08:00 |
|
Brad Hefta-Gaub
|
d2e264ab32
|
Merge pull request #12583 from samcake/punk
Fix Local lights not showing anymore
|
2018-03-08 10:31:58 -08:00 |
|
Sam Gondelman
|
1e9cfe29f2
|
Merge pull request #12388 from highfidelity/android
Android Tip
|
2018-03-08 10:18:35 -08:00 |
|
John Conklin II
|
1341774450
|
Merge pull request #12482 from SimonWalton-HiFi/declare-metatype
Add a Q_DECLARE_METATYPE in TextureCache.
|
2018-03-08 09:37:06 -08:00 |
|
John Conklin II
|
3e9e55c3db
|
Merge pull request #12591 from zfox23/RC65_fixUncertifiedPurchases
Don't default unknown Marketplace item types to 'Entity'
|
2018-03-08 09:36:28 -08:00 |
|
Andrew Meadows
|
0b82e91405
|
Merge pull request #12595 from samcake/workload
Workload: Fixing a bug in RegionState and more ui to debug the Regions of the view
|
2018-03-08 08:29:36 -08:00 |
|
David Back
|
554c37d14b
|
removed undefined event checks in scaling
|
2018-03-07 19:34:08 -08:00 |
|
Sam Gateau
|
0170086267
|
Merge branch 'workload' of github.com:samcake/hifi into workload-bis
|
2018-03-07 19:01:56 -08:00 |
|
Sam Gateau
|
ceb38dbc97
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-03-07 18:54:21 -08:00 |
|
Sam Gateau
|
62d37b42f3
|
Merge pull request #12594 from samcake/master-workload
Workload: update with upstream master
|
2018-03-07 18:53:38 -08:00 |
|
Sam Gateau
|
46d824c8ba
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis
|
2018-03-07 18:28:08 -08:00 |
|
David Back
|
9681f0eb77
|
restore old scale math, disable avatar collisions while scaling
|
2018-03-07 18:20:26 -08:00 |
|
Sam Gateau
|
dc122b4ce8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
|
2018-03-07 18:14:44 -08:00 |
|
NissimHadar
|
7052ea3769
|
Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester
|
2018-03-07 17:46:14 -08:00 |
|
NissimHadar
|
a4854839a4
|
Enable user selection of destination folder when creating a test.
|
2018-03-07 17:45:10 -08:00 |
|
samcake
|
87b159e491
|
merge with upstream, fixed a smal typo bug and clean up the ui
|
2018-03-07 17:30:11 -08:00 |
|
Clément Brisset
|
b7ac07f590
|
Merge pull request #12589 from highfidelity/RC65
merge back RC65 to master after RC hotfixes
|
2018-03-07 17:22:41 -08:00 |
|
Sam Gateau
|
a671721e50
|
Merge pull request #12587 from AndrewMeadows/workload-008
workload: add RegionState job
|
2018-03-07 17:02:43 -08:00 |
|
Andrew Meadows
|
77d0c211df
|
fix warnings on windows
|
2018-03-07 15:46:42 -08:00 |
|
David Rowe
|
d4487e92b8
|
Further JSDoc tweaks
|
2018-03-08 12:23:13 +13:00 |
|
Zach Fox
|
16e39f3637
|
Don't default unknown Marketplace item types to 'Entity'
|
2018-03-07 15:07:17 -08:00 |
|
Zach Fox
|
a0eb7e0712
|
Don't default unknown Marketplace item types to 'Entity'
|
2018-03-07 15:01:12 -08:00 |
|
John Conklin II
|
fcb2f358f8
|
Merge pull request #12579 from SimonWalton-HiFi/RC65
Fix for avatar record only replaying once
|
2018-03-07 14:55:03 -08:00 |
|
Sam Gondelman
|
f51a35455a
|
Merge pull request #12515 from SamGondelman/scriptableMaterials
Material reflection
|
2018-03-07 14:29:31 -08:00 |
|
David Rowe
|
e2bf84224a
|
Add further examples.
|
2018-03-08 10:59:12 +13:00 |
|
Elisa Lupin-Jimenez
|
2987c90f96
|
fixed syntax for ubuntu
|
2018-03-07 13:48:35 -08:00 |
|
SamGondelman
|
0aacdcd558
|
docs
|
2018-03-07 13:34:48 -08:00 |
|
NissimHadar
|
b47b512ab9
|
Completed recursive creation of recursive scripts.
|
2018-03-07 13:25:40 -08:00 |
|
Elisa Lupin-Jimenez
|
9ae2da7e4b
|
fixed logic for texture files/non-models
|
2018-03-07 13:18:36 -08:00 |
|
John Conklin II
|
7381bb0d7e
|
Merge pull request #12447 from birarda/feat/oven-no-dock-bounce
use QCoreApplication for Oven when headless version is used
|
2018-03-07 12:56:25 -08:00 |
|
Gabriel Calero
|
109fa1d832
|
Add the url of each qml as on-screen debug info
|
2018-03-07 17:18:37 -03:00 |
|
John Conklin II
|
e0a11271bf
|
Merge pull request #12573 from birarda/bug/domain-settings-metaverse
fix for getSetting QVariant ref in DomainServer
|
2018-03-07 12:11:45 -08:00 |
|
John Conklin II
|
84c9016e2a
|
Merge pull request #12548 from Atlante45/fix/ds-consolidate-crash
Prevent crash during long backup web requests
|
2018-03-07 12:11:04 -08:00 |
|
NissimHadar
|
9bd7f31ff3
|
Now search for tests folder bottom-up.
|
2018-03-07 11:30:30 -08:00 |
|
Andrew Meadows
|
0d9b1a7368
|
jobflow: RegionTracker --> RegionState
|
2018-03-07 11:19:47 -08:00 |
|
David Rowe
|
dba0c1046e
|
Fix typo
|
2018-03-08 08:17:26 +13:00 |
|
Ken Cooke
|
91b7acec1f
|
Fix crash when closing the Audio menu. On some machines, checkPeakValues takes long enough that timer callbacks overlap and activeClients gets clobbered while in use.
|
2018-03-07 11:06:53 -08:00 |
|