Nissim Hadar
|
b519ebd6f1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
|
2018-02-21 12:36:56 -08:00 |
|
Nissim Hadar
|
bf4ba07b72
|
Added parameters to canCastShadow - still sucks.
|
2018-02-21 12:36:34 -08:00 |
|
Sam Gateau
|
0af8507ce2
|
Merge pull request #12453 from SamGondelman/materialUI
Fix new material UI indentation
|
2018-02-21 12:14:32 -08:00 |
|
SamGondelman
|
4dde178b93
|
fix new material UI
|
2018-02-21 10:33:15 -08:00 |
|
John Conklin II
|
9ba1532c26
|
Merge pull request #12446 from sethalves/more-logging-for-fb-11748
more logging for fogbugz 11748
|
2018-02-21 09:49:51 -08:00 |
|
Seth Alves
|
cfbe082074
|
Merge pull request #12438 from ctrlaltdavid/21757
Fix selecting values when tabbing between entity properties fields
|
2018-02-21 09:22:46 -08:00 |
|
Seth Alves
|
220d9abbfc
|
Merge pull request #12435 from vladest/fix_flickable_tablethome
Make sure Flickable for GridView for TabletHome will not flick
|
2018-02-21 09:21:45 -08:00 |
|
John Conklin II
|
9e1ea191b3
|
Merge pull request #12443 from zfox23/commerce_SendMoneyUiFix1
Commerce: Wallet/Send Money UI fixes
|
2018-02-21 09:02:13 -08:00 |
|
John Conklin II
|
92249a2bee
|
Merge pull request #12396 from ElderOrb/double-connection-fix
fix 4x 'fromQml' slots execution
|
2018-02-21 09:01:47 -08:00 |
|
Nissim Hadar
|
af484d0af6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
|
2018-02-20 23:48:12 -08:00 |
|
Nissim Hadar
|
6f84e4c977
|
Moved shadows and ambient occlusion to menu checkboxes.
|
2018-02-20 23:45:07 -08:00 |
|
Seth Alves
|
bf73df1265
|
more logging for fogbugz 11748
|
2018-02-20 15:45:47 -08:00 |
|
Zach Fox
|
fd6f4b569f
|
Fix active focus issue
|
2018-02-20 13:19:31 -08:00 |
|
Zach Fox
|
eb29bdf5d2
|
Don't allow tabs or newlines
|
2018-02-20 13:06:10 -08:00 |
|
Ryan Huffman
|
acda90577a
|
Merge pull request #11997 from ZappoMan/oldPropsFilters
giving more info to entity edit filters to allow more flexibility
|
2018-02-20 12:57:44 -08:00 |
|
Zach Fox
|
9bde9f5a4f
|
Fix height of Optional Message in Send Money
|
2018-02-20 12:36:11 -08:00 |
|
John Conklin II
|
6148c407a5
|
Merge pull request #12422 from misslivirose/fix-overlay-lines
Show outline for zones when rotating
|
2018-02-20 09:30:22 -08:00 |
|
John Conklin II
|
aa67a98d02
|
Merge pull request #12426 from ElderOrb/FB11508
fix for toolbar slowly drifting on switching between HMD/Desktop modes
|
2018-02-20 09:30:01 -08:00 |
|
David Rowe
|
44aafd92a4
|
Merge branch 'master' into 21757
# Conflicts:
# scripts/system/html/js/entityProperties.js
|
2018-02-20 17:34:59 +13:00 |
|
ZappoMan
|
76d611d563
|
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
|
2018-02-19 19:15:33 -08:00 |
|
Nissim Hadar
|
b2a06cdb98
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/ShapeEntityItem.h
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
|
2018-02-19 13:05:57 -08:00 |
|
Nissim Hadar
|
9921217807
|
Shapes casting shadows OK.
|
2018-02-19 12:32:11 -08:00 |
|
Nissim Hadar
|
6a9bbaf0a5
|
WIP - clean-up.
|
2018-02-19 12:00:30 -08:00 |
|
Sam Gateau
|
fd49c0d100
|
Merge pull request #12401 from SamGondelman/decals
Material Entities
|
2018-02-19 10:58:02 -08:00 |
|
David Rowe
|
65efeadf10
|
Fix selecting values when tabbing between entity properties fields
|
2018-02-19 19:17:23 +13:00 |
|
Brad Hefta-Gaub
|
0ef2794c35
|
Merge pull request #12395 from druiz17/fix-qml-tablet-apps
Prevent adding the same tablet url to the tabletApps list
|
2018-02-18 19:10:24 -08:00 |
|
Brad Hefta-Gaub
|
a4783ded15
|
Merge pull request #12414 from hyperlogic/bug-fix/scramlbed-avaatrs
Bug fix for Scrambled Avatars
|
2018-02-18 19:06:53 -08:00 |
|
Brad Hefta-Gaub
|
d0b0fcba9a
|
Merge pull request #12436 from cain-kilgore/patch-1
Fixed extra " in backup_instructions.html
|
2018-02-18 19:06:24 -08:00 |
|
Nissim Hadar
|
81c9e449e6
|
Models casting shadows (again). (Something stupid happened...)
|
2018-02-18 10:19:17 -08:00 |
|
Nissim Hadar
|
a69816f885
|
WIP.
|
2018-02-17 15:21:57 -08:00 |
|
Cain Kilgore
|
47ed45b5e9
|
Fixed extra " in backup_instructions.html
|
2018-02-17 18:14:44 +00:00 |
|
vladest
|
e5f953c103
|
Make sure Flickable for GridView for TabletHome will not flick
|
2018-02-17 16:52:32 +01:00 |
|
Nissim Hadar
|
7ba8a9935a
|
No extraneous shadows.
|
2018-02-16 19:23:31 -08:00 |
|
Nissim Hadar
|
dc3b03c9bc
|
Added shadows to shapes - still sucks...
|
2018-02-16 18:37:47 -08:00 |
|
Nissim Hadar
|
4d4e3d6aae
|
Merge branch 'shadowControlsOffZvork' of https://github.com/NissimHadar/hifi into shadowControlsOffZvork
|
2018-02-16 18:00:10 -08:00 |
|
Nissim Hadar
|
a2cc78b200
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
|
2018-02-16 14:01:57 -08:00 |
|
Nissim Hadar
|
4c1f22f84e
|
Models and Avatar cast shadows (box doesn't, yet).
|
2018-02-16 14:01:33 -08:00 |
|
Nissim Hadar
|
47924a58f9
|
WIP - for review.
|
2018-02-16 10:14:46 -08:00 |
|
Stephen Birarda
|
311b9388d6
|
Merge pull request #12424 from birarda/bug/settings-response-filter
fix overwrite of general description object with filtered
|
2018-02-16 10:57:58 -07:00 |
|
John Conklin II
|
24a3eb6e80
|
Merge pull request #12419 from druiz17/fix-edit-avatar-entities
Don't update avatar entities of the avatars ID is AVATAR_SELF_ID
|
2018-02-16 09:48:19 -08:00 |
|
Nissim Hadar
|
d48af6124b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
|
2018-02-16 09:28:32 -08:00 |
|
Nissim Hadar
|
194c7f4101
|
WIP - for review.
|
2018-02-16 09:28:15 -08:00 |
|
Alexander Ivash
|
2eb8ebcdbc
|
FB11508 - toolbar slowly sides downward
|
2018-02-16 20:22:16 +03:00 |
|
MiladNazeri
|
331b253ba0
|
Merge pull request #12386 from cain-kilgore/21668
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
|
2018-02-16 06:57:03 -08:00 |
|
Stephen Birarda
|
81662b5edc
|
don't overwrite general description object with filtered one
|
2018-02-15 19:14:14 -08:00 |
|
SamGondelman
|
2d0b85af72
|
workaround bug
|
2018-02-15 17:28:59 -08:00 |
|
Liv Erickson
|
175532c444
|
show outline for zones when rotating
|
2018-02-15 15:51:54 -08:00 |
|
Sam Gateau
|
f809862870
|
Merge pull request #12412 from samcake/blue
Introduce task abort feature for early exit of task branch
|
2018-02-15 15:50:43 -08:00 |
|
SamGondelman
|
b189433855
|
merge
|
2018-02-15 15:50:36 -08:00 |
|
SamGondelman
|
2d754edf74
|
CR
|
2018-02-15 15:48:41 -08:00 |
|