Seth Alves
|
563c19bb91
|
fix connect
|
2018-02-19 15:21:46 -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 |
|
Seth Alves
|
3b99f8d4da
|
Merge branch 'fix-qt-5-10-udt' of github.com:sethalves/hifi into serverless-domains
|
2018-02-19 12:04:13 -08:00 |
|
Nissim Hadar
|
6a9bbaf0a5
|
WIP - clean-up.
|
2018-02-19 12:00:30 -08:00 |
|
Seth Alves
|
25c34403db
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-19 11:24:42 -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 |
|
Seth Alves
|
0a92596452
|
don't rely on return value of pendingDatagramSize() when hasPendingDatagrams() is false
|
2018-02-18 10:04:22 -08:00 |
|
Seth Alves
|
7a5415efbe
|
working on getting history to work with serverless domains
|
2018-02-18 07:55:43 -08:00 |
|
Seth Alves
|
3027d3461e
|
Qt 5.10 seems to indicate pendingDatagramSizes of 0. Reading from these would block and causes an QAbstractSocket::TemporaryError to be thrown
|
2018-02-17 15:24:50 -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 |
|
Seth Alves
|
a060d0ddb7
|
allow more than just hifi:// in various places
|
2018-02-17 06:32:38 -08: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 |
|
Seth Alves
|
dd278b4b1b
|
go to the default spawn point when loading a serverless domain
|
2018-02-16 17:45:39 -08:00 |
|
Seth Alves
|
10935f2cc2
|
save non hifi domain urls to settings
|
2018-02-16 17:31:23 -08:00 |
|
Seth Alves
|
ed5b28aa2a
|
clear octree on any sort of domain change
|
2018-02-16 17:15:15 -08:00 |
|
Seth Alves
|
d58eccd5aa
|
don't use edit.js to load entities for serverless domain
|
2018-02-16 16:38:45 -08:00 |
|
Seth Alves
|
9ba11ba3e5
|
Merge pull request #18 from druiz17/serverless-domains
Support file:///~/path/to/file/ format when loading domain from goto
|
2018-02-16 15:14:45 -08:00 |
|
Dante Ruiz
|
acaf4f0d1d
|
fix merge conflict
|
2018-02-16 15:14:18 -08:00 |
|
Seth Alves
|
367d715ff8
|
set connected flag when going to serverless domain
|
2018-02-16 15:08:37 -08:00 |
|
Dante Ruiz
|
aea517ddba
|
fix merge conflict
|
2018-02-16 15:00:08 -08:00 |
|
Dante Ruiz
|
e0bbc57f6c
|
support relative file path from appliaction directory
|
2018-02-16 14:48:38 -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 |
|
Seth Alves
|
de9ac7f4a5
|
working to integrate serverless domains into history, etc
|
2018-02-16 13:56:22 -08:00 |
|
Seth Alves
|
afa059d331
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-16 12:58:56 -08:00 |
|
Seth Alves
|
b2a4181bc0
|
working to integrate serverless domains into history, etc
|
2018-02-16 12:58:50 -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 |
|
Ryan Downe Karpf
|
a621cb3c2c
|
Merge pull request #12417 from hyperlogic/bug-fix/rc64-scramlbed-avaatrs
RC64: Bug fix for Scramlbed Avaatrs
|
2018-02-16 08:41:28 -08:00 |
|
Ryan Downe Karpf
|
bc8ea1be17
|
Merge pull request #12421 from druiz17/RC64
don't update avatar entities if the avatars ID is AVATAR_SELF_ID
|
2018-02-16 08:41:10 -08:00 |
|
Dante Ruiz
|
2da48afa7e
|
fixing merge conflixt
|
2018-02-16 08:37:56 -08: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 |
|
Seth Alves
|
b5fe5a0c23
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-15 16:09:11 -08:00 |
|
Seth Alves
|
abc467b919
|
load json from indicated file to populate serverless domain
|
2018-02-15 16:09:03 -08:00 |
|