samcake
|
a0e40efdc8
|
Fixing all the changes of interface name coming from upstream
|
2017-11-21 14:55:58 -08:00 |
|
samcake
|
ebd701a1ab
|
Merging with master
|
2017-11-21 14:40:37 -08:00 |
|
samcake
|
84ff40c717
|
Merging with master
|
2017-11-21 14:12:47 -08:00 |
|
Brad Hefta-Gaub
|
817afcd083
|
Merge pull request #11741 from ZappoMan/entityItemCleanup
Entity item cleanup
|
2017-11-21 12:24:46 -08:00 |
|
Brad Hefta-Gaub
|
5914f27027
|
Merge pull request #11706 from luiscuenca/webAudioDev_fresh
QML & Web generated audio now follow the client audio device selection
|
2017-11-21 11:29:48 -08:00 |
|
ZappoMan
|
3a967ca895
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
|
2017-11-21 10:53:29 -08:00 |
|
Brad Hefta-Gaub
|
0945c1c50b
|
Merge pull request #11851 from Atlante45/feat/wizard
Reworked wizard congratulation page.
|
2017-11-21 09:15:59 -08:00 |
|
Brad Hefta-Gaub
|
4d1e90dfca
|
Merge pull request #11821 from dback2/mirrorfanciness3
Mirror projection for Secondary Camera
|
2017-11-21 07:59:07 -08:00 |
|
Brad Hefta-Gaub
|
5dadec0b93
|
Merge pull request #11845 from thoys/feat/parentJointName
Import JSON parentJointName value
|
2017-11-21 07:58:13 -08:00 |
|
ZappoMan
|
b44ced4c21
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
|
2017-11-20 17:19:18 -08:00 |
|
Thijs Wenker
|
627fee80ec
|
added support for exporting parentJointName
|
2017-11-21 01:49:56 +01:00 |
|
Howard Stearns
|
89425ca210
|
Merge pull request #11854 from howard-stearns/consolidated-blockchain-history-log
consolidated blockchain history log
|
2017-11-20 16:19:27 -08:00 |
|
Howard Stearns
|
4018b99118
|
Merge pull request #11848 from zfox23/commerce_flipTheSwitch
Turn Commerce on by default!
|
2017-11-20 16:18:53 -08:00 |
|
Elisa Lupin-Jimenez
|
3211aa7d13
|
Merge pull request #11849 from elisa-lj11/blocks
Zip file structures replicated in asset server
|
2017-11-20 16:13:51 -08:00 |
|
Brad Hefta-Gaub
|
50ff782ab5
|
Merge pull request #11829 from sethalves/av-ent-misc-fixes
misc avatar-entity fixes
|
2017-11-20 16:05:39 -08:00 |
|
Bradley Austin Davis
|
7a5dc9e00b
|
remove test code disabling the script cache
|
2017-11-20 15:57:44 -08:00 |
|
Clément Brisset
|
381fbe833d
|
Merge pull request #11855 from highfidelity/stable
Merge stable back into master
|
2017-11-20 15:40:14 -08:00 |
|
Elisa Lupin-Jimenez
|
fb6287503e
|
hopefully fixed build error resulting from escape sequence
|
2017-11-20 15:12:11 -08:00 |
|
Thijs Wenker
|
c3754d6369
|
smart pointer
|
2017-11-20 23:24:03 +01:00 |
|
Elisa Lupin-Jimenez
|
ecd45534dd
|
merge conflict
|
2017-11-20 14:04:29 -08:00 |
|
Elisa Lupin-Jimenez
|
a54f4eca93
|
simplified naming of zip folders
|
2017-11-20 14:02:46 -08:00 |
|
Ryan Downe Karpf
|
f7c27966a9
|
Merge pull request #11801 from highfidelity/RC59
Beta Release 59 - Includes up to Developer Release 7426
|
2017-11-20 13:25:27 -08:00 |
|
Dante Ruiz
|
a201312dcf
|
re-added fix that when into master that this branch breaks
|
2017-11-20 13:10:35 -08:00 |
|
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 |
|