Stephen Birarda
e00481ddfb
use macdeployqt for fixup of components
2016-01-21 17:17:28 -08:00
Stephen Birarda
9127edc968
Merge pull request #6892 from huffman/fix-asset-migration
...
Fix ATP file copy
2016-01-21 17:15:46 -08:00
Brad Hefta-Gaub
094e41c993
Merge pull request #6888 from Atlante45/fix/wifi-ping-spikes
...
Fix wifi ping spikes
2016-01-21 17:07:38 -08:00
samcake
846c5a7b9a
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-21 16:56:40 -08:00
samcake
8eddd52731
Fixing coding guidelines
2016-01-21 16:54:37 -08:00
Brad Hefta-Gaub
1a98ab3fba
Merge pull request #6877 from AndrewMeadows/crash-fix
...
fix interface crash when deleting lots of objects at once
2016-01-21 16:49:21 -08:00
Ryan Huffman
99bb1fcbe1
Remove dirs from atp copy
2016-01-21 16:46:45 -08:00
Ryan Huffman
c9ea6e7eb6
Fix ATP file copy
2016-01-21 16:45:13 -08:00
samcake
402809fe2f
FIxing coding standards
2016-01-21 16:44:35 -08:00
Anthony J. Thibault
a91c181a89
MyAvatar: Recenter when the head turns away from the hips
...
Compute HMD facing moving average.
When the moving average diverges from the hips by more then 45 degrees, recenter the body.
Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController
a desired target is passed. The CharacterController homes toward it's target based on the time remaining.
Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied
to the bodySensorMatrix. This centralizes the moving/homing code to one place, the CharacterContoller.
A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the
re-centering/follow procedure. This "hopefully" makes it easier to maintain.
2016-01-21 16:38:42 -08:00
samcake
9c344c6498
FIxing the bordering enble default value
2016-01-21 16:38:21 -08:00
Seth Alves
c2edb0a559
Merge branch 'master' of github.com:highfidelity/hifi into fix-aa-cube-bug
2016-01-21 16:15:06 -08:00
Leonardo Murillo
a3ccf7014c
Merge pull request #6890 from huffman/fix-asset-migration
...
Fix asset server data migration
2016-01-21 18:12:07 -06:00
Seth Alves
872a00d518
entities that are children shouldn't (at this point) be dynamic.
2016-01-21 15:53:47 -08:00
samcake
2471a88e85
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-21 15:53:25 -08:00
Seth Alves
cbed542682
MyAvatar updates the entity-server about queryAACubes of children entities
2016-01-21 15:53:19 -08:00
Seth Alves
2e1727610e
MyAvatar updates the entity-server about queryAACubes of children entities
2016-01-21 15:52:59 -08:00
samcake
16573357d8
FIxing the AO results at the border of the frame by guarding the fetch out of the frame
2016-01-21 15:50:38 -08:00
Ryan Huffman
996f3f5df7
Fix entity server data migration to work with default persist filename
2016-01-21 15:43:45 -08:00
Seth Alves
ee42c1d7c8
Merge pull request #6889 from birarda/console
...
explicitly remove server console targets from ALL_BUILD
2016-01-21 15:43:15 -08:00
Ryan Huffman
e63ac03123
Fix asset server data migration
2016-01-21 15:26:52 -08:00
Stephen Birarda
f4b94e0ea6
explicitly remove server console targets from ALL_BUILD
2016-01-21 15:19:31 -08:00
Brad Davis
47a1c16430
Resolving warnings
2016-01-21 15:15:18 -08:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
Brad Davis
3e7f29a0aa
Support debug mode for QML UI in debug builds
2016-01-21 15:15:16 -08:00
Brad Davis
ae6cba85e8
More atmosphere removal
2016-01-21 15:15:16 -08:00
Brad Davis
b8109af196
Ignite the atmosphere
2016-01-21 15:15:15 -08:00
Atlante45
db18d188b8
Fix wifi ping spikes
...
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
2016-01-21 15:05:32 -08:00
Leonardo Murillo
7e19110dd5
Merge pull request #6887 from birarda/migrate-ds-old-dev
...
migrate domain-server config from single org name
2016-01-21 16:24:02 -06:00
Stephen Birarda
aa2e55a5a0
handle weird nested path on windows
2016-01-21 14:03:45 -08:00
Stephen Birarda
cddb8cd3f0
migrate domain-server config from single org name
2016-01-21 13:57:24 -08:00
ericrius1
e11e4d196b
tweaks for coding standards
2016-01-21 13:24:07 -08:00
Leonardo Murillo
098b7a4ff3
Merge pull request #6870 from birarda/console
...
Your Stack Manager is now a Server Console
2016-01-21 14:31:34 -06:00
ericrius1
b3b1793035
removed edit.js changes
2016-01-21 12:03:09 -08:00
Stephen Birarda
4cfe3941f4
delete the lookup timeout timer once fired
2016-01-21 11:18:53 -08:00
Stephen Birarda
f12e0b5fd0
simplify callback for domain API get
2016-01-21 11:15:50 -08:00
Philip Rosedale
7387d6e5f1
Merge pull request #6869 from imgntn/pistolfix
...
Make Pistol Quieter and Minor Adjustments
2016-01-21 11:15:07 -08:00
Stephen Birarda
b1c151b165
remove dead code in main.cpp
2016-01-21 11:04:39 -08:00
Philip Rosedale
398296c874
Merge pull request #6883 from ericrius1/sphereLOD
...
Test script for lod testing of sphere entities and sphere overlays
2016-01-21 11:04:26 -08:00
Stephen Birarda
7c9dc2e2bb
add a comment for QProcess non-dangling pointer
2016-01-21 11:02:34 -08:00
Stephen Birarda
77b9c24d99
rename the console notification icon
2016-01-21 10:57:13 -08:00
ericrius1
5132406d37
Test script for lod testing
2016-01-21 10:51:15 -08:00
Ryan Huffman
f162c9220f
Merge pull request #6882 from birarda/audio-mixer-coma
...
repair the audio-mixer coma debug
2016-01-21 10:37:28 -08:00
Stephen Birarda
63da0074b4
repair the audio-mixer coma debug
2016-01-21 10:26:03 -08:00
ericrius1
641607f334
reset script
2016-01-21 10:22:56 -08:00
James B. Pollack
f0ff0b45de
Update hiddenEntityReset.js
2016-01-21 09:33:56 -08:00
James B. Pollack
e63e509835
Update createPistol.js
2016-01-21 09:33:38 -08:00
James B. Pollack
ff9eb7f20d
Update masterReset.js
2016-01-21 09:33:21 -08:00
Seth Alves
5027157575
for LOD, allow entity-server to use getAABox if it can, but fall back to queryAABox if it can't
2016-01-21 09:31:51 -08:00
Chris Collins
5dc1eb986e
Merge pull request #6874 from imgntn/fixgrabparticlesystems
...
Remove Particle Search Beams from Grab Script and Create / Destroy Systems on Demand
2016-01-21 09:25:11 -08:00
