Sam Gondelman
|
04ecdb463f
|
Merge pull request #15173 from SamGondelman/audio
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
|
2019-03-21 18:03:58 -07:00 |
|
r3tk0n
|
108e8b9994
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-03-21 15:17:56 -07:00 |
|
r3tk0n
|
543d53ecde
|
Add ability to toggle strafing.
|
2019-03-21 13:12:15 -07:00 |
|
Shannon Romano
|
b82c808562
|
Merge pull request #15207 from danteruiz/kick-ui
Case 21771: Possible Entity Scipt Ban Incident
|
2019-03-21 13:10:54 -07:00 |
|
Shannon Romano
|
a6d4f98ee7
|
Merge pull request #15204 from roxanneskelly/Case21025
Case 21025 conditionalizing TabletWebView features
|
2019-03-20 14:21:37 -07:00 |
|
danteruiz
|
2ab8eb98e8
|
better implementation
|
2019-03-17 14:00:41 -07:00 |
|
SamGondelman
|
d4e1ec9741
|
fix emitScriptEvent
|
2019-03-15 16:20:01 -07:00 |
|
SamGondelman
|
83bac723ef
|
fix wearable duplication on domain switch
|
2019-03-15 13:38:25 -07:00 |
|
Roxanne Skelly
|
9182db8bd4
|
Case 21025 conditionalizing TabletWebView features
|
2019-03-15 12:56:43 -07:00 |
|
SamGondelman
|
609c4ab52e
|
try to fix audio injector threading issues
|
2019-03-12 18:41:43 -07:00 |
|
r3tk0n
|
39342b9771
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-03-11 16:27:05 -07:00 |
|
Wayne Chen
|
07ddd4e1dd
|
moving key press detection to JSON
|
2019-03-11 14:27:47 -07:00 |
|
Wayne Chen
|
7b51061b5f
|
fixing initialization in switch statement
|
2019-03-10 19:46:01 -07:00 |
|
Wayne Chen
|
20487b2ad1
|
connecting pushingToTalkChanged with handlePushedToTalk
|
2019-03-10 19:39:45 -07:00 |
|
Wayne Chen
|
48d1ec850c
|
removing debug statement
|
2019-03-08 16:07:48 -08:00 |
|
Wayne Chen
|
18b86d550d
|
adding PushToTalk action
|
2019-03-08 16:07:48 -08:00 |
|
r3tk0n
|
15d49fd9a9
|
Initial implementation (deadlocks still occurring in Audio.cpp)
|
2019-03-08 16:02:14 -08:00 |
|
Shannon Romano
|
a8f6e74ca4
|
Merge pull request #15135 from SamGondelman/text81
Case 21628: Fix text rendering on AMD/Mac
|
2019-03-08 14:59:37 -08:00 |
|
Roxanne Skelly
|
c33d2aafda
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-03-08 11:41:34 -08:00 |
|
Roxanne Skelly
|
750dbfae21
|
Stand-alone Tags: Throw up popup for first unoptimized domain
Throw up a popup in stand-alone builds when user attempts to go to
an unoptimized domain.
|
2019-03-08 10:48:42 -08:00 |
|
SamGondelman
|
af03fb5f85
|
try to fix text rendering on amd with transparency
|
2019-03-07 16:23:12 -08:00 |
|
Shannon Romano
|
76958ffda2
|
Merge pull request #15102 from danteruiz/keyboard-for-web-entities
Case 21144: Can't enter text in a Web Entity with the new keyboard
|
2019-03-07 15:46:31 -08:00 |
|
Roxanne Skelly
|
b38fc65372
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-03-07 10:06:05 -08:00 |
|
Shannon Romano
|
4f3d593d90
|
Merge pull request #15072 from SamGondelman/clear
Case 11775: Don't clear my avatar entities on domain switch
|
2019-03-05 15:42:51 -08:00 |
|
danteruiz
|
e6a63a9a69
|
add keyboard for html content
|
2019-03-05 14:24:38 -08:00 |
|
SamGondelman
|
f2c248c0a2
|
disable href and entity script events when in edit mode
|
2019-03-04 17:10:20 -08:00 |
|
SamGondelman
|
12f5a735d9
|
simplifying mouse events and fix mouse on create
|
2019-03-04 14:50:09 -08:00 |
|
Shannon Romano
|
d56b460d11
|
Merge pull request #15030 from wayne-chen/clockOnTablet
Case 21456, Case 21463: Clock On Tablet (81.0/master)
|
2019-03-04 10:45:34 -08:00 |
|
Sam Gateau
|
cc9a3e2541
|
Merge pull request #15052 from amerhifi/quest-demo
case 21485: removing quest-demo specific changes
|
2019-03-01 15:03:44 -08:00 |
|
SamGondelman
|
3e6061e435
|
try to not clear my avatar entities on domain switch
|
2019-03-01 13:45:00 -08:00 |
|
Shannon Romano
|
20d65ab183
|
Merge pull request #15064 from danteruiz/another-login-fix
Case 21451: HMD Login Encouragement Screen is not Usable
|
2019-03-01 12:57:17 -08:00 |
|
amer cerkic
|
6ebc57994b
|
Merge branch 'master' into quest-demo
|
2019-03-01 10:23:41 -08:00 |
|
Shannon Romano
|
d68f82eb7d
|
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities
Case 21494: Avoid mem leaked entities
|
2019-03-01 09:34:20 -08:00 |
|
danteruiz
|
7bcf727a83
|
review changes
|
2019-02-28 18:11:51 -08:00 |
|
danteruiz
|
9fe0309ae6
|
another login fix
|
2019-02-28 17:11:48 -08:00 |
|
Andrew Meadows
|
7d9efe4c09
|
avoid mem-leak for serverless domains
|
2019-02-28 14:20:11 -08:00 |
|
amerhifi
|
35dc13e06a
|
Merge branch 'master' into quest-demo
|
2019-02-28 14:06:47 -08:00 |
|
SamGondelman
|
15064f0097
|
fix lasers and keyboard on reload
|
2019-02-28 14:04:22 -08:00 |
|
amer cerkic
|
faedc61c37
|
removing quest-demo specific changes
|
2019-02-28 10:54:30 -08:00 |
|
amer cerkic
|
a425becc8a
|
clean up of debugging
|
2019-02-27 15:35:33 -08:00 |
|
amer cerkic
|
92cfa49bfb
|
adding and testing command line parameter passing to application
|
2019-02-27 11:42:22 -08:00 |
|
danteruiz
|
2fd94c6bbc
|
fixing login dialog
|
2019-02-27 10:08:38 -08:00 |
|
Wayne Chen
|
650b34c463
|
adding clock
|
2019-02-25 18:00:56 -08:00 |
|
r3tk0n
|
5d3a778b0b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation
|
2019-02-25 13:10:47 -08:00 |
|
Roxanne Skelly
|
0636579822
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-22 15:43:42 -08:00 |
|
Dante Ruiz
|
eedd54d0b1
|
Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo
|
2019-02-22 15:02:01 -08:00 |
|
Dante Ruiz
|
a87e49bb23
|
start in quest dev
|
2019-02-22 15:01:30 -08:00 |
|
amer cerkic
|
9c833f7e64
|
clean up
|
2019-02-22 09:21:51 -08:00 |
|
amer cerkic
|
f04fdb2187
|
added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user
|
2019-02-22 09:11:24 -08:00 |
|
amer cerkic
|
9097d9c57c
|
working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing.
|
2019-02-21 16:33:25 -08:00 |
|
SamGondelman
|
4fdf556d5d
|
fix billboard mode in secondary camera
|
2019-02-21 10:29:21 -08:00 |
|
Roxanne Skelly
|
8c058f147e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-20 14:24:47 -08:00 |
|
Brad Davis
|
79369a0c83
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-20 10:40:49 -08:00 |
|
Brad Davis
|
122a246d2d
|
Fix typo
|
2019-02-19 17:30:47 -08:00 |
|
Brad Davis
|
518e480a8b
|
Fix plugin activation
|
2019-02-19 17:00:50 -08:00 |
|
SamGondelman
|
6765268998
|
Merge remote-tracking branch 'upstream/master' into wearables
|
2019-02-19 16:52:00 -08:00 |
|
Brad Davis
|
d60dcb99d2
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-19 12:37:30 -08:00 |
|
Roxanne Skelly
|
d957b38f10
|
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
|
2019-02-19 12:34:10 -08:00 |
|
r3tk0n
|
ebbf48a11b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
|
2019-02-19 12:02:50 -08:00 |
|
John Conklin II
|
d7a5c0bb4f
|
Merge pull request #14947 from SamGondelman/overlayClick
Case 21291, Case 21292, Case 21293: Working on overlay bugs
|
2019-02-19 11:01:19 -08:00 |
|
John Conklin II
|
1348baecc7
|
Merge pull request #14935 from SamGondelman/matEntity
Case 20920: Move Material Entity logic to render thread
|
2019-02-19 10:59:51 -08:00 |
|
SamGondelman
|
06ac2b291b
|
attachments and wearables cull with avatar parent
|
2019-02-17 17:52:10 -08:00 |
|
SamGondelman
|
71653f95d7
|
working on overlay bugs
|
2019-02-16 20:08:36 -08:00 |
|
SamGondelman
|
3df231f1e0
|
it's working!
|
2019-02-15 14:43:22 -08:00 |
|
Brad Davis
|
4409e59682
|
Add per-android-app preprocessor macros
|
2019-02-15 14:11:26 -08:00 |
|
John Conklin II
|
b9356e22d8
|
Merge pull request #14927 from huffman/fix/hide-asset-browser
Case 16349: Fix asset browser being hidden in incorrect way on server switch
|
2019-02-15 13:32:27 -08:00 |
|
SamGondelman
|
c92b82e744
|
merge with master
|
2019-02-15 12:43:30 -08:00 |
|
SamGondelman
|
87ab255115
|
finish moving materials to rendering
|
2019-02-15 11:49:20 -08:00 |
|
Brad Davis
|
a5f84ab51a
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 11:37:13 -08:00 |
|
Sam Gondelman
|
9aa99f24f0
|
Merge pull request #14905 from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
|
2019-02-15 11:21:51 -08:00 |
|
Roxanne Skelly
|
be98fb1ac7
|
Standalone Tags - checkpoint
|
2019-02-15 11:21:40 -08:00 |
|
SamGondelman
|
25b31cfc72
|
merge with master
|
2019-02-15 11:08:24 -08:00 |
|
Brad Davis
|
0b171ffe13
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 10:31:04 -08:00 |
|
Ryan Huffman
|
ab5c4a927b
|
Fix asset browser being hidden in incorrect way on server switch
|
2019-02-14 22:18:42 -08:00 |
|
Shannon Romano
|
f267043953
|
Merge pull request #14838 from SamGondelman/billboardMode
Case 20962: Billboard mode improvements
|
2019-02-14 17:44:48 -08:00 |
|
Shannon Romano
|
3b5b077a3e
|
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
Case 21066: restore shape caching in ShapeManager
|
2019-02-14 17:33:33 -08:00 |
|
Bradley Austin Davis
|
d45d87031d
|
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
|
2019-02-14 13:49:47 -08:00 |
|
SamGondelman
|
bed2732d34
|
start moving materials to rendering only
|
2019-02-14 12:59:16 -08:00 |
|
SamGondelman
|
13ece79476
|
merge with master
|
2019-02-13 16:30:22 -08:00 |
|
SamGondelman
|
3f8bfc5475
|
CR and fix deadlock
|
2019-02-13 16:19:39 -08:00 |
|
Andrew Meadows
|
c79e3e5a6d
|
add some trace contexts for easier debugging
|
2019-02-13 10:02:58 -08:00 |
|
Andrew Meadows
|
8bdac589b8
|
use RingBuffer for gradual garbage collection
|
2019-02-12 15:37:09 -08:00 |
|
Brad Davis
|
4dd853ddbc
|
Cleanup from master
|
2019-02-12 15:14:50 -08:00 |
|
Sam Gateau
|
a10cf9b620
|
Merge pull request #14883 from amerhifi/feature/quest
case:21032 Fixing Lifecycle of the android app
|
2019-02-12 12:32:38 -08:00 |
|
Brad Davis
|
a6f23f48d6
|
Merge branch 'feature/quest_custom_plugins' into feature/quest
|
2019-02-12 09:53:12 -08:00 |
|
SamGondelman
|
77a8ddb3f0
|
Merge remote-tracking branch 'upstream/master' into materialMapping
|
2019-02-11 16:35:05 -08:00 |
|
SamGondelman
|
96f32a9f72
|
fix keyboard focus thing
|
2019-02-11 15:17:32 -08:00 |
|
amerhifi
|
e8a35c63c7
|
moved asset loading to the permissions screen, added the onNotifyAppLoaded signal connect function as well as binding to the qtread with the ui thread.
|
2019-02-08 13:45:53 -08:00 |
|
SamGondelman
|
f7a487a020
|
move materialcache et al to material-networking library
|
2019-02-08 10:28:07 -08:00 |
|
Brad Davis
|
d3301803d3
|
Support custom display / input plugin lists and small tweaks
|
2019-02-07 15:15:26 -08:00 |
|
danteruiz
|
95d30e5cbf
|
Merge branch 'master' of github.com:highfidelity/hifi into feature/quest
|
2019-02-07 10:41:44 -08:00 |
|
SamGondelman
|
e74ff18bef
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-07 09:49:27 -08:00 |
|
SamGondelman
|
25ca52d892
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-07 09:48:13 -08:00 |
|
SamGondelman
|
a665664fd5
|
fix double lasers
|
2019-02-06 16:13:40 -08:00 |
|
Shannon Romano
|
6fd480e51d
|
Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2
case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around
|
2019-02-06 15:52:31 -08:00 |
|
Brad Davis
|
8b70f1771e
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-06 13:16:22 -08:00 |
|
Shannon Romano
|
61459d5756
|
Merge pull request #14775 from roxanneskelly/QmlMarketplace
Qml marketplace
|
2019-02-06 11:20:49 -08:00 |
|
Brad Davis
|
91e18f569b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-06 10:15:36 -08:00 |
|
Roxanne Skelly
|
d3bc536b58
|
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
|
2019-02-05 11:35:28 -08:00 |
|
Roxanne Skelly
|
2b40260953
|
QmlMarketplace - disable HTML for quest
|
2019-02-05 09:27:12 -08:00 |
|