amantley
65bb896450
Merge remote-tracking branch 'origin/master' into character_entity_fixes
2017-12-11 10:55:54 -08:00
Zach Fox
2d786451c2
Add comment
2017-12-11 10:50:24 -08:00
Sam Gateau
0ff91e5926
Merge pull request #11952 from samcake/light
...
Exposing multi highlight and selection feature to js api
2017-12-12 01:09:15 +07:00
Zach Fox
b81cdf49ef
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-11 09:52:32 -08:00
samcake
63fb9b5503
fix float literal syntax
2017-12-11 09:30:31 -08:00
Clément Brisset
833f98b98b
Merge pull request #11920 from Atlante45/feat/reduce-memory-usage
...
Reduce Image library memory usage
2017-12-11 09:29:22 -08:00
samcake
1008175a92
Removing commented code
2017-12-11 09:28:33 -08:00
samcake
b4f7433042
removing .f for a float in shader
2017-12-11 09:26:43 -08:00
amantley
7e49ce26d7
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating branch to the master
2017-12-11 08:02:33 -08:00
Olivier Prat
b9d49318e7
Fixed bug which culled medium sized objects in shadow maps due to perspective frustum assumed octree selection
2017-12-11 12:19:10 +01:00
Sam Gateau
cc4b266647
Add names to objects of the selection, remove comments in shader and fix one more warning on linux
2017-12-11 00:31:54 -08:00
Olivier Prat
a679dc6705
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
2017-12-11 08:48:48 +01:00
humbletim
4374b4f9a8
forward MIDI_CONTROL_CHANGE events
2017-12-11 00:39:23 -05:00
Sam Gateau
eec4e966a7
Fix the linux build and correct the name of the property Intensity to Opacity
2017-12-10 10:13:49 -08:00
Sam Gateau
429d54d65d
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-10 09:53:22 -08:00
divya
e187852df1
Merge pull request #11941 from huffman/feat/atp-baking-process
...
Move asset server baking to a separate process
2017-12-09 20:48:14 -08:00
Ryan Huffman
e3d00c4aa5
Remove unnecessary logging from PathUtils
2017-12-08 17:48:10 -08:00
Ryan Huffman
982607eedf
Remove unused variable from PathUtils
2017-12-08 15:40:33 -08:00
Sam Gondelman
352c11d7c4
Merge pull request #11358 from vladest/fix_google_vr_height
...
Momentum aka flickable for WebView
2017-12-08 10:46:52 -08:00
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08:00
samcake
9a4f667059
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-08 08:50:33 -08:00
Seth Alves
a7a6dee8e0
Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling
...
Fix for hand controller avatar scaling.
2017-12-08 07:17:59 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope
...
Improve Audio Scope
2017-12-08 07:15:28 -08:00
Sam Gateau
d07cde3ecb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 19:20:25 -08:00
David Back
8b38c03a56
Allow space characters in material library name
2017-12-07 17:40:58 -08:00
David Kelly
42b509639b
Fix certificate hash
2017-12-07 17:22:00 -08:00
Anthony J. Thibault
542af47e9e
Fix for hand controller avatar scaling.
...
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.
2017-12-07 17:08:13 -08:00
Andrew Meadows
4691a98509
Merge pull request #11865 from hyperlogic/feature/domain-limited-height
...
domain uses min/max avatar height instead of min/max scale
2017-12-07 16:29:15 -08:00
samcake
6148458aeb
Workable state, need final clean up and testing
2017-12-07 16:04:08 -08:00
Sam Gondelman
b05e1f8a32
Merge pull request #11847 from SamGondelman/overlayFlash
...
Cleanup Web3DOverlay and tablet home button
2017-12-07 14:06:56 -08:00
Atlante45
d6ac0dc3c2
CR - indentation
2017-12-07 12:54:34 -08:00
Atlante45
4fd83ddd0e
Reduce Image memory usage by moving the data
2017-12-07 12:54:34 -08:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
Andrew Meadows
813c4fa38a
Merge pull request #11915 from druiz17/fix-collision-mask-for-children
...
If hold actions are added to entity update the collision mask for the children aswell
2017-12-07 11:16:50 -08:00
Ryan Huffman
94a58a2471
Remove baking dependency from assignment-client
2017-12-07 10:53:23 -08:00
Anthony J. Thibault
b5ffda6911
const fix
2017-12-07 10:09:09 -08:00
Anthony J. Thibault
095bedcd3f
code review feedback
2017-12-07 10:08:18 -08:00
Anthony J. Thibault
fbcecbfc89
Merge branch 'master' into feature/domain-limited-height
2017-12-07 10:01:33 -08:00
Brad Hefta-Gaub
a0457d2b5e
Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars
...
Use PrioritySortUtil for avatar updates from avatar-mixer
2017-12-07 09:22:52 -08:00
Brad Hefta-Gaub
ac3bd5042f
Merge pull request #11890 from dback2/mirrorissues3
...
Secondary camera frame buffer / texture fixes
2017-12-07 09:17:27 -08:00
samcake
5f85e8e2cb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 08:48:12 -08:00
Bradley Austin Davis
2a91e98813
Fix iterator names
2017-12-06 14:26:07 -08:00
Brad Davis
e626ca3ccd
Working on scene threading optimizations
2017-12-06 14:26:07 -08:00
Ryan Huffman
2eecb41337
Update metatype registration in assetBakeTask
2017-12-06 13:59:46 -08:00
Ryan Huffman
6b098bfc6a
Fix aborted baking in oven cli
2017-12-06 13:51:31 -08:00
Ryan Huffman
cb9a30413d
Rename removeTemporaryDis to removeTemporaryApplicationDirs
2017-12-06 12:50:20 -08:00
Ryan Huffman
f20aa2e680
Fix asset server baking not working on *nix
2017-12-06 11:49:34 -08:00
Ryan Huffman
de7e3e60cd
Add temp dir removal to asset server
2017-12-06 11:49:34 -08:00
Ryan Huffman
f3fc5769e8
Move asset baking on asset server to separate process
2017-12-06 11:49:19 -08:00
Dante Ruiz
0f3a70553c
fix dynamic entities that are parented to your avatar
2017-12-06 11:18:15 -08:00
samcake
1efddb8260
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-06 10:21:45 -08:00
Olivier Prat
dc55a16834
Fixed warnings on Mac and Ubuntu
2017-12-06 18:37:27 +01:00
Olivier Prat
8d710c8f73
Factorised out some computation needed for all cascades
2017-12-06 18:08:27 +01:00
Olivier Prat
014e81b2f4
Added normal based adaptive depth bias
2017-12-06 17:06:48 +01:00
Olivier Prat
c9c93370da
Fixed weird bug with objects suddenly poping out of the shadow map. Was due to objects with own pipeline corrupting the render state. Don't know why though
2017-12-06 15:26:44 +01:00
Olivier Prat
89b1ef2e19
Tweaked bias once more
2017-12-06 12:07:30 +01:00
Olivier Prat
ff39558d27
Automatic shadow bias computation from cascade texel density
2017-12-06 11:22:15 +01:00
Olivier Prat
f9641afcd0
Modified cascade distance distribution to blend between a desired resolution and an automatic logarithm distribution
2017-12-06 10:48:04 +01:00
Olivier Prat
1d8d8335c5
Moved shadow cascade distances computation to shadow, not shadow task
2017-12-06 10:05:39 +01:00
luiscuenca
8abe8b9879
move save logic to audioclient
2017-12-05 18:22:14 -08:00
Zach Fox
3183a1a8b9
Add setupAttemptID to every step (thanks Dave)
2017-12-05 16:48:30 -08:00
luiscuenca
20d6615417
emit only when recording
2017-12-05 16:13:44 -08:00
Dante Ruiz
36aa0ae476
Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children
2017-12-05 15:48:45 -08:00
Dante Ruiz
8af1d8d8d0
dont run code if not nesscassry
2017-12-05 15:48:09 -08:00
Zach Fox
902064ed37
Cleanup debug stuff
2017-12-05 15:26:55 -08:00
Zach Fox
7521e4870e
Bugfixes
2017-12-05 14:56:47 -08:00
Zach Fox
668f6d50b5
Add data tracking for wallet setup
2017-12-05 14:13:48 -08:00
Zach Fox
4334bf8222
Add data tracking for purchase and rez
2017-12-05 13:09:09 -08:00
Clément Brisset
a5e671e0fd
Merge pull request #11931 from highfidelity/stable
...
stable -> master
2017-12-05 11:58:23 -08:00
Olivier Prat
e16b427ab6
Switched to 4 cascades for key light and working on a better distribution
2017-12-05 18:57:04 +01:00
Dante Ruiz
c58286d371
dont do work if not needed
2017-12-05 09:31:35 -08:00
Olivier Prat
c0ca7a129d
Fixed issue with far distance of cascades being underestimated, especially first cascade
2017-12-05 17:33:11 +01:00
Olivier Prat
0b6dcb2717
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
2017-12-05 09:18:26 +01:00
Dante Ruiz
486cdf14d2
make sure that NO_BOOTSTRAPPING is disbaled correctly if parent is changed
2017-12-04 15:34:53 -08:00
samcake
9fceaad38b
Merging with master
2017-12-04 14:20:10 -08:00
Dante Ruiz
a1bf54ff00
fix issue of no_bootstrapping not being set correctly
2017-12-04 11:16:41 -08:00
Dante Ruiz
03934549cc
Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children
2017-12-04 09:08:11 -08:00
luiscuenca
4030688e7a
added record wav files
2017-12-03 11:54:37 -07:00
Brad Hefta-Gaub
b2c5154cb6
Merge pull request #11909 from ZappoMan/rc60FixModelImportSizing
...
fix issues in model import sizing caused by recent refactor
2017-12-02 09:30:57 -08:00
Dante Ruiz
1e6b5c0c75
make requested changes
2017-12-01 17:09:00 -08:00
Anthony Thibault
fe16cc3fab
Merge pull request #11902 from luiscuenca/onloadFix
...
Fixes create list and web and QML audio sync
2017-12-01 16:05:07 -08:00
Dante Ruiz
a1d90b5dd9
added extra bit
2017-12-01 15:41:13 -08:00
luiscuenca
fefedc11c8
mac fix
2017-12-01 15:17:23 -07:00
luiscuenca
d271f61987
Proper fix
2017-12-01 14:37:59 -07:00
ZappoMan
d1017d81bd
fix issues in model import sizing caused by recent refactor
2017-11-30 18:08:32 -08:00
ZappoMan
750d505f9b
fix issues in model import sizing caused by recent refactor
2017-11-30 17:51:59 -08:00
luiscuenca
83e370d9de
add shared pointer
2017-11-30 17:40:49 -07:00
luiscuenca
5d1f2a04c1
restate deleted lines
2017-11-30 16:43:38 -07:00
luiscuenca
98e8361690
Fix and rebuild
2017-11-30 16:07:43 -07:00
luiscuenca
9cd2dc921a
back to for loop
2017-11-30 15:31:29 -07:00
luiscuenca
0729579266
fix for loop
2017-11-30 15:21:43 -07:00
luiscuenca
58e829dbda
Delete leftover line
2017-11-30 15:11:38 -07:00
luiscuenca
e02e810399
Audio Handler fix
2017-11-30 15:06:02 -07:00
Bradley Austin Davis
59aea9c401
Merge pull request #11862 from jherico/android_nov
...
Make buildable APK from Gradle
2017-11-30 11:23:29 -08:00
Andrew Meadows
05fbf8e511
workaround for zero-size objects in priority formula
2017-11-30 11:04:51 -08:00
vladest
74c002d1f5
Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events
2017-11-30 12:52:26 +01:00
David Rowe
f5b12a0a9d
Fix typo
2017-11-30 19:16:51 +13:00
David Rowe
a01d118c57
Documentation review
2017-11-30 16:03:57 +13:00
luiscuenca
b817143e2e
Fixes on web and QML audio sync
2017-11-29 18:16:21 -07:00
Zach Fox
39afb4ab6a
Merge pull request #11882 from howard-stearns/the-lost-ECDSA
...
The lost ecdsa
2017-11-29 15:53:52 -08:00
howard-stearns
57ec73bb13
spacing
2017-11-29 14:37:20 -08:00
howard-stearns
115bc27557
back to stable, rather than staging
2017-11-29 13:39:58 -08:00
David Rowe
4269cc4004
Camera API JSDoc fixes
2017-11-30 09:28:45 +13:00
amantley
233d693d76
removed debug print statements and fixed negative FPS handling
2017-11-29 10:51:04 -08:00
howard-stearns
fb038c17ee
for now, point this PR at staging so that it can be tested as built by
...
jenkins
2017-11-29 09:54:34 -08:00
Brad Davis
101d6763cc
PR feedback
2017-11-29 09:11:52 -08:00
amantley
778d98f56b
made some changes to fix coding standard problems in the code, also added the update for the EntityItem base class to the update function
2017-11-28 18:42:03 -08:00
Anthony J. Thibault
0ec72f2559
warning fix
2017-11-28 17:45:13 -08:00
howard-stearns
281b4cfd88
Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA
2017-11-28 16:59:44 -08:00
Bradley Austin Davis
e4220aa44e
Fixing warnings in android build
2017-11-28 14:32:30 -08:00
amantley
101e67498a
cleaned up the code to remove _currentFrame updating in RenderModelEntityItem also removed the unnessary currently playing frame property
2017-11-28 14:11:56 -08:00
David Back
7101719295
newline
2017-11-28 13:01:47 -08:00
David Back
5cceceb868
secondary cam texture fixes
2017-11-28 13:00:41 -08:00
amantley
1eacf7cbda
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
This is to update the branch with the master branch
2017-11-28 11:41:29 -08:00
Bradley Austin Davis
d6072f2bf2
Add bullet and draco to precompiled libraries
2017-11-28 11:32:34 -08:00
Brad Davis
d769acd345
Updating Android toolchain
2017-11-28 11:32:32 -08:00
Andrew Meadows
e212ac67c1
enable custom avatar sort tuning
2017-11-28 11:30:06 -08:00
amantley
d607ca0914
initialize the _lastAnimated time when the modelEntityRenderer is instantiated, this fixes the sync between interface and the server
2017-11-28 11:04:48 -08:00
Andrew Meadows
deccc54965
remove cruft
2017-11-28 09:14:05 -08:00
Andrew Meadows
e068eb879c
use PrioritySortUtil for outgoing avatar updates
2017-11-28 09:11:14 -08:00
Andrew Meadows
d65101c4e9
sort and throttle avatar updates in interface
2017-11-28 09:07:17 -08:00
David Rowe
cd2922a560
Merge branch '21602' into 21624
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2017-11-28 17:04:59 +13:00
David Rowe
07a7cb412a
Merge branch '21602' into 21603
2017-11-28 16:43:12 +13:00
David Rowe
92493f14d7
Miscellaneous JSDoc fixes
2017-11-28 16:30:09 +13:00
Stephen Birarda
8978254037
kick logged in by fingerprint/ip if enabled in DS settings
2017-11-27 18:23:14 -08:00
SamGondelman
d4a4c8902a
fix reticle depth at different scales and x button click on mouse press
2017-11-27 17:46:19 -08:00
Brad Hefta-Gaub
6d6ac0a5a9
Merge pull request #11873 from sethalves/fix-wearable-domain-change-crash
...
avoid a crash during domain change while wearing something
2017-11-27 13:01:48 -08:00
howard-stearns
1575119327
PR feedback
2017-11-27 10:46:57 -08:00
howard-stearns
2e919682a0
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
2017-11-27 10:02:53 -08:00
luiscuenca
027d2d323c
Measure tool and corrections
2017-11-26 22:28:34 -07:00
David Rowe
425e2eb82c
Add missing parameter to Camera.newMode() JSDoc
2017-11-25 18:24:58 +13:00
David Rowe
16dd9e0063
Move Camera mode JSDoc to be a typedef
2017-11-25 18:24:38 +13:00
David Rowe
9983e1fd1c
Polish Paths JSDoc
2017-11-25 18:06:27 +13:00
David Rowe
167bc21784
Fix up PickRay and StylusTip JSDoc
2017-11-25 17:23:53 +13:00
David Rowe
de49fefc61
Merge branch 'master' into 21602
...
# Conflicts:
# libraries/shared/src/RegisteredMetaTypes.h
2017-11-25 17:06:36 +13:00
David Rowe
73f5841c9f
Add PointerEvent and KeyboardModifiers API types JSDoc
2017-11-25 16:18:57 +13:00
David Rowe
06012d9dfc
Add Color and Rect API types JSDoc
2017-11-25 16:18:40 +13:00
David Rowe
91671722a5
Add Shape API types JSDoc
2017-11-25 16:09:54 +13:00
Sam Gateau
9a31a3dc95
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-11-22 23:29:55 -08:00
amantley
522dc3dfb1
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating Character entity fixes branch with the changes in the origin
master
2017-11-22 17:55:39 -08:00
amantley
2e75016021
changes to modelEntity.cpp
2017-11-22 17:53:21 -08:00
amantley
fdf5139a74
everything now works with an atomic start time property. but now I will get rid of this and use current frame instead
2017-11-22 17:52:13 -08:00
howard-stearns
a6b437a79f
get rid of "error" warning because the key wasn't broken into 64 char
...
lines
2017-11-22 16:55:57 -08:00
Seth Alves
9ccc416e80
avoid a crash during domain change
2017-11-22 16:34:56 -08:00
howard-stearns
abf41300dd
refactor
2017-11-22 16:29:56 -08:00
howard-stearns
899999a4c6
fix up dynamic ownership challenge
2017-11-22 15:58:30 -08:00
Anthony J. Thibault
b3896f664d
Made increaseScale and decreaseScale more responsive at limits
2017-11-22 14:45:52 -08:00
samcake
1514cdfb2f
extend the set of interface for multi highlight
2017-11-21 17:59:45 -08:00
amantley
1e5d099b06
changed the currentlyplayingframe property so that it is updated in RenderableModelEntity.cpp now. Remains to remove everything but initializing currentlyPlayingFrame in ModelEntityRender.cpp
2017-11-21 17:36:01 -08:00
howard-stearns
16d6d8a361
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:29 -08:00
howard-stearns
ca80c9b764
Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:08 -08:00
samcake
84ff40c717
Merging with master
2017-11-21 14:12:47 -08:00
Anthony J. Thibault
9f54ce55f3
Change domain setting from min/max avatar scale to min/max avatar height
...
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
2017-11-21 13:25: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
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
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
Bradley Austin Davis
7a5dc9e00b
remove test code disabling the script cache
2017-11-20 15:57:44 -08:00
Thijs Wenker
c3754d6369
smart pointer
2017-11-20 23:24:03 +01:00
amantley
5a1d04ee06
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating the branch with the current master
2017-11-20 10:22:46 -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
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
samcake
a74372b233
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-20 09:26:29 -08:00
amantley
befa0f8ab5
now the update frame is only happening in the assignment client code. added setCurrentlyPlayingFrame to ModelEntityItem.cpp
2017-11-20 09:11:15 -08: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
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
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
David Rowe
27e3e0bf0b
Merge branch 'master' into 21602
2017-11-20 08:12:19 +13: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
ebac2556e4
Merge pull request #11841 from ZappoMan/makeAddEntityAtomic
...
Make add entity atomic
2017-11-18 14:27:12 -08:00
Sam Gateau
44f63ef802
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-18 08:23:59 -08:00
amantley
013d16cee9
this is the change to add a property for the currentframeplaying
2017-11-17 18:37:54 -08:00
samcake
e0740b323d
keep debuging the seelction highlight
2017-11-17 18:11:18 -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
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain
...
Adjustable master avatar volume
2017-11-17 16:58:27 -08:00
ZappoMan
66454e7288
fix unix warnings
2017-11-17 16:33:43 -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
Zach Fox
7d34b3fe67
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-17 15:45:03 -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
ZappoMan
71a46a3374
cleanup
2017-11-17 13:03:04 -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
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
Thijs Wenker
3c37bf8acd
parentJointName property experiment
2017-11-17 20:33:06 +01:00
Andrew Meadows
98001b64d9
Merge pull request #11788 from ctrlaltdavid/21579-a
...
Particles emitter fixes
2017-11-17 11:31:12 -08:00
H Q
28eedd1a94
Small style mod
2017-11-17 11:30:21 -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
Olivier Prat
d98dfff0a8
Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage)
2017-11-17 19:25:21 +01:00
Stephen Birarda
dd27e3db31
add diff traversal reset when resetting state
2017-11-17 09:44:35 -08:00
