Liv
930243539c
add back first run to false and fix formatting
2017-09-05 17:50:25 -07:00
Liv
2f2b406047
Remove unneeded handcontrollertype code from handle first run checks
2017-08-30 09:23:33 -07:00
Liv
59deccaeb5
Remove unused skipTutorial code
2017-08-29 14:55:59 -07:00
Liv
59fe5ffdc1
Initial attempt at changing first run behavior
2017-08-25 17:48:35 -07:00
David Kelly
eb9436ba96
Merge pull request #11235 from davidkelly/dk/encryptFile
...
Initial wallet app plus some encryption of security image
2017-08-24 13:17:14 -07:00
David Kelly
a299aa7e24
initialize ptr!
2017-08-24 11:37:44 -07:00
David Kelly
698644c3b4
Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile
2017-08-24 10:37:58 -07:00
Zach Fox
3d0fd76997
Temp fix for inventory and buy
2017-08-24 10:24:06 -07:00
Sam Gateau
4a18c5c80e
Merge pull request #11214 from SamGondelman/image3DFix
...
Fix Image3DOverlays with fractional alpha
2017-08-24 09:04:02 -07:00
David Kelly
d398adc195
warnings
2017-08-24 08:48:26 -07:00
Brad Hefta-Gaub
5c832eae9c
Merge pull request #11226 from SamGondelman/miceWithLasers
...
EntityTreeRender uses RayPick API with precision picking
2017-08-24 08:10:21 -07:00
Chris Collins
93457c0e42
Merge pull request #11237 from birarda/feat/ip-check
...
add sender sock addr check to DS packet filter operator
2017-08-24 07:51:23 -07:00
Chris Collins
751440388a
Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix
...
Bug fix for deadlock between EntitySimulation and EntityItem locks.
2017-08-23 20:50:41 -07:00
David Kelly
c77dafdf12
fix warnings, prepare a bit for hooking up the passphrase
2017-08-23 17:43:37 -07:00
Stephen Birarda
133b7e66b7
adjust a comment and remove some debug
2017-08-23 16:38:23 -07:00
Stephen Birarda
c122b22dfc
add additional IP check to DS packet filter operator
2017-08-23 15:32:25 -07:00
David Kelly
57d973851e
accidentally left in I guess
2017-08-23 15:11:17 -07:00
Brad Hefta-Gaub
afce8b547a
Merge pull request #11197 from hyperlogic/bug-fix/prevent-rig-crash-in-lambda
...
Rig: Use a registry to prevent use after free crashes/corruption
2017-08-23 15:09:28 -07:00
David Kelly
138534c3ff
encrypt security image
2017-08-23 15:01:09 -07:00
David Kelly
f655bf2713
Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile
2017-08-23 14:53:05 -07:00
Zach Fox
e815946744
Merge pull request #11231 from ElderOrb/Case5830
...
5830: Go-To menu shows up blank except for address bar
2017-08-23 14:33:04 -07:00
beholder
9cd784990c
5830: Go-To menu shows up blank except for address bar
2017-08-23 23:27:02 +03:00
SamGondelman
206862a90f
fix flag bits
2017-08-23 12:20:30 -07:00
Zach Fox
a489267cec
Hide behind switch and remove dead code
2017-08-23 10:48:47 -07:00
druiz17
80eac56c4d
Merge pull request #11233 from jherico/threaded_overlay_edits
...
Allow asynchronous editing of non-QML overlays
2017-08-23 09:45:01 -07:00
SamGondelman
d7b3686364
include noncollidable entities
2017-08-22 17:37:51 -07:00
Brad Davis
0a5bef22fc
Allow asynchronous editing of non-QML overlays
2017-08-22 17:12:18 -07:00
Anthony Thibault
bb49bcdcfd
Merge pull request #11223 from ElderOrb/bigobj
...
fix for 'C1128: number of sections exceeded object file format limit'
2017-08-22 16:36:49 -07:00
David Kelly
591c031e7b
first pass still broken...
2017-08-22 16:24:25 -07:00
David Kelly
8bb7ea900a
Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile
2017-08-22 16:23:23 -07:00
David Kelly
0bd3f1728d
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile
2017-08-22 14:40:10 -07:00
beholder
a1e0f31cd8
fix for 'C1128: number of sections exceeded object file format limit'
2017-08-23 00:24:09 +03: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
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
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
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
SamGondelman
3a80c6cbe2
fix alpha issues, pipeline issue, clamping issue
2017-08-21 18:09:25 -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
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
