David Rowe
0ef03eb52a
Remove extraneous panels
2017-08-23 10:42:24 +12:00
Zach Fox
ec2a27e68c
Progress
2017-08-22 15:02:06 -07:00
David Rowe
7051ff8f1f
Rename "tool menu" to "tools menu"
2017-08-23 09:41:46 +12:00
beholder
a18410ef07
make building tests optional
2017-08-23 00:40:14 +03:00
David Kelly
0bd3f1728d
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile
2017-08-22 14:40:10 -07:00
vladest
f7a704d9f4
Added current tab selection according to context
2017-08-22 23:33:09 +02:00
David Rowe
d6a23abb7c
Tools menu header and panel
2017-08-23 09:30:19 +12:00
vladest
6f0229f450
Reworked according to designers request. Do not fall back to default audion output
2017-08-22 23:26:27 +02:00
beholder
a1e0f31cd8
fix for 'C1128: number of sections exceeded object file format limit'
2017-08-23 00:24:09 +03:00
Dante Ruiz
febfa409d0
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-22 14:01:16 -07:00
Chris Collins
06641ade94
Merge pull request #11228 from Atlante45/new-master
...
Update master from stable
2017-08-22 13:29:51 -07:00
Atlante45
697aed2fa2
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-08-22 12:58:38 -07:00
Chris Collins
8474bfb550
Merge pull request #11227 from highfidelity/RC-52
...
Beta Release 52 - Includes up to Developer Release 7030
2017-08-22 12:57:17 -07:00
Zach Fox
2a75d97006
First steps
2017-08-22 12:56:16 -07:00
Zach Fox
4d8980b538
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp
2017-08-22 12:30:24 -07:00
Zach Fox
763ce73306
Taking a break now
2017-08-22 12:26:46 -07:00
Zach Fox
a31088b60f
More progress
2017-08-22 12:16:17 -07:00
SamGondelman
b8a7fce201
boop
2017-08-22 11:54:55 -07:00
Zach Fox
f1da7a6381
Checkpoint
2017-08-22 11:53:37 -07:00
vladest
e403f7266a
Merge branch 'master' into audio_devices_split
2017-08-22 20:46:03 +02:00
Anthony J. Thibault
d62a0ea8ff
Correct controller offsets with sensor scaling
2017-08-22 11:43:39 -07:00
SamGondelman
a904ae1a8a
can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API
2017-08-22 11:41:20 -07:00
Stephen Birarda
9dfc74de57
always write rank ID to variant when present
2017-08-22 11:24:32 -07:00
vladest
b7a048c6ea
Adopt clonable settings to new styling
2017-08-22 11:23:55 -07:00
Anthony J. Thibault
ffdb10681e
Fix for laser rendering and positioning with sensor scale
2017-08-22 11:07:04 -07:00
Dante Ruiz
71bc20a899
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-22 11:06:30 -07:00
Dante Ruiz
cdd184e32d
intergradted teleport
2017-08-22 11:06:11 -07:00
Anthony J. Thibault
de2262968e
Fix for CAMERA_RELATIVE controllers with sensor scale
2017-08-22 09:44:32 -07:00
Chris Collins
8cab4435c9
Merge pull request #11224 from birarda/bug/group-clear
...
always write rank ID to variant when present
2017-08-22 09:08:59 -07:00
David Rowe
44778e791f
Fix entity creation position
2017-08-22 22:55:43 +12:00
David Rowe
f542c54e6c
Lay out Create palette entity items
2017-08-22 22:40:38 +12:00
David Rowe
5a4ebbd54d
Style Create palette header and panel
2017-08-22 21:59:31 +12:00
David Rowe
bb7e4fa302
Revise coordinate system
2017-08-22 16:02:24 +12:00
David Rowe
79056c385f
Fix options buttons not pressing
2017-08-22 14:57:17 +12:00
David Rowe
c953df0040
Fix "Finish" buttons not clearing tool properly
2017-08-22 14:35:56 +12:00
Anthony J. Thibault
cd6d2173cc
Bug fix for follow rotation of CharacterController
2017-08-21 18:09:58 -07:00
SamGondelman
3a80c6cbe2
fix alpha issues, pipeline issue, clamping issue
2017-08-21 18:09:25 -07:00
Anthony J. Thibault
8e56404c40
Fixes for flying and rotation re-centering in wikiplanet
2017-08-21 17:42:25 -07:00
Anthony J. Thibault
963ddce7bc
Use eye-height to match user and avatar scales, follow fixes
...
Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.
2017-08-21 17:42:24 -07:00
Anthony J. Thibault
80b660b258
Added userHeight accessors and preference
...
Also made Avatar::getHeight thread-safe
2017-08-21 17:42:23 -07:00
Anthony J. Thibault
d196743986
Added Avatar::getHeight() method
2017-08-21 17:42:22 -07:00
Anthony J. Thibault
a0d72f08ac
Fix for incorrectly scaled avatar collision on startup
2017-08-21 17:42:21 -07:00
Stephen Birarda
1eb7fb5b3d
always write rank ID to variant when present
2017-08-21 17:15:44 -07:00
Anthony J. Thibault
da20eac995
Bug fix for deadlock between EntitySimulation and EntityItem locks.
...
This is a classic deadlock between the main thread and the OctreeProcessor network thread.
On the main thread, the EntitySimulation lock is taken before the EntityItem read lock is taken.
On the network thread, the EntityItem write lock is taken before the EntitySimulation lock is taken.
To work around this issue the network thread no longer takes the EntitySimulation lock when calling
PhysicalEntitySimulation::addDynamic(). Instead, a fine grained lock around the EntitySimulation's dynamic lists
is used instead.
2017-08-21 17:14:49 -07:00
Dante Ruiz
f6151fae85
slowly intergrating teleport.js
2017-08-21 16:53:28 -07:00
Dante Ruiz
94dc942d79
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-21 16:34:10 -07:00
Chris Collins
72bb52c7ed
Merge pull request #11046 from rickdaniels/21448
...
Address bug #21448 "Correctly Size Bounding Boxes for Polylines"
2017-08-21 15:32:22 -07:00
Chris Collins
fcd3a8bd22
Merge pull request #11204 from EagleJumpDev/hifi_eaglejumpdev
...
Base requirements change : dev system must have at least 8GB of RAM.
2017-08-21 15:30:51 -07:00
Chris Collins
a85022bb93
Merge pull request #11216 from MidnightRift/emitterShouldTrail
...
Change emitShouldTrail to emitterShouldTrail.
2017-08-21 15:29:05 -07:00
Zach Fox
db16035f26
Parse balance correctly
2017-08-21 15:07:54 -07:00
