Brad Hefta-Gaub
ebac2556e4
Merge pull request #11841 from ZappoMan/makeAddEntityAtomic
...
Make add entity atomic
2017-11-18 14:27:12 -08:00
Brad Hefta-Gaub
74bafcbb10
Merge pull request #11795 from huffman/fix/ds-punchlist
...
Punchlist fixes for DS
2017-11-17 17:04:27 -08:00
Brad Hefta-Gaub
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain
...
Adjustable master avatar volume
2017-11-17 16:58:27 -08:00
ZappoMan
66454e7288
fix unix warnings
2017-11-17 16:33:43 -08:00
Brad Hefta-Gaub
a85a6f6795
Merge pull request #11308 from luiscuenca/patch-1
...
glTF import DEMO
2017-11-17 14:52:51 -08:00
ZappoMan
71a46a3374
cleanup
2017-11-17 13:03:04 -08:00
Stephen Birarda
239b116874
Merge pull request #11835 from birarda/bug/octree-connection-id
...
Reset EntityTreeSendThread known state if client disconnects from Entity Server
2017-11-17 12:56:25 -08:00
Brad Hefta-Gaub
f5bb29f767
Merge pull request #11842 from birarda/networking-api-info
...
clarify the send packet list APIs
2017-11-17 12:30:09 -08:00
Andrew Meadows
98001b64d9
Merge pull request #11788 from ctrlaltdavid/21579-a
...
Particles emitter fixes
2017-11-17 11:31:12 -08:00
Stephen Birarda
16d93ee168
clarify signatures in LNL to send packet lists
2017-11-17 11:17:11 -08:00
Stephen Birarda
dd27e3db31
add diff traversal reset when resetting state
2017-11-17 09:44:35 -08:00
ZappoMan
cd0fa989e1
debugging
2017-11-17 08:55:55 -08:00
ZappoMan
e438ac54d5
make adds go over NLPacketList as reliable
2017-11-16 13:16:23 -08:00
Stephen Birarda
eedb77dae9
add clearing of known state if client resets ES connection
2017-11-16 11:40:35 -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
ZappoMan
4c4f23e312
Merge branch 'master' of https://github.com/highfidelity/hifi into makeAddEntityAtomic
2017-11-16 10:09:46 -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
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
David Kelly
009e6b252a
Merge pull request #11814 from AndrewMeadows/fix-cylinders
...
fix cylinder collision shape
2017-11-15 15:24:29 -07:00
luiscuenca
bf0d55aa98
9267 Fix not restoring animations after changing view modes
2017-11-15 15:04:24 -07:00
Anthony J. Thibault
b49891c0f8
Bug fix for MyAvatar.getEyeHeight()
2017-11-15 11:27:42 -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
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
05a38a78c5
don't send octree data without first query
2017-11-14 14:08:27 -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
David Back
4b8021bc4a
Merge pull request #11802 from dback2/mirrorfanciness2
...
prevent rendering HUD elements in secondary camera
2017-11-14 10:49:18 -08:00
Seth Alves
9df11fb11a
Merge pull request #11787 from elisa-lj11/musvis
...
Second fix to null file path return (specific to music visualizer)
2017-11-13 09:44:47 -08:00
Sam Gateau
4b14a7a820
Merge pull request #11799 from NissimHadar/hazeUIFix
...
Removed Keylight attenuation from .js (as well as .html).
2017-11-13 09:18:29 -08:00
Olivier Prat
dd6b7b04c2
Merged with master
2017-11-13 14:33:59 +01:00
Ryan Downe Karpf
9ff4541ee3
Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack
...
Remove hack for missing inttypes.h header on VS2010
2017-11-12 10:59:19 -08:00
Nissim Hadar
f629357ded
Removed Keylight attenuation from .js (as well as .html).
2017-11-11 18:58:12 -08:00
David Back
163de649bf
prevent rendering HUD elements in secondary camera
2017-11-10 17:44:09 -08:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline
...
Multiple Outline Groups
2017-11-10 15:45:03 -08:00
Andrew Meadows
469b68011c
Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero
...
div by zero fixes, detected by address sanitizer
2017-11-10 13:47:40 -08:00
Anthony Thibault
08c12a1ced
Merge pull request #11704 from AndrewMeadows/shape-manager-key
...
cleanup ShapeInfo hash generation
2017-11-10 11:31:46 -08:00
Anthony J. Thibault
ba4c0f189e
code review feedback
...
removed discontinuity in safeDeltaTime, which is used to prevent division by zero.
2017-11-10 10:25:29 -08:00
beholder
5fcde1186a
hide keyboard before showing to solve clearing 'mirrorText' on jumping between input fields without hiding keyboard
2017-11-10 21:20:00 +03:00
beholder
db3ed81513
adjust to changed requirements:
...
1. The keyboard collapse button is moved to the lower right, replacing the keys there
2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift
3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right
2017-11-10 21:20:00 +03:00
