Seth Alves
b5919d89a5
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-15 08:26:10 -08:00
Brad Hefta-Gaub
eaea718de1
add various scriping interfaces for managing the audio scope and detecting noise gate transitions
2017-03-10 17:08:19 -08:00
Dante Ruiz
2cd194104f
force on to home screen
2017-03-10 20:46:01 +00:00
Seth Alves
2068b93ccc
Merge pull request #9817 from druiz17/goto-home-bug
...
cant call gotohomescreen when tablet is closed
2017-03-10 10:17:23 -08:00
Dante Ruiz
e9086460e3
changed function names
2017-03-08 18:14:32 +00:00
Dante Ruiz
6acf2340a2
better way to determine if we can go to the homescreen
2017-03-08 17:42:24 +00:00
Seth Alves
509ce3f2d2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-07 18:41:36 -08:00
Dante Ruiz
656720ae36
Merge branch 'master' of github.com:highfidelity/hifi into goto-home-bug
2017-03-07 22:22:46 +00:00
Ryan Huffman
a744e0d11c
Merge pull request #9685 from humbletim/21114-part2
...
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
2017-03-07 13:25:25 -08:00
Dante Ruiz
5156564f04
cant call gotohomescreen when tablet is closed
2017-03-07 00:53:36 +00:00
Seth Alves
08e2e421e4
Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js
2017-03-06 11:08:27 -08:00
Seth Alves
93246b24b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-06 08:54:49 -08:00
Anthony J. Thibault
45febe8565
Merge branch 'master' into feature/fingers-on-tablet
2017-03-03 09:04:43 -08:00
Seth Alves
cf37845f9e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-02 10:06:38 -08:00
Dante Ruiz
58c1a2fb99
Merge branch 'master' into menuFix
2017-03-02 00:55:18 +00:00
Anthony J. Thibault
01abb4bdb6
Exposed DebugDraw interface to Java Script
2017-03-01 13:14:29 -08:00
Dante Ruiz
e2479a78bd
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-03-01 16:04:12 +00:00
David Kelly
c10b0389de
Add a getAvatarGain method to NodeList and UsersScriptingInterface
2017-02-28 14:45:34 -07:00
Dante Ruiz
f0f2b8c4da
fix comboBox and PushOntoStack
2017-02-28 21:30:25 +00:00
humbletim
2505a89b5e
Per CR feedback bump to strong ref
2017-02-28 00:41:35 -05:00
humbletim
654c72fb7e
Add weakRef guard to detect ScriptEngine deletion during ScriptCache::getScriptContents
2017-02-27 22:58:59 -05:00
humbletim
5b11c0e00a
remove unused consts
2017-02-24 20:45:12 -05:00
Dante Ruiz
73c337efd0
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-25 00:42:22 +00:00
Dante Ruiz
835b23832f
some modal clean up
2017-02-25 00:40:38 +00:00
humbletim
731c01985b
switch from autos
2017-02-24 19:21:17 -05:00
humbletim
cdbb13ecff
Log cleanup
2017-02-24 17:40:06 -05:00
Seth Alves
fcd3c09404
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay
2017-02-24 14:27:30 -08:00
humbletim
3ac116545e
* Switch trigger for deferred loads from timer to using leading entity completion
...
* Bring back notion of tracking "bad scripts" to fail stampeding entities as a set
* Update stampede JS tests to highlight/troubleshoot preexisting unload issue
2017-02-24 16:05:11 -05:00
Howard Stearns
a9b8045697
Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance
...
Filter pal by view distance
2017-02-24 11:10:13 -08:00
humbletim
c89d203f94
Adapt from std::map locks to simple QHash for flagging busy scriptURLs
2017-02-24 12:27:33 -05:00
Dante Ruiz
89f5e5112f
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-24 15:25:32 +00:00
Seth Alves
610c20e01a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-23 17:41:38 -08:00
humbletim
3ad3fd472e
* Inline / duplicate exception checking per CR feedback
...
* Coding standards
2017-02-23 19:46:28 -05:00
humbletim
1eeb25a9eb
Increase deferred batch processing.
2017-02-23 19:09:27 -05:00
humbletim
f82a0196a8
Always consume exceptions thrown by include's
2017-02-23 18:12:12 -05:00
Brad Hefta-Gaub
1b7ec7d61e
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
...
Conflicts:
libraries/avatars/src/AvatarData.cpp
2017-02-23 13:50:16 -08:00
kunalgosar
99e51e88ae
Add QMetaObject for AvatarEntityMap
2017-02-23 10:57:06 -08:00
Howard Stearns
cddba43837
Merge branch 'master' into filter-pal-by-view-distance
2017-02-23 08:25:16 -08:00
Dante Ruiz
63a78a73db
Merge branch 'master' into menuFix
2017-02-23 15:45:30 +00:00
Chris Collins
b295a146e0
Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight
...
More consistent highlights/toggle for toolbar buttons
2017-02-22 18:07:38 -08:00
humbletim
132a889f74
* Add Qt::DirectConnection to signalHandlerException
...
* CR feedback / coding standards
2017-02-22 20:36:49 -05:00
Dante Ruiz
3ba605bf23
saving work
2017-02-23 00:28:30 +00:00
humbletim
417587dcda
* Update per CR feedback / code standards
...
* Cull log spam
* Add tryLock to deferred processor to preempt unnecessary loadEntityContent round-trips
2017-02-22 15:22:56 -05:00
Brad Hefta-Gaub
618f37eb06
fix crash in recording playback when clip loader fails
2017-02-22 11:14:22 -08:00
Anthony J. Thibault
71b569a697
Bug-fix for crash on tablet when going from web -> home.
2017-02-22 10:22:12 -08:00
howard-stearns
2b9c69926b
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 15:42:00 -08:00
howard-stearns
aff44d682e
Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance
2017-02-21 13:45:25 -08:00
howard-stearns
15d8041683
snapshot working, before button change
2017-02-21 13:14:45 -08:00
Seth Alves
43f47c1106
merge from upstream
2017-02-20 12:45:39 -08:00
Seth Alves
4a650ff2bb
Overlays::getOverlayAtPoint was depending on the order in which the overlays were added
2017-02-19 18:37:35 -08:00
