Commit graph

2138 commits

Author SHA1 Message Date
SamGondelman
217ff2b1b2 keyboardFocusOverlay 2019-01-23 18:33:35 -08:00
SamGondelman
5d19666f60 merge with master 2019-01-23 17:58:56 -08:00
SamGondelman
9a734b2011 merge with master 2019-01-23 17:48:24 -08:00
SamGondelman
6fd34bf1f0 setup qml surface contexts 2019-01-14 09:26:57 -08:00
Dante Ruiz
8252481ce7 Delete domain entities only 2019-01-11 16:00:10 -08:00
Seth Alves
0603431ac8 initialize _logger with null pointer 2019-01-10 15:16:33 -08:00
Seth Alves
c8db50cb20 start up logger before loading plugins.
put a plugin-interface version into the meta data of each plugin.  don't load plugins that don't match the current version.
2019-01-10 15:06:22 -08:00
NissimHadar
65d975fe5b Added detection of Rift and Vive controllers. 2019-01-02 16:53:38 -08:00
NissimHadar
1e8e633025 Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo 2019-01-02 11:47:34 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
2019-01-02 09:00:56 -08:00
NissimHadar
bb54353644 Compilation error. 2018-12-30 22:36:15 -08:00
NissimHadar
4b4ef4412a Merge branch 'master' of github.com:highfidelity/hifi into 20466-addPlatormInfo 2018-12-30 20:24:16 -08:00
NissimHadar
76ce63da64 Can read graphics card type. 2018-12-30 20:24:00 -08:00
Adam Smith
833ad936c0
Merge pull request #14630 from jherico/fix/20284_master
Fix for Oculus reset view issue
2018-12-28 16:24:40 -08:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions
(cherry picked from commit 6aac596698)
2018-12-22 00:55:10 -05:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
Brad Davis
c985eb3e80 Fix for Oculus reset view issue 2018-12-20 16:07:55 -08:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities
2018-12-20 19:10:22 +00:00
Wayne Chen
28fd1380df adding target scale and default avatar to login state 2018-12-17 13:37:28 -08:00
Wayne Chen
1ce7d8a31c dev feedback 2018-12-13 13:47:07 -08:00
Wayne Chen
dbebf1a67f having stats mirror master 2018-12-11 19:29:17 -08:00
Wayne Chen
4b8200d5bb forcing stats to be false until login determined 2018-12-11 17:27:54 -08:00
Wayne Chen
4c9c785c24 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-10 07:57:44 -08:00
SamGondelman
6aac596698 updated entityscriptinginterface API and related functions 2018-12-07 15:25:21 -08:00
Wayne Chen
2f4805dc04 adding focus disable signal to fix focus 2018-12-06 16:38:10 -08:00
SamGondelman
287878ff98 merge with master 2018-12-05 10:35:08 -08:00
Wayne Chen
328e1ebc27 autotester param fully functional 2018-12-05 08:51:13 -08:00
Wayne Chen
4daa943510 fixing scripts param/reverting some qml 2018-12-04 17:17:58 -08:00
SamGondelman
6d5af36c9f possible fix for oculus problems 2018-12-04 14:31:03 -08:00
Wayne Chen
2d8b638370 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-04 14:19:28 -08:00
Wayne Chen
a24cd41367 getting textfield into focus 2018-12-04 14:19:09 -08:00
Sam Gondelman
4d621ba61c Merge branch 'master' into splash 2018-11-27 16:01:07 -08:00
SamGondelman
1f354f813c rework shader pre-compilation 2018-11-27 14:38:02 -08:00
Wayne Chen
d5e16ae920 removing login state sound 2018-11-27 13:31:41 -08:00
Wayne Chen
51f5942a7f adding sound to login screen 2018-11-21 13:36:36 -08:00
sam gateau
be03859ed6 Warnings from build 2018-11-21 13:31:54 -08:00
Wayne Chen
d12655ed7b sfx to login mousearea/hiding desktop toolbar 2018-11-21 12:21:19 -08:00
sam gateau
44b9b92450 Getting ready for merge 2018-11-20 17:32:04 -08:00
Wayne Chen
d55c9467e7 fixing keyboard offset 2018-11-20 10:37:30 -08:00
Wayne Chen
1419ec907b adding wip 2018-11-19 13:57:55 -08:00
Wayne Chen
3555276817 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-11-19 09:02:30 -08:00
Wayne Chen
b8d8710604 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-19 09:02:16 -08:00
Sam Gateau
5f062bbcf5 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-11-16 20:05:08 -08:00
SamGondelman
cbe5814c64 shader compilation prototype 2018-11-16 15:18:56 -08:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading
Fixing case of interstitial not finishing loading
2018-11-16 14:53:01 -08:00
Wayne Chen
a2a09bc2b9 fixing compile error 2018-11-16 11:16:24 -08:00
Sam Gateau
0166d7748a Merging with master around rc76 cut time 2018-11-15 22:52:37 -08:00
Wayne Chen
02248e77e4 got the overlay to start recentering 2018-11-15 17:03:55 -08:00
Dante Ruiz
20ad05726e entity server timout 2018-11-15 10:52:40 -08:00
Wayne Chen
bf731f32b9 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-15 09:46:32 -08:00
Jamil Akram
60b58977cd
Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease
FB17479 - Fix scripted key release events for handshakes.
2018-11-15 09:21:32 -08:00
Wayne Chen
e787fd5371 experimenting with overlay pos/rot. update 2018-11-15 08:02:28 -08:00
Wayne Chen
c85b840db0 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-14 14:47:56 -08:00
Wayne Chen
e84361f267 getting hmd/desktop switch working 2018-11-13 14:20:23 -08:00
Brad Hefta-Gaub
41d8220cbd
Merge pull request #14362 from ctrlaltdavid/M19768
Add option to enable/disable the mini tablet
2018-11-13 11:59:24 -08:00
Brad Hefta-Gaub
4bafcd2cfa
Merge pull request #14271 from SamGondelman/oculus
Case 19475: Fix various Oculus Store test failures
2018-11-13 11:06:39 -08:00
Wayne Chen
5b021041bb adding play area center for overlay position 2018-11-13 10:23:28 -08:00
Wayne Chen
fe0bbe19d7 creating login overlay upon startup in HMD/feedback changes 2018-11-08 14:32:11 -08:00
David Rowe
28097933ed Add setting to enable/disable the mini tablet 2018-11-07 14:39:06 +13:00
Wayne Chen
1ded4b6fb8 hiding previous username/hiding dev menu 2018-11-06 16:45:45 -08:00
Wayne Chen
77b47d4b32 adding class for creating overlay and lasers 2018-11-05 17:29:01 -08:00
Wayne Chen
7f805ebcb4 more wip 2018-11-01 17:16:15 -07:00
Wayne Chen
f62c8ae87a overlay HMD implementation 2018-10-31 15:26:49 -07:00
SamGondelman
dd96881724 don't submit frames while oculus says it's not visible 2018-10-30 12:15:46 -07:00
Wayne Chen
ed847203ea wip for getting hmd overlay 2018-10-29 11:33:28 -07:00
Wayne Chen
11dc82a5cf Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-10-29 08:47:25 -07:00
Wayne Chen
c4aabfda44 adding prototype functions 2018-10-29 08:47:09 -07:00
Wayne Chen
af04630642 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-26 17:53:13 -07:00
Wayne Chen
955b0a580e adding hooks for application for pause/resume 2018-10-25 17:25:44 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Wayne Chen
331b09c8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-24 09:16:24 -07:00
humbletim
d8217e9a79 synthesize key release events on Desktop focus change 2018-10-23 22:42:06 -04:00
Wayne Chen
84001ae208 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-22 17:59:33 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
Stephen Birarda
3c79a79487
Merge pull request #14163 from Atlante45/fix/bw-recorder
Fix crash with BandwidthRecorder
2018-10-22 10:11:26 -07:00
Wayne Chen
d7a4531d00 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-22 09:27:23 -07:00
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75
hide progress overlays if interstitial mode
2018-10-19 16:35:42 -07:00
Wayne Chen
e32460ed96 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-19 09:25:57 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
David Rowe
c41ce5d484 Make tablet have priority over drawInFront overlays rendered behind it 2018-10-18 17:10:48 +13:00
Wayne Chen
fd3c0d2f76 pushing with new fix 2018-10-17 15:03:09 -07:00
Wayne Chen
28a950fe9f staging 2018-10-15 16:51:28 -07:00
Anthony Thibault
640ed6a32a Added "Developer > Avatar > Show Tracked Objects" menu 2018-10-15 12:42:07 -07:00
Wayne Chen
60bbcc7fc3 adding initialization of qml when keyboard ready 2018-10-09 15:20:16 -07:00
Clement
3eb7c80af3 Fix BandwidthRecorder storage concurrent accesses 2018-10-08 13:45:34 -07:00
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
Dante Ruiz
5d011bafb2 small tweaks 2018-10-04 17:02:44 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack
Remove UndoStack API
2018-10-01 17:13:48 -07:00
Wayne Chen
747aab2097 persisting signed values 2018-09-27 10:16:11 -07:00
Ryan Huffman
09b2565e76 Remove UndoStack API
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
2018-09-26 14:43:11 -07:00
Seth Alves
ff2a47e7e6 fix several uninitialized reads 2018-09-26 09:33:12 -07:00
Dante Ruiz
fa5dfb6e28 Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial 2018-09-26 09:18:12 -07:00
Dante Ruiz
57ae8ff8a1 update interstitial page stability count and loading bar 2018-09-24 16:09:53 -07:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Dante Ruiz
d3368146ce saving work 2018-09-21 11:42:26 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged
Interstitial Page with 404 Redirect
2018-09-12 08:39:52 -07:00
Wayne Chen
20cab87a17 Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-11 18:53:06 -07:00
Wayne Chen
a7321f950a pushing requested changes - adding timeout refusal 2018-09-11 18:32:17 -07:00
Wayne Chen
cb0aa8055f
Merge pull request #13961 from wayne-chen/loginOnLaunch
Pop up login dialog on launch
2018-09-11 17:43:29 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
Dante Ruiz
c97d646083 making requested changes and fixing compile issue for jenkins 2018-09-11 15:57:44 -07:00
Wayne Chen
60a5b0eeaf
Merge pull request #1 from danteruiz/interstitalMerged
handle unable to connect to domain case
2018-09-10 17:23:50 -07:00
Wayne Chen
c194c236f1 adding inlines 2018-09-10 17:10:13 -07:00
Dante Ruiz
de5a0a714b handle unable to connect to domain case 2018-09-10 16:25:17 -07:00
Wayne Chen
dcacfdba7c adding popup property to qml 2018-09-10 16:22:55 -07:00
Stephen Birarda
adac872a11 clear other avatars in agent on avatar mixer disconnect 2018-09-07 15:04:14 -07:00
Wayne Chen
2e17140c07 fixing loadServerlessDomain function to be from 404 redirect 2018-09-04 18:24:01 -07:00
Wayne Chen
c47788efe4 merging with dante's PR 2018-09-04 18:00:06 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
Wayne Chen
5f43f5b276 adding different method for handling redirect 2018-08-30 17:40:13 -07:00
Dante Ruiz
8c77820e30 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-30 09:45:41 -07:00
Wayne Chen
6689c15564 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-28 19:22:34 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
Sam Gateau
d9d23e7fcf
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars
Create N replicas of each other-avatar on the client side
2018-08-28 09:02:13 -07:00
danteruiz
e2cd695dfb PR code clean up 2018-08-27 11:01:29 -07:00
Dante Ruiz
af19849a75 fixing merge conflict 2018-08-24 15:48:42 -07:00
luiscuenca
ddbadf5a69 change to Test API 2018-08-24 11:59:46 -07:00
Andrew Meadows
10d0833c19 use DynamicsWorld::numCollisionObjects instead of our own count 2018-08-23 15:57:54 -07:00
Andrew Meadows
777b90bdc0 add 'physics body count' to debug stats 2018-08-23 12:59:28 -07:00
Sam Gateau
3aa47a6695 Merging with master after a bunch ofchanges 2018-08-22 08:46:40 -07:00
Dante Ruiz
26a30edec9 trying to fix loading bar 2018-08-21 18:27:21 -07:00
Dante Ruiz
db3d3d3d93 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-21 09:56:59 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs
Migrating to scribe program descriptors
2018-08-20 14:48:54 -07:00
Ryan Huffman
5d44877f56 Fix functionality sometimes getting stuck if window loses focus 2018-08-15 13:32:58 -07:00
Dante Ruiz
75cc1c62c0 mostly done interstitial page 2018-08-10 16:53:34 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
Dante Ruiz
2377626203 exposing physics progress 2018-08-03 10:47:58 -07:00
Dante Ruiz
048196ec6f disble sending avatar and audio packets during interstitial mode 2018-08-02 11:39:06 -07:00
Dante Ruiz
0b7d6cb720 start interstitial page work 2018-07-31 14:10:19 -07:00
Sam Gateau
c24083c1f0 drafting along the RenderTHread class 2018-07-25 10:50:15 +02:00
Sam Gateau
bff372a118 Merge with master 2018-07-13 13:00:00 +02:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg
Android - Prevent pending downloads to happen when going back to home
2018-07-12 15:22:56 -07:00
Sam Gateau
1b56653228 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-07-11 11:57:42 +02:00
Cristian Luis Duarte
be8351dc0d Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background 2018-07-06 20:43:52 -03:00
Wayne Chen
cb89b046b4 moving copyToClipboard from slots to functions 2018-07-06 11:07:35 -07:00
Wayne Chen
0facbedbbc adding Q_INVOKABLE method for copying to Application clipboard 2018-07-06 11:03:58 -07:00
Wayne Chen
3994ec4176 adding potential fix - moving methods to Application 2018-07-05 17:54:27 -07:00
Sam Gateau
d2a66b9e7d Moving the paintGL to a true GraphicsEngine::render_performFrame() 2018-07-04 17:26:24 +02:00
Sam Gateau
0f3cb0fb84 INtroducing th eGraphics Engine to group al the graphics related (render and gpu) elements 2018-07-03 12:50:52 +02:00
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07:00
Zach Fox
96858c9586 MS15529: Add secondary camera snapshot notification flag 2018-06-01 13:38:41 -07:00
Andrew Meadows
003e444246 Merge branch 'master' into 'workload' 2018-05-30 16:04:13 -07:00
NissimHadar
9ed8c04097 Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode 2018-05-24 17:40:21 -07:00
samcake
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -07:00
samcake
cf58f31f3e Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine' 2018-05-23 15:08:48 -07:00
NissimHadar
06203d44d8 Correct Camera.mode command. 2018-05-22 17:08:28 -07:00
Andrew Meadows
a23126a6b2 Merge 'master' into 'workload' 2018-05-18 07:38:02 -07:00