Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
sabrina-shanman
30eb360f62
Convert remaining HFMModels called model to hfmModel, and rename some missed local variables
2018-11-05 12:07:17 -08:00
Andrew Meadows
228847b507
only look in _activeStaticBodies when body is static
2018-11-05 11:44:58 -08:00
Andrew Meadows
9e7b68fead
find and remove dangling pointers from _activeStaticBodies on remove
2018-11-05 11:19:15 -08:00
Andrew Meadows
c6cde2d412
don't assign null Shape to RigidBody already in physics simulation
2018-11-05 11:19:15 -08:00
Zach Fox
a4d36b3845
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-05 10:25:58 -08:00
howard-stearns
7115f0e688
update notification refs inventory, not assets
2018-11-04 12:17:41 -08:00
howard-stearns
4f713b038e
Merge branch 'oculus-store-commerce' into tabless
2018-11-04 12:17:21 -08:00
howard-stearns
8906b909eb
close wallet app during login so that it doesn't tell to login after
...
login
2018-11-04 12:08:29 -08:00
howard-stearns
100a17a2b9
remove wallet reference in update notification
2018-11-04 11:25:40 -08:00
howard-stearns
8ad8398ef3
remove 'purchase' from login notice.
2018-11-04 11:17:56 -08:00
howard-stearns
ae51b95ca1
fix bad tab reference
2018-11-04 11:15:46 -08:00
Seth Alves
a94fd2a1c9
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
2018-11-03 13:14:08 -07:00
Anthony Thibault
dc43d1bf8f
AnimDebugDraw: Prevent multi-threaded access to shared map collection.
...
It was possible for the render thread to iterate over a map while the main thread mutates the same map.
This could have led to memory corruption and crashes.
To fix this we make a copy of the collection and pass the copy to the lambda that executes on the render thread.
2018-11-02 17:53:07 -07:00
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm
...
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-02 16:44:31 -07:00
Zach Fox
d0854ca2ab
Use AccountManager instead of settings
2018-11-02 16:42:18 -07:00
Howard Stearns
be17ed0910
Merge pull request #14327 from roxanneskelly/gift-update
...
Case 18794 - updates were being reported as gifts in the wallet
2018-11-02 16:42:03 -07:00
Chang Xing
67252467d8
Merge pull request #14317 from zfox23/moveSecuritySettings
...
Move Wallet Security tab to new dialog; fixup Login dialog
2018-11-02 16:29:05 -07:00
Ryan Huffman
c22df4dd94
Fix horizontal and vertical props in entity properties being swapped
2018-11-02 16:22:10 -07:00
Zach Fox
402c23e359
Use useragent instead of queryparam to determine limitedCommerce
2018-11-02 16:07:29 -07:00
Simon Walton
26b9e2e162
Fix a URL while we're in the file
2018-11-02 14:47:40 -07:00
Ken Cooke
77988e400e
Merge pull request #14247 from sethalves/dont-let-checkdevices-swap-pool
...
don't let checkDevices swamp thread pool
2018-11-02 14:25:39 -07:00
Dante Ruiz
b33934ec46
fixing Image3DOverlay scaling
2018-11-02 14:24:14 -07:00
Simon Walton
e64557a46c
Clamp the fixed-point network values to their limits
2018-11-02 11:52:40 -07:00
Cristian Luis Duarte
c310d41af7
Change GPU_RESOURCE_BUFFER_SLOT1_TEXTURE to 36
2018-11-02 14:59:30 -03:00
Cristian Luis Duarte
bcda6a7005
Revert headerFlag change to -h
2018-11-02 14:03:39 -03:00
Zach Fox
2b50c40224
Minor changes found by Chang
2018-11-02 09:33:06 -07:00
Zach Fox
917fc4ad58
Update language
2018-11-02 09:23:31 -07:00
Sam Gateau
fa0c58fa0e
Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend
2018-11-02 00:08:47 -07:00
Roxanne Skelly
9ca862ad6b
Case 19373 - Lowering volume on another user in PAL mutes them
2018-11-01 17:25:41 -07:00
sabrina-shanman
cbca77b12f
Rename HFMGeometry to HFMModel and adjust related variables
2018-11-01 17:17:48 -07:00
sam gateau
e5a96f265d
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-11-01 16:57:13 -07:00
Zach Fox
20cd1df22c
Lotsa changes
2018-11-01 16:48:08 -07:00
Roxanne Skelly
1f8dde6756
Transaction string was assuming items given to the
...
marketplace/highfidelity were Gifts and was reporting them as such.
Items given to the marketplace are in exchange for updates, and the memo
indicates such.
2018-11-01 15:44:11 -07:00
Howard Stearns
8256bfbc55
icons
2018-11-01 15:20:50 -07:00
Zach Fox
bccb3f1de9
Prepare for further work
2018-11-01 14:53:10 -07:00
Ryan Huffman
4593b33435
Fix new models not obeying dynamic checkbox
2018-11-01 14:38:55 -07:00
Zach Fox
0a15e94fe4
New colors
2018-11-01 13:27:31 -07:00
Zach Fox
581a19b13e
Merge branch 'master' of github.com:highfidelity/hifi into moveSecuritySettings
2018-11-01 13:15:54 -07:00
Zach Fox
d6477993a1
Make it work better with the tablet
2018-11-01 13:08:00 -07:00
Ryan Huffman
01b29185ca
Update the default edit.js collidesWith to include myAvatar
2018-11-01 12:04:20 -07:00
Howard Stearns
3e2d6c341b
placeholder svgs
2018-11-01 11:45:25 -07:00
Zach Fox
b43ad15fa7
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-01 11:32:38 -07:00
Howard Stearns
8f2f27f468
Merge branch 'oculus-store-commerce' into tabless
2018-11-01 11:22:28 -07:00
Zach Fox
4a56f769e5
Re-add some code I shouldn't have removed
2018-11-01 11:04:59 -07:00
Zach Fox
6e470d5c1c
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-11-01 10:30:01 -07:00
Zach Fox
d481f081bb
Fix four bugs; truncate some logs
2018-11-01 10:29:38 -07:00
Anthony Thibault
5c78a463de
Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix
...
Extra joints on soft entities keep their local transform
2018-11-01 09:29:16 -07:00
Andrew Meadows
cfec94f3ff
larger threshold btw 1 vs 2 workload views for 3rd person
2018-11-01 09:28:31 -07:00
