Liv
7f6d210e93
Merge pull request #12836 from misslivirose/fix/close-create-domain-change
...
Go to tablet home / close Create menu when changing domains
2018-04-18 09:29:04 -07:00
Flame Soulis
410e7b5051
Corrected hifiqt5.10.1_5.10.1_amd64.deb
2018-04-18 08:51:59 -04:00
Olivier Prat
1c9d1f6c48
Merge branch 'master' of http://github.com/highfidelity/hifi into haze
2018-04-18 09:06:23 +02:00
Clement
2e8a6e1961
Remove more dead octree code
2018-04-17 18:21:51 -07:00
samcake
d6b6645630
exposing feedback of timing
2018-04-17 18:03:45 -07:00
Stephen Birarda
0a1f07755e
Merge pull request #12696 from birarda/add-js-baker-quote-tests
...
add single quote tests to JS baking tests
2018-04-17 18:02:34 -07:00
Liv Erickson
2a055429cd
handle edit changes
2018-04-17 17:31:16 -07:00
Liv Erickson
e35efccfa3
make icon slightly more robust
2018-04-17 17:11:37 -07:00
John Conklin II
282db62996
Merge pull request #12928 from birarda/merge-back-stable-66
...
Merge back stable to master after RC66 promotion
2018-04-17 16:56:04 -07:00
Liv Erickson
6c1872caba
remove old dependency on domain changed message to fix issue with edit icon not handling domain changes
2018-04-17 16:38:29 -07:00
unknown
46e040ca7b
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
2018-04-17 16:26:42 -07:00
unknown
278a6b763f
ensure target mouse entity has equip data
2018-04-17 16:26:33 -07:00
Atlante45
7e6d45ead7
CR
2018-04-17 16:25:07 -07:00
unknown
9e4914975b
missing reset flag on end equip, remove mouseEquip check on unequip via U
2018-04-17 16:13:10 -07:00
John Conklin II
86c9b8c61d
Merge pull request #12892 from SimonWalton-HiFi/batch-compile-shaders
...
Batch compile shaders
2018-04-17 15:47:32 -07:00
Liv Erickson
abe8a3e6d9
correct implementation that doesn't interfere with other app status
2018-04-17 15:41:03 -07:00
Liv
071396bed0
move logic for disconnecting out of initalize() and into setActive()
2018-04-17 15:40:59 -07:00
Liv
7a7438b648
space for synxtax
2018-04-17 15:40:57 -07:00
Liv
7f01dded79
add handler to refused domain change connections
2018-04-17 15:40:55 -07:00
Liv
6f020a7ec8
return tablet to home on change domain
2018-04-17 15:40:54 -07:00
Stephen Birarda
9fca98aa0f
Revert "Reverting TAA to FXAA in rc66 until we fix the aa on tablet"
...
This reverts commit 8e7b9dfa2b
2018-04-17 15:35:16 -07:00
Stephen Birarda
95c172f418
Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66
2018-04-17 15:34:46 -07:00
MiladNazeri
40e311fe1e
Fix QT typo
2018-04-17 15:20:05 -07:00
SamGondelman
901301485b
reorganizing shader defines to fix compilation errors
2018-04-17 15:11:56 -07:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018
...
Discovery: April 2018 (Huge PR; see description)
2018-04-17 15:11:50 -07:00
Thijs Wenker
e6f0bfbf4c
get proper checkbox value from the allow light selection menu option
2018-04-18 00:10:49 +02:00
Atlante45
a626e9f6f3
Add special handler for heap corruption
2018-04-17 15:09:10 -07:00
Brad Davis
d478204722
Working on splash rendering
2018-04-17 14:17:41 -07:00
Zach Fox
95ee3c82f5
Fix paths to various Snapshot resource files
2018-04-17 14:13:14 -07:00
John Conklin II
758bf09b30
Merge pull request #12705 from highfidelity/RC66
...
Beta Release 66 - includes up to Developer Release 8013
2018-04-17 14:09:26 -07:00
Zach Fox
4e48008ba1
Don't allow users to spam Still Only snapshot capture
2018-04-17 12:39:46 -07:00
David Rowe
e3edc45081
Document NavigationFocused
2018-04-18 07:04:55 +12:00
Stephen Birarda
a0e1d2e54e
Merge pull request #12764 from SimonWalton-HiFi/bakedassettype-enum
...
Make BakedAssetType a scoped enum
2018-04-17 11:50:14 -07:00
Thijs Wenker
b741888d77
CR feedback (for real)
2018-04-17 20:31:30 +02:00
Thijs Wenker
91467b6059
CR feedback
2018-04-17 20:30:00 +02:00
SamGondelman
527d71c379
CR
2018-04-17 10:58:54 -07:00
Thijs Wenker
0aa0f53925
edit.js - remove ability to clone non-owned avatar-entities
2018-04-17 19:46:45 +02:00
unknown
758f8b4618
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
2018-04-17 09:19:19 -07:00
John Conklin II
44e0a2acc5
Merge pull request #12914 from sethalves/rc66-fix-bookmarks
...
fix bookmarks, don't put :0 in urls
2018-04-17 08:29:36 -07:00
John Conklin II
ab4d328d4f
Merge pull request #12909 from hyperlogic/bug-fix/case-12628-rc66
...
RC66: Fix for avatar glitches, head and legs folding into chest.
2018-04-17 08:28:35 -07:00
Olivier Prat
0800c5eeb9
Removed TAA from web shaders. With reduced jittering, jittering on these objects is less noticeable
2018-04-17 16:36:52 +02:00
Olivier Prat
6ec9378739
Used unjittered projection matrix for a sharper and more stable TAA
2018-04-17 15:13:03 +02:00
Oren Hurvitz
3ae65bba15
Fixed crash when importing entities from JSON multiple times
...
This happened because the Clipboard wasn't being completely cleared between uses.
This bug can also manifest in another way (if Interface doesn't crash): the imported entities appear very far away, instead of right in front of the user. This happens for the same reason as the crash: the Clipboard still contains some previously-imported entities. That causes us to calculate the wrong dimensions for the newly-imported entities which is why they are added to the domain far away.
2018-04-17 15:51:41 +03:00
Olivier Prat
d0d974d4f5
Bizarelly the jitter was 2 pixel wide...?
2018-04-17 12:24:12 +02:00
Oren Hurvitz
91e27db9b0
When importing entities from JSON: fixed a null pointer exception if addEntity() failed on any of the entities
2018-04-17 12:32:28 +03:00
Olivier Prat
08146a7618
Used previous projection matrix to limit overblur
2018-04-17 11:28:59 +02:00
Sam Gateau
ab04a34ccf
Proposing a more flexible design for the engine
2018-04-17 02:06:33 -07:00
Sam Gateau
fd752a07c1
Proposing a more flexible design for the engine
2018-04-17 02:05:35 -07:00
Olivier Prat
89669b326b
Merge branch 'master' of http://github.com/highfidelity/hifi into taapre
2018-04-17 09:24:35 +02:00
Sam Gateau
ff7fcd10e7
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-16 19:58:47 -07:00
