Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 02:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64719 commits 25 branches 0 tags 1.1 GiB
Commit graph

64719 commits

This branch
This branch
All branches
Author SHA1 Message Date
howard-stearns
3d0e3a3901 Merge branch 'master' of https://github.com/highfidelity/hifi into end-seeding 2018-02-24 13:34:00 -08:00
Seth Alves
9e156deaab
Merge pull request #12494 from druiz17/one-menu 
Remove the avatarEntitiesBookmark menu option
 2018-02-23 19:02:25 -08:00
Brad Hefta-Gaub
3d54f4d246
Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog 
Relax deadlock watchdog
 2018-02-23 17:09:30 -08:00
howard-stearns
726c1ed816 receiveAt with new key 2018-02-23 17:05:46 -08:00
howard-stearns
8f44a52140 Merge branch 'end-seeding' of github.com:howard-stearns/hifi into end-seeding 2018-02-23 16:37:00 -08:00
Zach Fox
fe515e949b New UI for new HFC users 2018-02-23 16:36:20 -08:00
howard-stearns
29a2fa6ca5 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-23 16:19:54 -08:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete 
Fix EntityItems not getting destroyed
 2018-02-23 16:17:52 -08:00
Zach Fox
cc98eb6424 Fix lightbox stuck 2018-02-23 16:14:42 -08:00
howard-stearns
f66e688f41 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-23 16:12:41 -08:00
howard-stearns
53614a1d9f almost working 2018-02-23 16:12:01 -08:00
Zach Fox
47b25740de Update commerceLightBox 2018-02-23 15:23:51 -08:00
howard-stearns
34253082d4 always reset when asked 2018-02-23 15:11:08 -08:00
Zach Fox
432e647f7a Fix 'What's This' link 2018-02-23 15:08:33 -08:00
howard-stearns
3c2626894c fixes 2018-02-23 14:54:03 -08:00
howard-stearns
050df2ac2a merge 2018-02-23 14:46:13 -08:00
Zach Fox
9b54ab1080 UI changes, V1 2018-02-23 14:42:05 -08:00
howard-stearns
09091d29f7 more logic framework 2018-02-23 14:35:30 -08:00
howard-stearns
84f9bff330 basic element, but not pretty and not functioning 2018-02-23 13:56:56 -08:00
Dante Ruiz
d0ec84b6c8 remove menu option for booking marking avatar entities 2018-02-23 10:45:59 -08:00
Dante Ruiz
d3be1a8a23 Merge branch 'master' of github.com:highfidelity/hifi 2018-02-23 09:20:03 -08:00
ZappoMan
9f68accb30 add menu for testing unresponsive interface 2018-02-22 17:34:00 -08:00
howard-stearns
1aaae94cc1 checkpoint 2018-02-22 17:04:27 -08:00
John Conklin II
730dce31e3
Merge pull request #12444 from zfox23/commerce_extendedCerts_1 
Commerce: Extended Certificate Support, V1
 2018-02-22 15:19:57 -08:00
Stephen Birarda
fc9af39745
Merge pull request #12451 from SimonWalton-HiFi/moc-fixes 
Add #include of Forward.h to AudioMixer.h
 2018-02-22 16:09:24 -07:00
ZappoMan
e9cad947d7 add the deadlock watchdog stats to the stats metaverse checkin data 2018-02-22 14:01:56 -08:00
Simon Walton
a0a12258bf Merge branch 'master' into moc-fixes 2018-02-22 11:06:53 -08:00
Zach Fox
3d4e6de6ab Quick bugfix 2018-02-22 10:49:11 -08:00
ZappoMan
af4f51ecfb Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog 2018-02-22 10:23:36 -08:00
Liv
478ec48b63
Merge pull request #12463 from misslivirose/fix/edit-bugs 
Fix two bugs with Create Menu
 2018-02-22 09:43:50 -08:00
Zach Fox
90f05f4db7 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-22 09:23:49 -08:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742 
Handle tablet entities and overlays not being available
 2018-02-22 08:48:13 -08:00
ZappoMan
aa5542c54b Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog 2018-02-22 08:43:13 -08:00
John Conklin II
37645022f6
Merge pull request #12344 from ctrlaltdavid/21739 
Recording app fixes
 2018-02-21 17:03:54 -08:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
Liv Erickson
aba1cae36d get rid of magic number 2018-02-21 16:19:50 -08:00
tapalisa
1f958c247f
Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final 
[Case 4315] Fixes ColorPicker Color Preview functionality
 2018-02-21 16:09:47 -08:00
SamGondelman
4b1217f1f6 move all entity items to main thread 2018-02-21 15:54:07 -08:00
Liv Erickson
990e848de6 fix typo that was breaking popup dialog 2018-02-21 15:54:00 -08:00
Liv Erickson
68f0c0391a Initial fix - need a little style fixing 2018-02-21 15:44:23 -08:00
David Rowe
fa1f2267cf Support RC63 2018-02-22 10:06:00 +13:00
Sam Gateau
0af8507ce2
Merge pull request #12453 from SamGondelman/materialUI 
Fix new material UI indentation
 2018-02-21 12:14:32 -08:00
Zach Fox
74655bde49 Fix skeletonmodelURLchanged signal 2018-02-21 12:12:20 -08:00
Zach Fox
b548567f5a Apps protection 2018-02-21 11:17:47 -08:00
Simon Walton
619901caa0 Move up main #include for other AudioMixer* 
Having #include first will make more robust for MOC compile problems.
Also fixes previous commit to use <> form and correct case.
See Case 12527.
 2018-02-21 11:12:09 -08:00
Zach Fox
1fbc16aae2 Fix noPermissionGlyph margin 2018-02-21 10:52:17 -08:00
SamGondelman
4dde178b93 fix new material UI 2018-02-21 10:33:15 -08:00
ZappoMan
47a98d9d0f relax the deadlock time to 2 minutes 2018-02-21 10:12:04 -08:00
John Conklin II
9ba1532c26
Merge pull request #12446 from sethalves/more-logging-for-fb-11748 
more logging for fogbugz 11748
 2018-02-21 09:49:51 -08:00
Simon Walton
16ffcc7fe2 Add #include of Forward.h to AudioMixer.h 
This makes the compile by Qt MOC less dependent on order of processing.
See Manuscript case 12527.
 2018-02-21 09:48:15 -08:00