Commit graph

63280 commits

Author SHA1 Message Date
samcake
4fc8a8ea08 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2018-01-05 12:27:41 -08:00
Sam Gateau
91eb718074
Merge pull request #12091 from SamGondelman/overlayFix
Update model render items on texture load and fix no haze issue
2018-01-05 12:26:56 -08:00
Nissim Hadar
3963c0a5a1 Code review improvements. 2018-01-05 12:22:20 -08:00
samcake
daa9136b34 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2018-01-05 11:50:35 -08:00
David Back
ac1c398b9d
Merge pull request #11669 from dback2/mergeAccountGlobalServices
merge AccountScriptingInterface into GlobalServicesScriptingInterface
2018-01-05 11:34:53 -08:00
David Rowe
5431b7137b Code review 2018-01-06 08:27:24 +13:00
luiscuenca
d0bc881bb2 Load script manually 2018-01-05 12:20:41 -07:00
Nissim Hadar
820d80eaad Reverted auto-tester. 2018-01-05 11:20:20 -08:00
David Back
76f278f899
Merge branch 'master' into mergeAccountGlobalServices 2018-01-05 10:56:12 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices 2018-01-05 10:54:59 -08:00
Melissa Brown
933720fb10
Merge pull request #12012 from Delanir/Case10633
Cases 10632 and 10633 Particle Explorer UI
2018-01-05 10:46:41 -08:00
Melissa Brown
eb83c68d46
Merge pull request #12094 from ctrlaltdavid/resolution-removed
Delete web3d overlay "resolution" property JSDoc
2018-01-05 10:38:07 -08:00
vladest
02972c92f0 Merge branch 'master' into tablet_pagination_magnify 2018-01-05 19:12:13 +01:00
Seth Alves
2071d42d25
Merge pull request #12088 from ElderOrb/FB11008
11008 GoTo app does not focus on address bar when opened
2018-01-05 10:07:36 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
2018-01-05 09:07:54 -08:00
luiscuenca
108748ca96 smooth transitions and slower back to default 2018-01-05 09:55:50 -07:00
Ryan Downe Karpf
a3245aec57
Merge pull request #12079 from RebeccaStankus/log-filtering
Log filtering
2018-01-05 08:40:41 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)
2018-01-05 08:15:48 -08:00
Alexander Ivash
437b78dce5 FB10621 "HIFI-Commerce Login" page title change to "Log in to continue" 2018-01-05 13:35:19 +03:00
Sam Gondelman
5cf25a20c9
use correct model ptr 2018-01-04 21:21:58 -08:00
Nissim Hadar
cf7d6a2eab Added correct use of legacy background combo. 2018-01-04 20:30:10 -08:00
David Rowe
5463f1ae6b Merge branch 'master' into 21646 2018-01-05 16:58:58 +13:00
Nissim Hadar
033aa11aa2 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-04 19:48:41 -08:00
David Rowe
d6a0457ee5 Delete web3d overlay "resolution" property JSDoc 2018-01-05 16:48:37 +13:00
Nissim Hadar
c10d2a5461 Added correct use of legacy background combo. 2018-01-04 19:48:25 -08:00
David Rowe
69dff9ac09 Remove unused code 2018-01-05 16:16:55 +13:00
David Rowe
4b2ed44322 Reduce incidence of tablet screen being rotated w.r.t. model 2018-01-05 16:16:42 +13:00
David Rowe
936b5f3571 Laser on tablet bezel as well as screen and "x" button 2018-01-05 16:15:59 +13:00
Bruce Brown
7476de60ce Merge branch 'master' of https://github.com/1st-BrainStormer/hifi 2018-01-04 18:44:08 -08:00
Bruce Brown
a1c3ad360f Merge branch 'master' of https://github.com/highfidelity/hifi 2018-01-04 18:42:52 -08:00
Nissim Hadar
adbc4d0c39 Removed background mode from code (still in the protocol). 2018-01-04 18:23:25 -08:00
Bruce Brown
a89cfec71c Revert "Update (#1)"
This reverts commit 7b1ac24709.
2018-01-04 18:20:43 -08:00
Lexx
85b54f82d8
revert sorting change mistake 2018-01-05 01:58:23 +00:00
SamGondelman
a9d5dda976 always push default haze to current frame 2018-01-04 17:54:23 -08:00
David Back
7558b00467 better fix for model scale floor, remove abs 2018-01-04 17:49:39 -08:00
NissimHadar
43bc8bb948
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor
defang accidental disable of MyAvatar's default motor
2018-01-04 17:44:22 -08:00
Sam Gateau
b7ae9976da Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2018-01-04 17:40:18 -08:00
Bruce Brown
7b1ac24709
Update (#1)
* Tablet paginator initial

* Refactor to SwipeView

* Use MouseArea for interacting instead of default one to be able interact in HMD mode

* Make page indicators non clickable. Attempt to enable swipe even over buttons

* Tune press delay to be able to swipe tablet pages easier

* VR stylus and laser need longer timeout than mouse

* Swipe area expanded to whole tablet. Icons doesnt stick together anymore

* Fix warnings after apps closed

* Using Flickable signals to remove hover state instead of timer. No more delays

* Created poly scripting interface template

* Created poly scripting interface template

* can fetch poly asset list synchronously

* removed key

* Something intermediate

* Retreive buttons list from tablet proxy

* Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections

* Code style

* Created poly scripting interface template

* can fetch poly asset list synchronously

* removed key

* added getAssetList() and getFBX()

* Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons

* Create pages and store in global array, makes sure it will not be cleared by garbage collector whe out of scope

* enabled fbx, obj, and blocks model url retrieval

* added gltf import feature, getAssetList() not working

* fixed getAssetList()

* cleaned up code

* added const to valid inputs

* changed qtglobal include

* added newline to header

* Store button list in the resources section of fake item instead of C++ space

* Preliminary proxy model

* fix issue

* delete dot file

* fix spacing

* fix grabbing

* delete code

* fix model overlays visibility change

* typo

* Refactored using new GridView approach

* Selection consistency #1

* Selection consistency #2

* handles empty json object return

* keyword filters case insensitive now

* fixed constant names, added another URL check

* added const to several parameters

* changed api key variable name

* Use buttons index

* Cleanup. Errors checks

* Remove legacy jurisdiction code

* Update Octree server stats to handle single server

* CR

* Fix marketplacesInject.js for local Metaverse

* Make things slightly better?

* Remove erroneous "filed" Overlay property

* Add a link to My Purchases from Wallet Home

* add .jsc, remove duplicate qmlc, and remote Utils.jsc

* Fix Security Pic Change dialog after QML security changes

* Add Unused packet type back for ICE servers

* Make sure the protocol signature still changes

* fix bug preventing sim owenrship on local domain

* remove unnecessary 'virtual' keyword
2018-01-04 17:32:14 -08:00
David Back
307867a91f adjust to for loop 2018-01-04 16:53:35 -08:00
Andrew Meadows
623a29b14a add ownership infection for constraints 2018-01-04 16:48:06 -08:00
Zach Fox
0388c183ab Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination 2018-01-04 16:42:12 -08:00
David Back
6b9658f8cf merge 2018-01-04 16:41:58 -08:00
Nissim Hadar
1e2413bade Removed unneeded file. 2018-01-04 16:01:22 -08:00
Nissim Hadar
e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
# Conflicts:
#	interface/resources/qml/js/Utils.jsc
2018-01-04 15:58:08 -08:00
Andrew Meadows
01fd6dc8f6 add comments to make code more clear 2018-01-04 15:53:03 -08:00
Andrew Meadows
a51d83c6e4 rollback automatic priority promotion to RECRUIT 2018-01-04 15:53:03 -08:00
Andrew Meadows
6638b1deae fix bug causing sim ownership thrash 2018-01-04 15:53:03 -08:00
Andrew Meadows
7e01f97f8f more correct volunteer ownership priority promotion 2018-01-04 15:53:03 -08:00
Seth Alves
9e8e15d620
Merge pull request #12074 from AndrewMeadows/simulation-ownership
fix bug preventing simulation ownership on localhost domain
2018-01-04 15:48:54 -08:00
SamGondelman
eb0d09360a Merge remote-tracking branch 'upstream/master' into overlayFix 2018-01-04 15:47:20 -08:00