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 |
|
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 |
|
Simon Walton
|
305a215d21
|
Pass a QObject context for the functor
|
2019-05-13 15:50:04 -07:00 |
|
Shannon Romano
|
72d000a76d
|
Merge pull request #15521 from ctrlaltdavid/M22489
Case 22489: Scene JSDoc
|
2019-05-13 15:49:44 -07:00 |
|
amerhifi
|
9652d412ac
|
Merge branch 'master' into feature/platform
|
2019-05-13 15:39:55 -07:00 |
|
David Rowe
|
70ec84177a
|
Doc review
|
2019-05-14 10:32:28 +12:00 |
|
jennaingersoll
|
712167c623
|
Merge pull request #15476 from ctrlaltdavid/M22407
Case 22407: Quat JSDoc update
|
2019-05-13 15:17:58 -07:00 |
|
Ryan Huffman
|
2e2d0add93
|
BUGZ-89: Suppress getTransform spam
|
2019-05-13 14:50:46 -07:00 |
|
Simon Walton
|
ede8859cc7
|
Call correct NodeList::reset() from Application
|
2019-05-13 14:38:34 -07:00 |
|
Howard Stearns
|
ee1231362c
|
Merge branch 'tests' of git://github.com/SamGondelman/hifi into SamGondelman-tests
|
2019-05-13 14:26:15 -07:00 |
|
SamGondelman
|
652ac17dac
|
fix deadlock on startup
|
2019-05-13 14:17:55 -07:00 |
|
Zach Fox
|
e87381f431
|
Merge branch 'master' of github.com:highfidelity/hifi into privateUserData
|
2019-05-13 14:13:34 -07:00 |
|
Zach Fox
|
55138ed088
|
CR feedback
|
2019-05-13 14:12:51 -07:00 |
|
Brad Hefta-Gaub
|
51f2d1748e
|
Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state
(BUGZ-40) Check for possible avatar fade race condition
|
2019-05-13 13:41:09 -07:00 |
|
Shannon Romano
|
32d3014d0d
|
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2
case 22190: Disable triggering away state when interface focus lost
|
2019-05-13 13:22:28 -07:00 |
|
Shannon Romano
|
8aee64c102
|
Merge pull request #15540 from jherico/fix/gl_crash
BUGZ-125: Error message instead of crash if the GL version is too low
|
2019-05-13 13:12:30 -07:00 |
|
Shannon Romano
|
46d75a61b3
|
Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change
Clear any reliable connection state upon Node ID change
|
2019-05-13 13:11:05 -07:00 |
|
Shannon Romano
|
d37beec6d2
|
Merge pull request #15535 from Atlante45/fix/warnings
Fix mac build warnings
|
2019-05-13 13:09:59 -07:00 |
|
Shannon Romano
|
b1060bcb83
|
Merge pull request #15508 from dback2/materialTargetTooltip
Case 22467: Fix material target tooltip
|
2019-05-13 13:08:28 -07:00 |
|
Shannon Romano
|
12bb073d14
|
Merge pull request #15485 from sabrina-shanman/crash_hfm_normals
(case 22026) Fix crash due to invalid indices in baker::calculateNormals
|
2019-05-13 13:06:01 -07:00 |
|
Zach Fox
|
f799f96fba
|
simplifiedUI UIT switch
|
2019-05-13 13:04:12 -07:00 |
|
amerhifi
|
270d7feb7f
|
removed the duplicate function declaration
|
2019-05-13 12:20:22 -07:00 |
|
amerhifi
|
8623c3d74f
|
removing testing function declared in app.h
|
2019-05-13 12:14:48 -07:00 |
|
amerhifi
|
71d534c97d
|
merged master and resolved application conflict
|
2019-05-13 12:09:50 -07:00 |
|
amerhifi
|
8759f028f8
|
fixing Linux warnings
|
2019-05-13 11:41:30 -07:00 |
|
Sam Gondelman
|
4c4589271c
|
Merge pull request #15469 from SamGondelman/switch
Case 22379: Run-time switch for deferred/forward rendering
|
2019-05-13 11:14:26 -07:00 |
|
Saracen
|
9aadea81b3
|
Fix to use correct texcoord2 array.
|
2019-05-13 19:13:24 +01:00 |
|
Zach Fox
|
feb5021372
|
UIT RadioButton
|
2019-05-13 11:07:39 -07:00 |
|