Anthony J. Thibault
7b248b440a
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-17 13:55:12 -07:00
David Kelly
37dc324cec
Merge pull request #8454 from howard-stearns/ux-improvements
...
snapshot ux improvements
2016-08-17 12:23:12 -08:00
elisa-lj11
5d19267d00
Safeguard against file corruption
...
This is what could be a temporary (or permanent) fix to users trying to
delete important files on their computer through JS
2016-08-17 11:10:38 -07:00
Brad Hefta-Gaub
87964c89da
Merge pull request #8453 from huffman/feat/sandbox-logs-button
...
Add a button to the sandbox log window to open the log directory
2016-08-17 10:47:04 -07:00
howard-stearns
8823f48666
new snapshot review behavior
2016-08-17 10:00:20 -07:00
howard-stearns
17d9db487d
adjust .qml for useFeed being a c++ property instead of qml.
2016-08-17 09:57:46 -07:00
howard-stearns
347b20e506
expose to scripts the ability to show dedicated qml windows such as
...
preferences
2016-08-17 09:54:15 -07:00
howard-stearns
2a099d5577
expose to scripts the ability to open the feed
2016-08-17 09:53:26 -07:00
howard-stearns
48ff26eeb7
provide a way to programmatically show the feed (showing address bar in
...
feed mode).
2016-08-17 09:50:38 -07:00
Ryan Huffman
8ba105d1e4
Fix open-log-dir button handler
2016-08-17 09:36:42 -07:00
Ryan Huffman
0e259dcd29
Add open log dir button to server-console
2016-08-17 09:29:45 -07:00
Brad Hefta-Gaub
f66b36ff07
Merge pull request #8441 from imgntn/marketplace_spawn_location
...
Better create locations for Entities
2016-08-17 09:09:00 -07:00
Brad Hefta-Gaub
1ad1c48adc
Merge pull request #8414 from jherico/logging_fix
...
Categorize some debug logging in FBX parsing
2016-08-17 09:07:27 -07:00
Brad Hefta-Gaub
cd28df6c2e
Merge pull request #8446 from sethalves/local-velocity-for-scripts
...
Local velocity for scripts
2016-08-17 09:06:54 -07:00
Brad Hefta-Gaub
f16cbbe270
Merge pull request #8445 from huffman/fix/procedural-entity-render
...
Fix transparency on procedural shapes
2016-08-17 09:04:31 -07:00
James B. Pollack
0810ad0e7b
use square of sides
2016-08-16 18:13:42 -07:00
James B. Pollack
e9c2a1d509
cleanup prints
2016-08-16 18:03:34 -07:00
James B. Pollack
06787029b7
small
2016-08-16 17:58:35 -07:00
Anthony J. Thibault
d4e1f53581
Fix for inconsistent override warning in WebEntityItem.h
2016-08-16 17:48:28 -07:00
Ryan Huffman
fbe971e730
Fix hand_pose_changed event
2016-08-16 17:46:21 -07:00
Ryan Huffman
727d59ab27
Add backup directory setting to domain server
2016-08-16 17:33:32 -07:00
Anthony J. Thibault
03322a9c49
Fix for using hardware mouse in HMD mode
2016-08-16 17:09:59 -07:00
Anthony J. Thibault
7de8cc6422
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-16 16:49:57 -07:00
Seth Alves
f5f88fbacc
Merge branch 'master' of github.com:highfidelity/hifi into local-velocity-for-scripts
2016-08-16 16:47:27 -07:00
Seth Alves
7bc1235c54
local velocity and angular velocity in scripts is now handled the way local position and rotation are
2016-08-16 16:47:13 -07:00
Anthony J. Thibault
36d87ddd7c
Added EntityItem::wantsHandControllerPointerEvents method
2016-08-16 16:23:45 -07:00
Stephen Birarda
3355a90e7d
Merge pull request #8413 from huffman/feat/atp-bandwidth
...
Add asset server bandwidth to stats
2016-08-16 15:54:11 -07:00
elisa-lj11
5d2fb68924
Fixed temp dir access
2016-08-16 15:47:57 -07:00
Ryan Huffman
dae8461773
Fix transparency on procedural shapes
2016-08-16 15:42:17 -07:00
Anthony J. Thibault
a595a72d0a
handControllerGrab now calls Entities.sendHoverLeaveEntity()
2016-08-16 15:39:02 -07:00
Anthony J. Thibault
c407818d63
send pointer events from handControllerGrab.js to webEntities
2016-08-16 15:26:14 -07:00
Chris Collins
b80828d262
Merge pull request #8442 from sethalves/grab-adjustments
...
don't show equip sphere until hand is in position to equip. widen unequip/drop cone
2016-08-16 14:59:28 -07:00
Zach Pomerantz
d6d9871a96
unused var nits
2016-08-16 14:36:54 -07:00
elisa-lj11
9ea9baeadf
Making JS/QML safer (DOES NOT WORK)
2016-08-16 14:12:19 -07:00
Zach Pomerantz
8c559bc65d
use lights from nontextured skyboxes
2016-08-16 13:27:22 -07:00
Zach Pomerantz
4d0c819173
remove peaking irradiance from default background
2016-08-16 13:26:33 -07:00
howard-stearns
a8fd92d2bf
Hide reticle during snapshot
2016-08-16 12:35:49 -07:00
Howard Stearns
3f42e644de
Merge pull request #8443 from howard-stearns/discovery
...
update discovery from master
2016-08-16 12:25:12 -07:00
howard-stearns
1aca43ea88
Merge branch 'discovery' of https://github.com/highfidelity/hifi into ux-improvements
2016-08-16 12:24:55 -07:00
howard-stearns
d764c363cc
Merge branch 'discovery' into ux-improvements
2016-08-16 12:19:43 -07:00
howard-stearns
2ca1fda71b
Re add fix for hmd after merge
2016-08-16 12:02:49 -07:00
Seth Alves
c85e8d0580
don't show equip sphere until hand is in position to equip. widen unequip/drop cone
2016-08-16 11:18:12 -07:00
howard-stearns
2b75240771
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-16 11:14:36 -07:00
James B. Pollack
1632f4cb3d
better create locations
2016-08-16 10:52:05 -07:00
howard-stearns
4da2cb685c
Set full url path to where the picture was taken.
...
Expand width of scroll, but leave a margin at both ends.
Include an image at the end to indicate that the scroll is swipable.
Adjust ighlight color and border size.
2016-08-16 10:43:05 -07:00
howard-stearns
2f114b9c92
fix image link. How did this ever work?
2016-08-16 10:38:00 -07:00
James B. Pollack
5a2c7cf58e
cleanup
2016-08-16 09:58:18 -07:00
Chris Collins
2ec54c4fd7
Merge pull request #8439 from huffman/fix/transparent-against-procedural-skybox
...
Fix transparent items not being rendered correctly against procedural skybox
2016-08-16 09:19:51 -07:00
Ryan Huffman
1d2ea3be03
Fix transparent items not being rendered correctly against procedural skybox
2016-08-15 16:35:25 -07:00
Brad Davis
8fdecc6e56
Merge pull request #8438 from zzmp/fix/amd-cubemap
...
fix cubemaps on AMD cards running GL 4.5
2016-08-15 16:06:32 -07:00
