Commit graph

43349 commits

Author SHA1 Message Date
Atlante45
10c412d8c7 Fix settings getting reset
fixes bugzid:531
	When a setting handle was created but never initialized/used, it
would override the current value with the default value on destruction.
2016-05-18 11:36:14 -07:00
Brad Hefta-Gaub
4df4829280 Merge pull request #7902 from jherico/gpu_breakup
moving GL backend out of GPU
2016-05-18 11:35:35 -07:00
Brad Hefta-Gaub
52445115dd Merge pull request #7906 from howard-stearns/improve-hand-controller-edit
improve hand-controller edit
2016-05-18 11:35:00 -07:00
Brad Hefta-Gaub
9a3b6bf081 Merge pull request #7858 from Atlante45/remove-deprecated-entity-props
removed dead code for overlays/entities glow level
2016-05-18 09:14:26 -07:00
Brad Hefta-Gaub
9af39d71e1 Merge pull request #7767 from huffman/fix/address-bar-back
Fix address bar becoming unusable after going backwards or forwards
2016-05-18 09:14:07 -07:00
Brad Hefta-Gaub
df491159ed Merge pull request #7881 from imgntn/tidyBotSwipe
[Home] TidyBot 2.0
2016-05-18 09:08:07 -07:00
James B. Pollack
d24ec08f9f cleanup 2016-05-18 08:55:02 -07:00
James B. Pollack
5d1b2996d3 semicolon 2016-05-18 08:53:57 -07:00
James B. Pollack
946558d0f6 cleanup 2016-05-18 08:53:13 -07:00
James B. Pollack
0c5adf83ce fix hands 2016-05-18 08:43:53 -07:00
Seth Alves
8e3b31a5e5 Merge pull request #7910 from samcake/blue
Fix bad roughness value read from the deferred buffer
2016-05-17 12:07:20 -07:00
Ryan Huffman
cf6eba96a4 Remove unused variable 2016-05-17 11:17:34 -07:00
Ryan Huffman
2dbea37690 Fix address manager sometimes double adding address history 2016-05-17 11:17:34 -07:00
Ryan Huffman
d47c74408e Cleanup handleViewpoint 2016-05-17 11:17:34 -07:00
Ryan Huffman
0ec9d9e277 Remove goToAddressFromObject from slots 2016-05-17 11:17:34 -07:00
Ryan Huffman
f213a059fb Fix AddressManager not always storing history when it should 2016-05-17 11:17:34 -07:00
Ryan Huffman
fde1f0740c Fix goBackPossible not being triggered correctly in AddressManager 2016-05-17 11:17:34 -07:00
Ryan Huffman
e7087c7393 Fix address bar becoming unusable after going backwards or forwards
The address bar dialog was being disabled when a lookup request was finished,
but was not hidden - this was bug #1. Presumably, though, the intent was to have the
window _not_ disappear when going backwards or forwards, but hiding the
window when a lookup request finishes would cause the window
to be hidden when going backwards or forwards - this was bug #2.

