Seth Alves
|
6f420ffae2
|
Merge pull request #12936 from druiz17/more-tablet-changes
Change tablet model and spawn position
|
2018-04-19 10:25:34 -07:00 |
|
Sam Gateau
|
f87bfc14de
|
Merge pull request #12898 from kitely/emissivemap-relative-path
In Material resources, support relative paths for 'emissiveMap'
|
2018-04-19 10:25:02 -07:00 |
|
John Conklin II
|
5ef90b242e
|
Merge pull request #12925 from thoys/fix/create-errorOnShutdown
Create app: Save light selection menu option properly
|
2018-04-19 10:16:40 -07:00 |
|
John Conklin II
|
cad4d45941
|
Merge pull request #12871 from Atlante45/fix/dead-octree-code
Remove dead Octree code
|
2018-04-19 09:58:20 -07:00 |
|
Sam Gateau
|
1e086332cc
|
Merge pull request #12911 from jherico/feature/splash
Pre-requisite changes for splash screen rendering
|
2018-04-19 09:19:05 -07:00 |
|
Stephen Birarda
|
c4ad93bafb
|
Merge pull request #12782 from SimonWalton-HiFi/qregexp
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
|
2018-04-18 17:28:48 -07:00 |
|
John Conklin II
|
e557e0ae52
|
Merge pull request #12844 from druiz17/feature-entity-highlighting
Highlight grabbable and equippable entities.
|
2018-04-18 15:35:46 -07:00 |
|
John Conklin II
|
51a98961a6
|
Merge pull request #12920 from thoys/fix/create-dontCloneOthersAvatarEntities
edit.js - remove ability to clone non-owned avatar-entities
|
2018-04-18 15:27:09 -07:00 |
|
Clement
|
a8d6a4e0b6
|
CR
|
2018-04-18 15:05:49 -07:00 |
|
John Conklin II
|
87f60e1e25
|
Merge pull request #12894 from sethalves/fix-tractor-action-crazy
fix bug that caused tractor action to go crazy
|
2018-04-18 14:13:56 -07:00 |
|
John Conklin II
|
eedc8a8c0a
|
Merge pull request #12929 from misslivirose/fix/misc-edit-bugs
Fix edit icon behavior
|
2018-04-18 13:46:38 -07:00 |
|
Zach Fox
|
e0012ed5dc
|
Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath
Fix paths to various Snapshot resource files
|
2018-04-18 13:44:53 -07:00 |
|
Clément Brisset
|
482f8ddbff
|
Merge pull request #12913 from birarda/bug/login-no-perms
delay NL reset on login until new username is known
|
2018-04-18 13:31:56 -07:00 |
|
Dante Ruiz
|
86d3ba658f
|
Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting
|
2018-04-18 13:30:24 -07:00 |
|
Dante Ruiz
|
cf22f61361
|
adding cleanup of selection
|
2018-04-18 13:30:14 -07:00 |
|
Zach Fox
|
3ef0598871
|
Merge pull request #12923 from zfox23/MS10864_preventSnapshotSpam
Don't allow users to spam Still Only snapshot capture
|
2018-04-18 13:19:36 -07:00 |
|
Anthony Thibault
|
147da86668
|
Merge pull request #12933 from hyperlogic/feature/wireshark-avatar-data
Add more detailed AvatarData packet support to Wireshark dissector plugin
|
2018-04-18 13:13:54 -07:00 |
|
Dante Ruiz
|
9d6fc13a04
|
Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes
|
2018-04-18 13:06:51 -07:00 |
|
Dante Ruiz
|
a65f5f7917
|
making tablet changes
|
2018-04-18 13:06:26 -07:00 |
|
John Conklin II
|
db99d12736
|
Merge pull request #12919 from kitely/fix-import-entities-distance
Fixed crash when importing entities from JSON multiple times
|
2018-04-18 11:52:46 -07:00 |
|
John Conklin II
|
710bfb894a
|
Merge pull request #12907 from AndrewMeadows/more-correct-stats-002
more correct stats names
|
2018-04-18 10:50:38 -07:00 |
|
Anthony J. Thibault
|
04c22e5a2b
|
Add more detailed AvatarData packet support to Wireshark dissector plugin.
|
2018-04-18 10:50:00 -07:00 |
|
John Conklin II
|
d19bb557ad
|
Merge pull request #12897 from ctrlaltdavid/21848
Include JSDoc Web pages in the install
|
2018-04-18 10:49:31 -07:00 |
|
John Conklin II
|
005b6a6b1f
|
Merge pull request #12893 from ctrlaltdavid/21843
Fix overlay toggling
|
2018-04-18 10:49:05 -07:00 |
|
Liv Erickson
|
e795af03dd
|
move function out of global scope
|
2018-04-18 09:56:39 -07:00 |
|
Seth Alves
|
490d7dfb87
|
Merge pull request #12931 from FlameSoulis/fix/BUILD_LINUX.md-QT-Link
Corrected BUILD_LINUX.md regarding QT
|
2018-04-18 09:32:53 -07:00 |
|
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 |
|
Clement
|
2e8a6e1961
|
Remove more dead octree code
|
2018-04-17 18:21:51 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|