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
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
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
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
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
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
Brad Hefta-Gaub
0d5fdbdb6e
Merge pull request #7879 from howard-stearns/fix-reticle-offset
...
fix reticle position offset
2016-05-13 17:17:23 -07:00
David Rowe
33e2cde266
Change default position to be bottom left of HMD recommended rectangle
2016-05-14 12:08:19 +12:00
Seth Alves
6277bf8603
if avatar is set to the default avatar file that came with the distribution, don't save that url to settings. never send a file url to the avatar-mixer.
2016-05-13 16:37:43 -07:00
samcake
96dffad0d3
Fixing the metallic simple material rendering black from obj
2016-05-13 16:35:15 -07:00
samcake
cdb9cb6519
Fixing the metallic simple material rendering black from obj
2016-05-13 16:33:14 -07:00
Zach Pomerantz
65e81077cb
Merge branch 'master' of github.com:highfidelity/hifi into perf/idle-event
2016-05-13 16:24:42 -07:00
David Rowe
ccd821118e
Merge branch 'master' into 20918
2016-05-14 11:21:04 +12:00
Zach Pomerantz
2140dc77b3
Rename wait and unload in best thread
2016-05-13 16:14:22 -07:00
Zach Pomerantz
36565598a7
Hide script stop behind accessor and fix friendship
2016-05-13 15:52:53 -07:00
Brad Hefta-Gaub
c443138dd2
Merge pull request #7869 from zzmp/fix/fbx-access
...
Check vector access in fbx reader
2016-05-13 15:29:24 -07:00
Zach Pomerantz
59e4b9c356
Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown
2016-05-13 15:28:12 -07:00
Brad Hefta-Gaub
987b3483a8
Merge pull request #7876 from sethalves/fix-grab-fixes
...
fix grab-fixes
2016-05-13 15:26:31 -07:00
Zach Pomerantz
13610b1220
Delete late-added script engines
2016-05-13 15:24:31 -07:00
Zach Pomerantz
70d0ebb91c
Consolidate stoppingAllScripts to ScriptEngines::_stopped
2016-05-13 15:24:15 -07:00
Seth Alves
5247ca5c22
Merge pull request #7896 from ZappoMan/possibleFixToFUESnafu
...
move firstRun.set() to correct place
2016-05-13 14:15:58 -07:00
Seth Alves
ceb6aa582f
don't crash when a moving model entity is deleted
2016-05-13 13:32:45 -07:00
Seth Alves
970e7ca17d
don't crash when a moving model entity is deleted
2016-05-13 13:32:00 -07:00
Brad Hefta-Gaub
65aae42714
move firstRun.set() to correct place
2016-05-13 13:28:02 -07:00
Seth Alves
09317f46e5
Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into update-model-meta
2016-05-13 09:52:59 -07:00
Seth Alves
574709824e
oops
2016-05-13 09:41:19 -07:00
Seth Alves
9bd4b4f8d8
Merge branch 'master' of github.com:highfidelity/hifi into fix-update-entity-operator
2016-05-13 07:12:11 -07:00