I decided to disable the hide-on-request-finished functionality because
the window is already manually hidden after entering a new address.
2016-05-17 11:17:34 -07:00
samcake
8ec280535b FIx bad roughness value read from the deferred buffer 2016-05-17 11:13:34 -07:00
Brad Davis
34e574c148 Merge pull request #7816 from zzmp/perf/idle-event
Drive render loop from DisplayPlugin instead of busy wait
2016-05-17 09:36:09 -07:00
Chris Collins
b2ece6f4a7 Merge pull request #7882 from zzmp/fix/script-thread-dtor
Wait and cleanly exit the scripting thread
2016-05-16 16:52:54 -07:00
Atlante45
4b1497fdf4 Remove dead code highlight entity in edit.js 2016-05-16 16:25:40 -07:00
Brad Hefta-Gaub
bb53011840 Merge pull request #7884 from sethalves/update-model-meta
when a ModelEntityItem moves, also update its meta-render-item
2016-05-16 16:08:22 -07:00
Brad Davis
0d6b0eef59 PR feedback 2016-05-16 15:27:14 -07:00
Stephen Birarda
eb8a764f42 update LICENSE to include "and other platform" 2016-05-16 14:45:04 -07:00
Seth Alves
d77b3bf59a fix some comments and debug pritns 2016-05-16 14:12:05 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
howard-stearns
3f17852244 Merge branch 'master' of https://github.com/highfidelity/hifi into improve-hand-controller-edit 2016-05-16 12:35:48 -07:00
howard-stearns
acb56d0603 Larger edit handles, and more tolerance in click (vs drag). 2016-05-16 12:35:05 -07:00
Seth Alves
2a5efd3b82 Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta 2016-05-16 10:53:39 -07:00
Zach Pomerantz
7d4276d15f Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor 2016-05-16 10:51:23 -07:00
Zach Pomerantz
61fbb7022c Mv entities script engine deleter to fn 2016-05-16 10:40:11 -07:00
Brad Hefta-Gaub
06d1bd5728 Merge pull request #7799 from birarda/remove-avatar-billboard
remove the last of the avatar billboard code
2016-05-16 10:23:42 -07:00
Brad Hefta-Gaub
166fbdece5 Merge pull request #7853 from zzmp/fix/shutdown
Fix hang on exit from dying scripts
2016-05-16 10:17:34 -07:00
Brad Hefta-Gaub
cf59fa8a46 Merge pull request #7885 from ctrlaltdavid/20918
make users.js movable
2016-05-16 10:16:32 -07:00
Brad Hefta-Gaub
b862f0b8f3 Merge pull request #7904 from jherico/fix_filters
fix texture sampler calculation
2016-05-16 10:16:16 -07:00
Brad Davis
84f4945840 Fix sampler mode lookup 2016-05-15 13:05:50 -07:00
Brad Hefta-Gaub
1f800294c6 Merge pull request #7880 from jherico/gpu_smart_buffers
Support partial CPU->GPU buffer transfers
2016-05-14 17:44:26 -07:00
Brad Hefta-Gaub
1c20212c39 Merge pull request #7901 from jherico/fix_procedural
Fix procedural rendering on primitives
2016-05-14 17:31:08 -07:00
Atlante45
5acbed647c Remove glowLevel references in scripts 2016-05-14 14:49:31 -07:00
Atlante45
38f74c1843 Remove the last of the glow level 2016-05-14 14:49:31 -07:00
Brad Davis
1e136ed71f Fix procedural rendering on primitives 2016-05-14 10:59:59 -07:00
Brad Hefta-Gaub
87aa90de08 Merge pull request #7878 from howard-stearns/vive-buttons-out-of-pause
More buttons to get out of away/pause.
2016-05-14 09:12:16 -07:00
Brad Davis
e8bd97c761 Fix GPU buffer memory statistics 2016-05-14 08:28:51 -07:00
Brad Davis
9509e32928 PR feedback 2016-05-14 08:28:51 -07:00
Brad Davis
eb84459f03 Support partial CPU->GPU buffer transfers 2016-05-14 08:28:50 -07:00
Brad Hefta-Gaub
a5f99ba370 Merge pull request #7899 from sethalves/dont-send-file-urls-to-avatar-mixer
fix invisible default avatars
2016-05-14 07:48:16 -07:00
Brad Hefta-Gaub
e754b9e19c Merge pull request #7871 from samcake/hdr
Defaulting the color formats used in the rendering pipeline to sRGB
2016-05-13 17:35:48 -07:00
Zach Pomerantz
4e62d7ff61 Define ScriptEngines::isStopped inline 2016-05-13 17:28:21 -07:00
Brad Hefta-Gaub
b1d86c8881 Merge pull request #7898 from samcake/red
Fix broken rendering for simple metallic material
2016-05-13 17:22:36 -07:00