Seth Alves
|
7c7f42af06
|
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
|
2018-03-07 18:26:15 -08:00 |
|
Seth Alves
|
4ed0c24a73
|
use static QStrings rather than functions
|
2018-03-07 18:25:55 -08:00 |
|
Seth Alves
|
e70ca252de
|
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
|
2018-03-07 16:03:48 -08:00 |
|
Seth Alves
|
12eb0e4109
|
name emit from AddressManager like an event
|
2018-03-07 15:36:35 -08:00 |
|
Seth Alves
|
9f2be4db8f
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-07 15:04:38 -08:00 |
|
Sam Gondelman
|
f51a35455a
|
Merge pull request #12515 from SamGondelman/scriptableMaterials
Material reflection
|
2018-03-07 14:29:31 -08:00 |
|
Seth Alves
|
e583d3d104
|
Merge pull request #26 from druiz17/serverless-domains
Serverless domains
|
2018-03-07 13:40:55 -08:00 |
|
Seth Alves
|
4505fce508
|
use const QUrls rather than functions
|
2018-03-07 13:39:44 -08:00 |
|
SamGondelman
|
0aacdcd558
|
docs
|
2018-03-07 13:34:48 -08:00 |
|
Dante Ruiz
|
1a1e9cf628
|
adding simple json
|
2018-03-07 13:34:02 -08:00 |
|
Dante Ruiz
|
291c8674db
|
removing files
|
2018-03-07 13:01:24 -08:00 |
|
Dante Ruiz
|
8382d842e1
|
changing to resources path
|
2018-03-07 12:51:26 -08:00 |
|
Seth Alves
|
8a08039efe
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-07 11:44:48 -08:00 |
|
Brad Hefta-Gaub
|
9595049e01
|
Merge pull request #12582 from thoys/fix/JSDOCtypo
fix JSDOC typo rule -> role
|
2018-03-07 07:50:07 -08:00 |
|
Seth Alves
|
b8fc9e2469
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-07 07:40:35 -08:00 |
|
Thijs Wenker
|
866bec0b34
|
rule -> role
|
2018-03-07 02:36:07 +01:00 |
|
Zach Fox
|
04a230c20f
|
Merge pull request #12491 from ElderOrb/FB12523
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
|
2018-03-06 16:19:39 -08:00 |
|
Clément Brisset
|
fdc054c86b
|
Merge pull request #12577 from Atlante45/new-master
RC65 merge back into master
|
2018-03-06 16:17:27 -08:00 |
|
Seth Alves
|
926be73c0a
|
make this work again
|
2018-03-06 15:50:03 -08:00 |
|
Atlante45
|
edeed95ccc
|
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
|
2018-03-06 15:33:12 -08:00 |
|
Seth Alves
|
94b6115271
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-06 13:23:01 -08:00 |
|
Seth Alves
|
79aa450332
|
some code-review induced changes
|
2018-03-06 13:11:09 -08:00 |
|
John Conklin II
|
9294ae0dd2
|
Merge pull request #12567 from elisa-lj11/RC65-update
Added fixed log spam undefined error to RC65
|
2018-03-06 12:40:28 -08:00 |
|
Alexander Ivash
|
53e1a0cae5
|
forward 'maybeEnableHmdPreview' if control is not visible
|
2018-03-06 22:25:35 +03:00 |
|
Elisa Lupin-Jimenez
|
15c1f5ba30
|
fixed log spam undefined error
|
2018-03-06 11:01:50 -08:00 |
|
John Conklin II
|
acf1f48d9e
|
Merge pull request #12550 from thoys/fix/grabbableCheckbox
FIX: make the grabbable checkbox function again when dynamic disabled
|
2018-03-05 14:55:38 -08:00 |
|
John Conklin II
|
16bb992d8d
|
Merge pull request #12557 from druiz17/correctly-use-defaults-values
correctly use default values and don't delete userData in entitiesProperties.js
|
2018-03-05 13:15:23 -08:00 |
|
John Conklin II
|
7bc3848c36
|
Merge pull request #12533 from druiz17/stereo-checkbox
Adding Stereo checkbox in Audio settings
|
2018-03-05 12:45:01 -08:00 |
|
Seth Alves
|
7d6927a00d
|
Merge pull request #12555 from druiz17/fix-controllerDispacther-error
fix controllerDispatcher error in logs
|
2018-03-05 12:08:35 -08:00 |
|
Thijs Wenker
|
d7725f1d73
|
make the grabbable checkbox again, respect default true setting
|
2018-03-05 20:54:08 +01:00 |
|
Dante Ruiz
|
1997cd27bd
|
correctly use default values
|
2018-03-05 11:26:37 -08:00 |
|
Dante Ruiz
|
654770af51
|
fix controller dispatacher error
|
2018-03-05 09:39:26 -08:00 |
|
Seth Alves
|
a6c3bcd8d8
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-05 08:51:12 -08:00 |
|
John Conklin II
|
8cb7e0584f
|
Merge pull request #12547 from Atlante45/fix/session-uuid-lock
Protect session UUID from concurrent read/writes
|
2018-03-05 08:24:22 -08:00 |
|
John Conklin II
|
3f751bb5ca
|
Merge pull request #12546 from druiz17/fix-hyperlink
Fix hyperlink when far/near grabbing enitities
|
2018-03-05 08:23:51 -08:00 |
|
Seth Alves
|
dabdff9b2b
|
don't add extra entry in history when going 'back' from a serverless domain
|
2018-03-03 08:33:42 -08:00 |
|
Seth Alves
|
606face7c0
|
gather together the url scheme constants, name them consistently
|
2018-03-02 20:39:38 -08:00 |
|
Seth Alves
|
fdb53b6543
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-02 19:27:53 -08:00 |
|
Seth Alves
|
7a61119d11
|
remove unneeded call to clearDomainOctreeDetails
|
2018-03-02 19:27:45 -08:00 |
|
Atlante45
|
85b4c3b422
|
Protect session UUID from concurrent read/writes
|
2018-03-02 17:34:18 -08:00 |
|
Sam Gateau
|
8856d4af4f
|
Merge pull request #12530 from samcake/punk
Fixing the graphics bugs introduced since last recent dual quaternion change
|
2018-03-02 16:12:23 -08:00 |
|
John Conklin II
|
ed07b3c28b
|
Merge pull request #12531 from AndrewMeadows/use-pick-not-raypick
Purge RayPick and LaserPointers from default scripts
|
2018-03-02 14:59:32 -08:00 |
|
Dante Ruiz
|
d12a4f0c18
|
little change
|
2018-03-02 14:30:02 -08:00 |
|
Dante Ruiz
|
5dc336bfae
|
remove dead code and eslint files
|
2018-03-02 14:23:35 -08:00 |
|
John Conklin II
|
8f403ebc23
|
Merge pull request #12543 from zfox23/improveFontLoading
Improve font loading via QRC instead of file path
|
2018-03-02 14:22:17 -08:00 |
|
samcake
|
fc8f1c1e65
|
Resolving conflicts
|
2018-03-02 14:20:33 -08:00 |
|
Dante Ruiz
|
05fb3cfd9a
|
fixing hyper link for entities
|
2018-03-02 14:03:24 -08:00 |
|
Seth Alves
|
746769cbe9
|
don't crash
|
2018-03-02 13:52:18 -08:00 |
|
Brad Hefta-Gaub
|
762e36ef19
|
Merge pull request #12545 from birarda/bug/fix-nlpacket-ascii
fix ASCII art for packet headers in NLPacket
|
2018-03-02 13:49:27 -08:00 |
|
John Conklin II
|
7ebe3df2b1
|
Merge pull request #12537 from zfox23/fixJsRequest
Fix undefined request from JS
|
2018-03-02 13:39:27 -08:00 |
|