SamGondelman
|
393ad0079c
|
home button is circle instead of sphere, fixed positioning, fix lasers on tablet
|
2017-11-17 15:24:21 -08:00 |
|
SamGondelman
|
42d047c572
|
merge with master
|
2017-11-17 11:52:34 -08:00 |
|
SamGondelman
|
e38b0ab6b8
|
make web overlays match web entities more, remove resolution
|
2017-11-17 11:50:24 -08:00 |
|
Dante Ruiz
|
4de0fdf7d1
|
Merge pull request #11768 from ctrlaltdavid/21596
Add instructions and cursor to GOTO dialog input
|
2017-11-17 11:45:40 -08:00 |
|
Andrew Meadows
|
98001b64d9
|
Merge pull request #11788 from ctrlaltdavid/21579-a
Particles emitter fixes
|
2017-11-17 11:31:12 -08:00 |
|
Andrew Meadows
|
6a784794c9
|
Merge pull request #11789 from ctrlaltdavid/21599
Don't remove entities from list when try to delete locked entity
|
2017-11-17 11:26:00 -08:00 |
|
Andrew Meadows
|
d207803f26
|
Merge pull request #11837 from SamGondelman/hOverlay
Fix tablet home button highlight overlay dimensions
|
2017-11-17 08:25:27 -08:00 |
|
Zach Fox
|
57c86c3035
|
Merge pull request #11836 from zfox23/commerce_fixStepSkip
Fix skipping wallet setup step in certain cases
|
2017-11-16 16:01:10 -08:00 |
|
SamGondelman
|
b252c81d84
|
fix home button hover overlay dimensions
|
2017-11-16 15:34:42 -08:00 |
|
Zach Fox
|
7f64ede940
|
Fix skipping wallet setup step in certain cases
|
2017-11-16 11:44:52 -08:00 |
|
John Conklin II
|
b5d4f6c65f
|
Merge pull request #11826 from jherico/bug/fb9107
Fix for black screen on HMDs on startup
|
2017-11-16 11:32:20 -08:00 |
|
Clément Brisset
|
2b39cb4500
|
Merge pull request #11832 from highfidelity/RC59
Merge RC59 into master
|
2017-11-16 11:19:54 -08:00 |
|
Dante Ruiz
|
94ac8e52d5
|
Merge pull request #11822 from druiz17/fix-tablet-3d-person
fixing tablet in 3d person
|
2017-11-16 08:55:27 -08:00 |
|
Brad Davis
|
7bbc719d79
|
Fix for black screen on HMD derived display plugins
|
2017-11-16 08:53:12 -08:00 |
|
John Conklin II
|
0306c22394
|
Merge pull request #11823 from luiscuenca/case9267
Fix not restoring animations after changing view modes
|
2017-11-15 16:38:35 -08:00 |
|
John Conklin II
|
21503a635f
|
Merge pull request #11811 from birarda/feat/entity-server-flap
Hold entity data until client is presumably reachable and has queried
|
2017-11-15 16:16:50 -08:00 |
|
Sam Gateau
|
3f5b21ec22
|
Merge pull request #11559 from Zvork/bloom
Bloom
|
2017-11-15 15:11:31 -08:00 |
|
Ryan Huffman
|
60a222e4b4
|
Merge pull request #11810 from Atlante45/fix/stuck-acs
Fix stuck ACs
|
2017-11-15 14:59:51 -08:00 |
|
Zach Fox
|
9ad27e93f5
|
Merge pull request #11820 from ElderOrb/FB9264
9264 dismiss keyboard after user finished typing in marketplace searc…
|
2017-11-15 14:56:00 -08:00 |
|
David Kelly
|
009e6b252a
|
Merge pull request #11814 from AndrewMeadows/fix-cylinders
fix cylinder collision shape
|
2017-11-15 15:24:29 -07:00 |
|
Zach Fox
|
9f80a5f081
|
Merge pull request #11817 from zfox23/commerce_rezFix
Fix rezzing non-JSON marketplace items
|
2017-11-15 14:17:05 -08:00 |
|
luiscuenca
|
bf0d55aa98
|
9267 Fix not restoring animations after changing view modes
|
2017-11-15 15:04:24 -07:00 |
|
Dante Ruiz
|
9564b7567b
|
fixing tablet in 3d person
|
2017-11-15 13:39:21 -08:00 |
|
Dante Ruiz
|
b42704012e
|
Merge pull request #11819 from hyperlogic/bug-fix/avatar-eye-height
Bug fix for MyAvatar.getEyeHeight()
|
2017-11-15 13:20:30 -08:00 |
|
Alexander Ivash
|
78d89d886f
|
9264 dismiss keyboard after user finished typing in marketplace search bar and hit search or return key
|
2017-11-16 00:13:46 +03:00 |
|
John Conklin II
|
703d1e1739
|
Merge pull request #11808 from Atlante45/hazeUIFix
RC-59 patch - Removed Keylight attenuation from .js (as well as .html).
|
2017-11-15 12:54:14 -08:00 |
|
Anthony J. Thibault
|
b49891c0f8
|
Bug fix for MyAvatar.getEyeHeight()
|
2017-11-15 11:27:42 -08:00 |
|
Zach Fox
|
e8c4878c8f
|
Fix rezzing non-JSON marketplace items
|
2017-11-15 11:25:18 -08:00 |
|
Atlante45
|
d8b1cb10df
|
CR
|
2017-11-15 11:20:30 -08:00 |
|
Atlante45
|
e68ce97697
|
Remove the number of socket change tracking
|
2017-11-15 11:19:54 -08:00 |
|
Dante Ruiz
|
d83f3152dd
|
Merge pull request #11809 from ElderOrb/FB8984
8984 Opening tablet with "Enter" key displays the audio menu
|
2017-11-15 11:16:49 -08:00 |
|
Sam Gateau
|
2c51e516eb
|
Merge pull request #11744 from Zvork/shadow
Shadow caster culling fix
|
2017-11-15 09:49:39 -08:00 |
|
John Conklin II
|
8592f3fd4d
|
Merge pull request #11764 from luiscuenca/case7587
7587 Lasers resize with avatar
|
2017-11-15 09:31:45 -08:00 |
|
Andrew Meadows
|
d538a9aaa8
|
fix typo making cylinders collide as sphere
|
2017-11-15 09:04:04 -08:00 |
|
Olivier Prat
|
14275b1cf3
|
Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded
|
2017-11-15 15:42:04 +01:00 |
|
Olivier Prat
|
f47a3e7d2c
|
Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake
|
2017-11-15 09:42:57 +01:00 |
|
Olivier Prat
|
bf46ccefaf
|
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
|
2017-11-15 08:59:36 +01:00 |
|
Stephen Birarda
|
557ee458ec
|
wait for node active socket before constructing packets
|
2017-11-14 17:08:01 -08:00 |
|
Howard Stearns
|
1c293c4c48
|
Merge pull request #11813 from zfox23/commerce_removeEditJSDependency
Remove Marketplace's dependency on Edit.js for REZ/WEAR
|
2017-11-14 16:33:35 -08:00 |
|
Zach Fox
|
d6c244d1d5
|
Remove incorrect logic
|
2017-11-14 14:54:03 -08:00 |
|
Zach Fox
|
f5994375cf
|
Remove Marketplace's dependency on Edit.js for rez
|
2017-11-14 14:29:49 -08:00 |
|
Stephen Birarda
|
05a38a78c5
|
don't send octree data without first query
|
2017-11-14 14:08:27 -08:00 |
|
John Conklin II
|
49abb441e6
|
Merge pull request #11807 from Atlante45/case8495
RC-59 patch - Disable mirror camera in HMD mode
|
2017-11-14 13:06:47 -08:00 |
|
Olivier Prat
|
5102c8e1b1
|
Merged with master
|
2017-11-14 21:56:00 +01:00 |
|
Olivier Prat
|
c5bd86a4bf
|
Disabled bloom by default
|
2017-11-14 21:54:40 +01:00 |
|
Zach Fox
|
c42003a374
|
Merge pull request #11794 from ElderOrb/FB4684_3
4684 Add collapse button on the virtual keyboard
|
2017-11-14 12:22:42 -08:00 |
|
Atlante45
|
b31118fe00
|
CR
|
2017-11-14 11:41:43 -08:00 |
|
Atlante45
|
6b5b905b2a
|
Exit right away if the parent process died
|
2017-11-14 11:41:43 -08:00 |
|
Atlante45
|
462ec30cac
|
Utilise Windows Job Object so child dies w/ parent
|
2017-11-14 11:41:43 -08:00 |
|
Alexander Ivash
|
e201e203b8
|
8984 Opening tablet with "Enter" key displays the audio menu
|
2017-11-14 22:18:48 +03:00 |
|