Sam Gondelman
ecd936705b
typo
2018-11-28 09:54:20 -08:00
SamGondelman
b3abd97707
projected materials and repeat property
2018-11-09 10:47:07 -08:00
Zach Fox
b97fd6eb95
Merge pull request #14255 from zfox23/textToSpeech
...
Text to Speech App
2018-11-08 09:44:59 -08:00
Sam Gateau
4489efa58b
Merge pull request #14346 from AndrewMeadows/fix-crash-19654
...
Case 19654: fix crash in btCollisionWorld::updateSingleAabb()
2018-11-07 16:09:36 -08:00
Zach Fox
48d3450c5a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-07 14:59:23 -08:00
sam gateau
9ada9a7ad3
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-11-07 12:07:15 -08:00
Jeff Clinton
63bf077776
Merge pull request #14263 from ElderOrb/better_imports_for_controls_and_styles
...
Better imports for controls and styles
2018-11-07 11:19:55 -08:00
Sam Gateau
e28560a9c7
Merge pull request #14311 from SamGondelman/interstitial
...
Case 19682: Disable interstitial on android
2018-11-07 10:47:31 -08:00
Sam Gateau
d15c8a8854
Merge pull request #14313 from SamGondelman/macFix
...
Case 19686: Possibly fix mac debug deferred issue
2018-11-07 10:33:41 -08:00
Sam Gateau
8cda3f729b
Merge pull request #14316 from AndrewMeadows/workload-views-include-MyAvatar
...
Case 19394: always keep entities near MyAvatar in physics simulation
2018-11-07 10:26:47 -08:00
Sam Gateau
5d0be31fe7
Merge pull request #14354 from SamGondelman/deadlock
...
Case 19735: Fix ResourceCache mutex issues
2018-11-07 09:55:41 -08:00
SamGondelman
1444b3a186
resource mutex issues
...
(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
2018-11-06 11:57:57 -08:00
Zach Fox
53742e90f5
Cleanup after merge
2018-11-06 10:30:10 -08:00
Zach Fox
58dd690c0a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-06 10:29:05 -08:00
Alexander Ivash
27bb8a0de7
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
Howard Stearns
a99facb793
Merge pull request #14261 from howard-stearns/oculus-store-commerce
...
Oculus store commerce
2018-11-05 16:13:04 -08:00
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model
...
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
2018-11-05 15:00:06 -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
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
Zach Fox
402c23e359
Use useragent instead of queryparam to determine limitedCommerce
2018-11-02 16:07:29 -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
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
Zach Fox
b43ad15fa7
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-01 11:32: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
Andrew Meadows
317f4d28ba
always keep a workload view around MyAvatar
2018-10-31 15:42:24 -07:00
sabrina-shanman
0b7ddca5f6
Change naming for straggler names in model loading debug dumps
2018-10-31 14:03:20 -07:00
Stephen Birarda
41ec026f8d
cleanup packet times, avoid ambiguous RTT calcs, allow fast re-transmit
2018-10-31 13:32:27 -07:00
SamGondelman
c4c4d2c98d
possibly fix mac issues
2018-10-31 13:28:07 -07:00
SamGondelman
8633dc0f66
disable interstitial on android
2018-10-31 12:34:20 -07:00
sabrina-shanman
becee7f010
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-10-30 17:28:42 -07:00
sam gateau
592c2b267d
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-10-30 15:07:20 -07:00
SamGondelman
e64a4d0536
try to fix unnecessary queryAACube updates
2018-10-30 12:47:44 -07:00
SamGondelman
df005eedbf
fix shape not getting marked changed
2018-10-29 17:43:16 -07:00
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix
...
Fix avatars remain stuck in place for other users intermittently
2018-10-29 15:03:43 -07:00
luiscuenca
056fe338e1
Apply transit logic if avatar instance is client side
2018-10-27 07:15:31 -07:00
luiscuenca
767f4e9d6d
Return server position
2018-10-26 17:16:43 -07:00
luiscuenca
62e4b3fead
Avatar mixer gets the updated position
2018-10-26 16:02:17 -07:00
Sam Gateau
439452f9ee
Merge pull request #14123 from jherico/fix/mac_gl2
...
Additional Mac OpenGL work
2018-10-26 15:38:23 -07:00
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props
...
keep userData and new grab properties in sync
2018-10-26 11:52:47 -07:00
Brad Davis
a3a952265a
Fix android crash
2018-10-26 11:23:30 -07:00
Brad Davis
7ca8b54039
Fix crash on startup on windows / android
2018-10-26 11:23:30 -07:00
