Sam Gateau
ec934335dc
CLeaning up the pr regarding the scripts with my branch blue
2017-10-15 22:34:58 -07:00
Sam Gateau
18287ed45b
Banging my head against qml...
2017-10-13 01:06:40 -07:00
samcake
8994200d01
Trying to integrate the tool scripts as an app
2017-10-12 17:57:30 -07:00
samcake
480047548d
exposing the Render interface to the overlay web3d
2017-10-11 18:04:29 -07:00
samcake
9abe098436
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-11 15:48:40 -07:00
Sam Gateau
38b467a6bf
Merge pull request #11570 from jherico/overlays_blocking
...
Remove unnecessary blocking call
2017-10-11 15:40:53 -07:00
Seth Alves
a4462056df
Merge pull request #11549 from sethalves/linux-clang-build
...
allow project to be built with clang on Linux
2017-10-11 13:28:45 -07:00
Seth Alves
ca128a3251
merge from upstream
2017-10-11 11:09:33 -07:00
Zach Fox
99109fe8e5
Merge pull request #11567 from zfox23/commerce_daveIntegration3
...
2017-10-10 Commerce Frontend Updates
2017-10-11 11:07:03 -07:00
Bradley Austin Davis
1e91c5cfce
Merge pull request #11561 from AndrewMeadows/improve-geometry-cache
...
more correct use of BufferView in GeometryCache
2017-10-11 11:03:53 -07:00
Brad Davis
69f869b339
Remove unecessary blocking call
2017-10-11 11:01:06 -07:00
Zach Fox
3f0ec73be6
Fix date displays
2017-10-11 10:55:14 -07:00
John Conklin II
4394415058
Merge pull request #11565 from huffman/fix/fst-texdir
...
Fix .fst texdir not being followed
2017-10-11 10:24:37 -07:00
Zach Fox
c2733a4186
Fix notification bug
2017-10-11 09:47:16 -07:00
Brad Hefta-Gaub
b69c2a27ca
Merge pull request #11569 from Atlante45/new-master
...
Merge stable back into master
2017-10-11 09:33:55 -07:00
Andrew Meadows
d9ba75ca72
fix warning about implicit cast from 64 to 32 bits
2017-10-11 06:07:07 -07:00
Ryan Huffman
69b6a8c163
Fix .fst texdir not being followed
...
Although the texdir was being acknowledged and used as the
_textureBaseURL inside of the Geometry* classes, it was being
overwritten in code meant to handle redirects. Basically, when a
geometry resource request is redirected (via ATP, HTTP, etc.), we needed
to update the _textureBaseURL to take the new location into account.
Previously we were overwriting the _textureBaseURL all the time, even
when not being redirected, but this updates it to only be overwritten
when the request is redirected.
There is at least 1 known case that this does not handle: a .fst with
its `texdir` set, that points at an fbx that gets redirected.
2017-10-10 18:29:59 -07:00
Andrew Meadows
886422cbef
remove unused variable
2017-10-10 17:07:17 -07:00
Andrew Meadows
4bf99fe9d2
remove unused variable
2017-10-10 17:05:54 -07:00
Andrew Meadows
026195223a
more correct use of BufferView in GeometryCache
2017-10-10 17:02:26 -07:00
Atlante45
6dd49f5c32
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-10-10 16:53:34 -07:00
Sam Gateau
160be95081
Merge pull request #11563 from Atlante45/fix/warnings
...
Fix warnings
2017-10-10 16:38:31 -07:00
Zach Fox
4ebccfa65c
Use put instead of get sob
2017-10-10 16:23:43 -07:00
Atlante45
cea0f48e5c
Fix warnings
2017-10-10 15:19:09 -07:00
Zach Fox
5e383e2b1c
My Item certificates
2017-10-10 14:56:17 -07:00
Dante Ruiz
742cf0debe
Merge pull request #11383 from ElderOrb/case7384
...
7384 On Domains without Edit Access, Create Button Text still Highlights
2017-10-10 14:30:49 -07:00
Sam Gateau
f143c28625
Merge pull request #11542 from SamGondelman/bubbleBoy
...
Move HUD and HUD overlay rendering out of display plugin
2017-10-10 14:26:20 -07:00
Zach Fox
702528a8cc
Fully integrate cert properties
2017-10-10 13:27:17 -07:00
Zach Fox
1c0a564155
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3
2017-10-10 12:36:06 -07:00
Zach Fox
b105248dd7
Merge pull request #11555 from zfox23/commerce_daveIntegration2
...
2017-10-09 Commerce Frontend Updates
2017-10-10 12:34:30 -07:00
Seth Alves
4a3b59ea61
Merge pull request #11560 from druiz17/far-grab-nondynamic
...
Far grab non-dynamic entities
2017-10-10 12:29:38 -07:00
Zach Fox
be2b241629
Lots of progress; don't yet have some things
2017-10-10 12:20:48 -07:00
Sam Gateau
c44efda978
Merge pull request #11349 from Zvork/hdrcube
...
Under the hood support for HDR cube maps
2017-10-10 11:43:41 -07:00
Ryan Huffman
568a7ba439
Merge pull request #11557 from cain-kilgore/21562
...
WL 21562 - Fix the error in the Asset Browser
2017-10-10 11:12:33 -07:00
Clément Brisset
3b48833cc0
Merge pull request #11451 from huffman/feat/upload-user-event
...
Add uploading to asset server event
2017-10-10 11:03:33 -07:00
druiz17
013e15c9a2
made requested changes
2017-10-10 10:54:56 -07:00
Zach Fox
8d0d9a159f
Bugfixes
2017-10-10 10:38:19 -07:00
Melissa Brown
662bb6c103
Merge pull request #11338 from 1P-Cusack/FogBugz/Case_6491_Part7
...
[Case 6491] Remainder of entitySelectionTool clean up (details below).
2017-10-10 10:36:14 -07:00
druiz17
a179df29fb
mouse grab non-dynamic entities
2017-10-10 10:31:40 -07:00
druiz17
d0eb6a3ad0
remove comments
2017-10-10 09:45:41 -07:00
Ryan Huffman
9c120f1194
Update AssetMappingsScriptingInterface to not open file for activity event
2017-10-10 09:44:13 -07:00
druiz17
003395b256
removing whitespace
2017-10-10 09:43:02 -07:00
druiz17
9ff1b2c815
Merge branch 'master' of github.com:highfidelity/hifi into far-grab-nondynamic
2017-10-10 09:17:16 -07:00
druiz17
fc41155ce1
saving work
2017-10-10 09:17:01 -07:00
Olivier Prat
db9a9e723c
Merged with master
2017-10-10 12:11:23 +02:00
Cain Kilgore
583b0c521e
Open
2017-10-10 03:40:48 +01:00
Cain Kilgore
e9f4dee56d
WL 21562 - Fix the error in the Asset Browser
2017-10-10 03:39:13 +01:00
Seth Alves
559f229bd1
Merge pull request #11552 from SamGondelman/animationMaster
...
Cherry-pick "Model asks for renderUpdate if animating" into master
2017-10-09 17:57:19 -07:00
Seth Alves
8ac1875a91
Merge pull request #11531 from AndrewMeadows/find-nearby-entities-at-login
...
Find nearby entities at login
2017-10-09 17:54:44 -07:00
Seth Alves
3cef3779df
Merge branch 'master' of github.com:highfidelity/hifi into linux-clang-build
2017-10-09 17:34:50 -07:00
