Elisa Lupin-Jimenez
|
b6e75d1222
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
|
2017-11-20 10:07:11 -08:00 |
|
Elisa Lupin-Jimenez
|
3aa7cb440d
|
file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url
|
2017-11-20 10:01:33 -08:00 |
|
Elisa Lupin-Jimenez
|
88823a169b
|
changed url for blocks app
|
2017-11-20 10:01:33 -08:00 |
|
Dante Ruiz
|
76935c1457
|
fixing merge conflict
|
2017-11-20 09:51:10 -08:00 |
|
Thijs Wenker
|
e94199acad
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName
|
2017-11-20 18:29:54 +01:00 |
|
Thijs Wenker
|
84ec9890ca
|
reverted special property case, parentJointName is now only parsed from the JSON import
|
2017-11-20 18:29:33 +01:00 |
|
Seth Alves
|
df07b66872
|
Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes
|
2017-11-20 07:47:19 -08:00 |
|
howard-stearns
|
07d52306c4
|
consolidated blockchain history log
|
2017-11-19 22:51:36 -08:00 |
|
ZappoMan
|
3b77f14f69
|
fix build error
|
2017-11-19 15:12:23 -08:00 |
|
ZappoMan
|
04ee1adabd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
|
2017-11-19 14:40:31 -08:00 |
|
Brad Hefta-Gaub
|
e070033ce4
|
Merge pull request #11793 from ElderOrb/FB9032
9032 - Current display mode can be deselected in the toolbar/tablet menu
|
2017-11-19 11:25:35 -08:00 |
|
Brad Hefta-Gaub
|
6429b61463
|
Merge pull request #11850 from druiz17/tablet-initial-page
Fix tablet not loading webpage when tablet root not initialized
|
2017-11-19 11:12:50 -08:00 |
|
Brad Hefta-Gaub
|
ff8ca6da4c
|
Merge pull request #11303 from vladest/webbrowser_updates
Webbrowser updates
|
2017-11-19 11:11:09 -08:00 |
|
Brad Hefta-Gaub
|
33d35bbe14
|
Merge pull request #11770 from AndrewMeadows/sort-and-throttle
sort and throttle UpdateRenderables work... when necessary
|
2017-11-19 11:09:08 -08:00 |
|
Brad Hefta-Gaub
|
e4a03a7d12
|
Merge pull request #11840 from ctrlaltdavid/21609
Fix typo in overlay "filled" property
|
2017-11-18 14:31:11 -08:00 |
|
Brad Hefta-Gaub
|
1de6ecec30
|
Merge pull request #11830 from ElderOrb/FB8244
8244 Rename captionColorOverride to captionColor
|
2017-11-18 14:28:32 -08:00 |
|
Brad Hefta-Gaub
|
ebac2556e4
|
Merge pull request #11841 from ZappoMan/makeAddEntityAtomic
Make add entity atomic
|
2017-11-18 14:27:12 -08:00 |
|
Alexander Ivash
|
c4aa937108
|
adjust to coding standards
|
2017-11-18 11:16:40 +03:00 |
|
Brad Hefta-Gaub
|
95f59b0ab8
|
Merge pull request #11844 from druiz17/stylus-near-grab
allow near grabbing of entities while stylus module is running.
|
2017-11-17 17:33:54 -08:00 |
|
Brad Hefta-Gaub
|
74bafcbb10
|
Merge pull request #11795 from huffman/fix/ds-punchlist
Punchlist fixes for DS
|
2017-11-17 17:04:27 -08:00 |
|
Brad Hefta-Gaub
|
28b75abcee
|
Merge pull request #11816 from druiz17/fix-bringing-up-logs
Fix issue of User is unable to bring up the High Fidelity Interface log.
|
2017-11-17 17:02:50 -08:00 |
|
Brad Hefta-Gaub
|
0678a7c9df
|
Merge pull request #11718 from kencooke/audio-louder-mastergain
Adjustable master avatar volume
|
2017-11-17 16:58:27 -08:00 |
|
Brad Hefta-Gaub
|
592f4921bc
|
Merge pull request #11825 from druiz17/fix-tablet-rez
fix tablet rez point for commence button
|
2017-11-17 16:51:52 -08:00 |
|
ZappoMan
|
66454e7288
|
fix unix warnings
|
2017-11-17 16:33:43 -08:00 |
|
Atlante45
|
1f23664c2f
|
Update wizard's congratulation page
|
2017-11-17 16:33:22 -08:00 |
|
SamGondelman
|
033f658fff
|
Merge remote-tracking branch 'upstream/master' into pointers
|
2017-11-17 16:10:20 -08:00 |
|
Dante Ruiz
|
427f676859
|
minimize diff
|
2017-11-17 16:06:34 -08:00 |
|
Dante Ruiz
|
ab9432c1cd
|
load webpage if tablet root is not initialized
|
2017-11-17 16:02:53 -08:00 |
|
Elisa Lupin-Jimenez
|
be0d4646fa
|
file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url
|
2017-11-17 15:54:41 -08:00 |
|
Brad Hefta-Gaub
|
ed4ec3208d
|
Merge pull request #11797 from luiscuenca/case7589
Fix notifications shrink with avatar
|
2017-11-17 15:27:46 -08:00 |
|
Zach Fox
|
ec16f16757
|
Remove debug buttons from wallet
|
2017-11-17 15:21:18 -08:00 |
|
David Back
|
4be29c5a7a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3
|
2017-11-17 15:15:22 -08:00 |
|
Zach Fox
|
f47f259816
|
Turn Commerce on by default
|
2017-11-17 15:12:49 -08:00 |
|
Brad Hefta-Gaub
|
a85a6f6795
|
Merge pull request #11308 from luiscuenca/patch-1
glTF import DEMO
|
2017-11-17 14:52:51 -08:00 |
|
John Conklin II
|
24e0d5ba67
|
Merge pull request #11846 from marko8904/master
Updated the README with CLA details.
|
2017-11-17 14:08:43 -08:00 |
|
ZappoMan
|
71a46a3374
|
cleanup
|
2017-11-17 13:03:04 -08:00 |
|
Zach Fox
|
4cc8db8aff
|
Merge pull request #11843 from zfox23/commerce_fixMyItems
Fix 'My Items' display
|
2017-11-17 12:59:51 -08:00 |
|
Stephen Birarda
|
239b116874
|
Merge pull request #11835 from birarda/bug/octree-connection-id
Reset EntityTreeSendThread known state if client disconnects from Entity Server
|
2017-11-17 12:56:25 -08:00 |
|
luiscuenca
|
df51d66f60
|
no double scaling and comments
|
2017-11-17 13:40:22 -07:00 |
|
Brad Hefta-Gaub
|
f5bb29f767
|
Merge pull request #11842 from birarda/networking-api-info
clarify the send packet list APIs
|
2017-11-17 12:30:09 -08:00 |
|
Dante Ruiz
|
8f6c781014
|
Merge pull request #11831 from misslivirose/feat/scale-emit-hands
Emit avatar scale changed signal when scaled with hand controllers
|
2017-11-17 11:55:31 -08:00 |
|
Dante Ruiz
|
4de0fdf7d1
|
Merge pull request #11768 from ctrlaltdavid/21596
Add instructions and cursor to GOTO dialog input
|
2017-11-17 11:45:40 -08:00 |
|
luiscuenca
|
bbf5e3b023
|
simplifications and comments
|
2017-11-17 12:45:36 -07:00 |
|
Thijs Wenker
|
3c37bf8acd
|
parentJointName property experiment
|
2017-11-17 20:33:06 +01:00 |
|
Dante Ruiz
|
4bbf2ff482
|
near grab entity while stylus is showing
|
2017-11-17 11:32:02 -08:00 |
|
Andrew Meadows
|
98001b64d9
|
Merge pull request #11788 from ctrlaltdavid/21579-a
Particles emitter fixes
|
2017-11-17 11:31:12 -08:00 |
|
Zach Fox
|
f570e3c874
|
Fix 'My Items' display
|
2017-11-17 11:27:00 -08:00 |
|
Andrew Meadows
|
6a784794c9
|
Merge pull request #11789 from ctrlaltdavid/21599
Don't remove entities from list when try to delete locked entity
|
2017-11-17 11:26:00 -08:00 |
|
Stephen Birarda
|
16d93ee168
|
clarify signatures in LNL to send packet lists
|
2017-11-17 11:17:11 -08:00 |
|
SamGondelman
|
61c7ccde6e
|
cleanup
|
2017-11-17 10:45:39 -08:00 |
|