Roxanne Skelly
a7595496f6
CR fixes
2019-05-14 16:39:39 -07:00
Zach Fox
e3bec7ef2a
CR Round 1 - thanks Milad
2019-05-14 16:29:03 -07:00
Roxanne Skelly
fad7fa4c07
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
2019-05-14 16:25:10 -07:00
Roxanne Skelly
0ac597d76e
BUGZ-87 - loading/physics stuck when entering domain
...
A race condition was occurring when multiple entities using
the same models were handed over to physics around the same time.
The first model is passed to a worker thread to turn it into a shape
and subsequent models note they are the same and don't create a shape
or worker thread.
The physics system was ignoring these, never marking them as ready
for physics.
2019-05-14 16:14:44 -07:00
Simon Walton
e768beb9b1
Allow for delayed challenges if salt is empty
2019-05-14 15:53:35 -07:00
amerhifi
7ab9c482c2
trying an alternative method for jumping over linux for now
2019-05-14 15:50:12 -07:00
Brad Hefta-Gaub
7440ef3cf3
Merge pull request #15506 from SaracenOne/unify_primitives
...
Case 19510: Unify cube and sphere edit menu entries into one.
2019-05-14 15:31:06 -07:00
Zach Fox
f9b51df296
Reduce size of output muted overlay; restore scroll to 0 on settings tab switch
2019-05-14 15:05:26 -07:00
amerhifi
3975525b36
trying a different method since ubuntu is still seeing them as unused
2019-05-14 14:50:32 -07:00
Sabrina Shanman
fbe947c8ac
Merge pull request #15558 from AndrewMeadows/fix-crash-bugz178
...
BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model
2019-05-14 13:07:40 -07:00
amerhifi
549b1ec732
VS didn't save the comment addition
2019-05-14 13:04:25 -07:00
amerhifi
a12685c74b
hiding json keys from ubuntu so that we can build for now until Linux implementation is done
2019-05-14 13:01:15 -07:00
David Rowe
997dc963d3
Merge branch 'master' into M22147
2019-05-15 07:59:10 +12:00
David Rowe
d5bb7f25e1
Doc review
2019-05-15 07:56:55 +12:00
Zach Fox
f43c376a6a
Tweak top bar
2019-05-14 12:41:56 -07:00
Zach Fox
8724cf4edf
UIT TextField
2019-05-14 12:27:33 -07:00
amerhifi
346d8d5039
Merge branch 'feature/platform' of https://github.com/amerhifi/hifi into feature/platform
2019-05-14 12:09:03 -07:00
amerhifi
18fe18ee12
elseif typo
2019-05-14 12:07:59 -07:00
Zach Fox
2080aa6676
Some fun motion for experimentation
2019-05-14 11:56:07 -07:00
Zach Fox
cf46f3c9d4
CheckBox UIT and CheckBox added to Avatar app
2019-05-14 11:50:07 -07:00
Shannon Romano
ec11d70801
Merge pull request #15232 from highfidelity/robin-k-wilson-patch-1
...
Update BUILD_WIN.md
2019-05-14 10:55:10 -07:00
Shannon Romano
c677f71650
Merge pull request #15514 from zfox23/privateUserData
...
New Entity Property: Private User Data
2019-05-14 10:24:39 -07:00
Roxanne Skelly
68fb43ec7f
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
2019-05-14 10:11:02 -07:00
Andrew Meadows
5a257eb137
avoid crash for RenderableModelEntityItem with invalid model
2019-05-14 09:48:06 -07:00
amerhifi
fe6b2fceed
addressing comment in pr. removing extra space added in previous checkin
2019-05-14 09:39:44 -07:00
Zach Fox
c57ddf969a
Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI
2019-05-14 09:32:07 -07:00
amerhifi
a5f4664001
Merge branch 'master' into feature/platform
2019-05-14 09:27:15 -07:00
Shannon Romano
8597a51657
Merge pull request #15556 from jherico/fix/watchdog_spam
...
BUGZ-131: Additional silencing of watchdog spam
2019-05-14 08:10:02 -07:00
amerhifi
2a6dc53395
Merge branch 'master' into feature/platform
2019-05-14 06:18:37 -07:00
Howard Stearns
33f1bd965e
Merge pull request #15549 from SimonWalton-HiFi/call-reset-in-NodeList
...
Call correct NodeList::reset() from Application
2019-05-13 19:49:41 -07:00
Brad Davis
7d8e14f510
Additional silencing of watchdog spam
2019-05-13 18:19:29 -07:00
Andrew Meadows
0eea6d1988
Merge pull request #15554 from sethalves/cleanup-deleted-av-ents
...
case 123: delete children of deleted avatar-entity
2019-05-13 18:18:36 -07:00
amerhifi
dc139dc04d
added missing eof
2019-05-13 17:47:12 -07:00
amerhifi
830f3dc976
moved all hard coded json keys to platform::jsonkeys namespace and file
2019-05-13 17:45:57 -07:00
Brad Hefta-Gaub
e32979748b
Merge pull request #15552 from howard-stearns/longer-timeout-to-removeSilentNodes
...
Longer timeout to remove silent nodes
2019-05-13 17:40:48 -07:00
Seth Alves
8b2d12e2f7
when an avatar entity is deleted, also delete its descendants
2019-05-13 17:33:10 -07:00
Seth Alves
d630f90f4d
Merge pull request #15548 from SamGondelman/tests
...
BUGZ-173: Fix deadlock on startup
2019-05-13 17:32:32 -07:00
Zach Fox
89006cd9c5
Hide controls in top left; don't remove certain menus; fixup slider UIT
2019-05-13 17:26:19 -07:00
raveenajain
b85f36c1ef
fixes avatar collision, shape info and model bounding
2019-05-13 17:25:12 -07:00
Roxanne Skelly
aa16430cf4
add a comment and kick build servers
2019-05-13 17:25:06 -07:00
amerhifi
95e3eede5f
moved instance to own file. moved functions based on comments in pr
2019-05-13 17:07:25 -07:00
Howard Stearns
aeff5d93d8
try a longer timeout before we removeSilentNodes
2019-05-13 16:57:38 -07:00
amerhifi
804d171102
fixed a bunch of pr comments
2019-05-13 16:38:11 -07:00
Roxanne Skelly
4ad3163ca5
Disable event queue debugging for non-windows platforms.
2019-05-13 16:37:45 -07:00
jennaingersoll
4c6c0acc56
Merge pull request #15454 from ctrlaltdavid/M22246
...
Case 22246: Picks, PickType, RayPick JSDoc update
2019-05-13 16:16:17 -07:00
Shannon Romano
53b80ba404
Merge pull request #15550 from huffman/fix/gettransform-spam
...
BUGZ-89: Suppress getTransform spam
2019-05-13 16:13:46 -07:00
Zach Fox
2ce9e9ee10
The right way to restrict private user data:
2019-05-13 16:07:29 -07:00
Roxanne Skelly
0319e8cc4d
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
2019-05-13 16:01:39 -07:00
Zach Fox
7bb2d6871b
Simlpified Slider (not totally working; position is off)
2019-05-13 15:58:04 -07:00
Roxanne Skelly
72fe3a66f5
Debugging code to monitor the queue depth for a few critical threads
2019-05-13 15:56:55 -07:00
