Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 18:09:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80676 commits 25 branches 0 tags 1.1 GiB
Commit graph

8288 commits

Author SHA1 Message Date
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter 
Limit upstream bandwidth to the Avatar Mixer
 2019-01-18 13:32:03 -08:00
Wayne Chen
2859784e17
Merge branch 'master' into oculusLoginFeature 2019-01-17 14:20:00 -08:00
John Conklin II
19e4a7389b
Merge pull request #14676 from wayne-chen/updateLoginUserLogging 
case 20654: Updating user activity logging for login experience
 2019-01-17 12:59:12 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities 
case 20595: case 20563: Do not delete local entities when switching domains.
 2019-01-17 11:25:58 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature 2019-01-16 17:24:22 -08:00
Wayne Chen
6bc1164d58 more wip on oculus login 2019-01-16 17:05:50 -08:00
Wayne Chen
4320f4cbe4 migrating platform plugin 2019-01-16 17:05:50 -08:00
Wayne Chen
a24ebe2718 oculus functions live in the display plugin; display plugins update 2019-01-16 17:05:49 -08:00
Wayne Chen
db06533018 adding more staging 2019-01-16 17:05:48 -08:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d 
Make mouselook directly proportional to right-click mouse
 2019-01-16 09:09:38 -08:00
luiscuenca
a7f143dbce Merge branch 'master' into multiSphereAvatar04 
# Resolved Conflicts:
#	interface/src/avatar/MyAvatar.h
#	interface/src/avatar/OtherAvatar.cpp
 2019-01-15 18:27:04 -07:00
luiscuenca
71e7023a3e Refactor and optimizations 2019-01-15 18:07:50 -07:00
SamGondelman
1d2270e9c7 web entity fixes 2019-01-15 16:51:36 -08:00
David Rowe
184c11ca44 Fix tablet sometimes not working after domain change 2019-01-16 08:54:29 +13:00
Clement
6bd6c45b60 Remove dead IdentityRequest code 2019-01-15 11:40:08 -08:00
SamGondelman
9803043512 web entity fixes 2019-01-15 09:51:55 -08:00
Dante Ruiz
e7d3844620 making pre review requests 2019-01-14 11:14:57 -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
6cd5770505
Merge pull request #14690 from sethalves/plugin-versioning 
Plugin versioning
 2019-01-11 15:20:05 -08:00
luiscuenca
19701ef333 Fix scale and add rayTest 2019-01-11 15:36:07 -07:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00
SamGondelman
6d12f5704e fix multi-frustum view updating 2019-01-10 15:47:19 -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
Andrew Meadows
e2d6e6f3dc more correct AvatarEntityData settings when switching domains 2019-01-09 17:28:00 -08:00
Andrew Meadows
cbda905e3b fix typo 2019-01-09 17:28:00 -08:00
Andrew Meadows
329ec84104 MyAvatar.setAvatarEntityData() works in theory, blobs saved to settings 2019-01-09 17:28:00 -08:00
Andrew Meadows
121a591023 delete old AvatarEntities on domain reset on login 2019-01-09 17:27:14 -08:00
Andrew Meadows
ec384d7dbb more correct reload AvatarEntityData from settings 2019-01-09 17:27:14 -08:00
Wayne Chen
ba8620b644 updating user activity logging 2019-01-09 13:51:40 -08:00
Anthony Thibault
5d606981de Added HMD Avatar Alignment Type 
Adds a new API to set this type, and an option to the Avatar App.

* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
  If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head.  The new default behavior.
  This prevents the body from lifting off of the ground while wearing a large headed avatar.  But can cause an offset between the users eyes and the avatars eyes.
 2019-01-08 18:35:28 -08:00
Roxanne Skelly
37d4846722 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-07 11:56:48 -08:00
Shannon Romano
963bbbad19
Merge pull request #14661 from danteruiz/grabbing-web-entites 
allow mouse pointer to pick against collidable entities
 2019-01-07 10:24:48 -08:00
Dante Ruiz
4b99a795dd code review changes 2019-01-07 09:09:35 -08:00
Roxanne Skelly
6d791a80c2 Bump protocol version for BulkAvatarTraits and add some guard code 
around packet parsing.
 2019-01-04 19:04:01 -08:00
Dante Ruiz
0dc5e7743f allow mouse pointer to pick against collidable entities 2019-01-04 17:49:38 -08:00
Shannon Romano
4e5d275768
Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager 
MS19925: Avatar Packager
 2019-01-04 16:22:06 -08:00
Shannon Romano
9855e9bee8
Merge pull request #14650 from NissimHadar/20301-addPlatformInfo 
Case 20301 - add platform info
 2019-01-04 14:37:17 -08:00
Thijs Wenker
8625037285 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-04 15:29:07 +01:00
Antonina Savinova
4414579a6e
Merge pull request #14591 from Atlante45/feat/stats 
Fix network stats to use low-level values
 2019-01-03 16:54:03 -08:00
Ryan Huffman
93f53cf43d Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-03 14:18:40 -08:00
Ryan Huffman
7ca7e0f234 Revert unintended changes in avatar packager 2019-01-03 13:45:00 -08:00
Thijs Wenker
c95da0a595 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/src/Application.cpp
 2019-01-03 22:17:54 +01:00
Clement
f163bbc0d5 Sample connections stats every seconds 2019-01-03 10:04:38 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
David Rowe
14d39d1747 Make mouselook yaw and pitch directly proportional to mouse movement 2019-01-03 15:53:37 +13:00
NissimHadar
65d975fe5b Added detection of Rift and Vive controllers. 2019-01-02 16:53:38 -08:00
NissimHadar
4918f7d186 Merge branch 'master' of https://github.com/highfidelity/hifi into 20301-addPlatformInfo 2019-01-02 16:24:52 -08:00
Thijs Wenker
cb91a4bc6d Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-03 00:10:22 +01:00
Antonina Savinova
4838a9107a
Merge pull request #14624 from davidkelly/dk/17207 
ACs don't need to call into flagtimeForConnecitonStep
 2019-01-02 13:41:30 -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
Thijs Wenker
20c169bd39 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-02 14:03:13 +01: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
NissimHadar
246c4dab94 Created the PlatformInfo scripting object. 2018-12-28 14:41:55 -08:00
Thijs Wenker
a1ef1b4447 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-24 16:48:40 +01:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions 
(cherry picked from commit 6aac596698)
 2018-12-22 00:55:10 -05:00
Thijs Wenker
ea901aa179 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-21 14:11:57 +01: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
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3 
Case 20132, Case 16928: First class Image Entities
 2018-12-20 21:20:49 +00: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
Thijs Wenker
79a9c82168 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-20 18:56:33 +01:00
David Kelly
2c647462b1 ACs don't need to call into flagtimeForConnecitonStep 2018-12-20 10:15:44 -07:00
Wayne Chen
50d57e8b60 sending user to previous location on second launch 2018-12-19 12:37:08 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
Wayne Chen
017eb9d1a3 adding fix for scripts not being saved 2018-12-18 16:32:44 -08:00
Ryan Huffman
720cd90dc7 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2018-12-18 13:17:28 -08:00
Ryan Huffman
ad471387f7 Integrate marketplace upload API 2018-12-18 13:08:55 -08:00
Wayne Chen
50902080ce fixing typos 2018-12-17 16:48:02 -08:00
Wayne Chen
816733b55f reverting to master 2018-12-17 16:47:11 -08:00
Wayne Chen
5d89ed2a81 matching master 2018-12-17 13:46:55 -08:00
Wayne Chen
28fd1380df adding target scale and default avatar to login state 2018-12-17 13:37:28 -08:00
Wayne Chen
899918006f fixing for autotester 2018-12-14 17:12:27 -08:00
Wayne Chen
befca68917 fixing keyboard position offset 2018-12-14 10:57:42 -08:00
Wayne Chen
e744f40d54 fixing url to login overlay 2018-12-13 16:43:12 -08:00
Wayne Chen
1d86f3816d fixing build error 2018-12-13 15:43:42 -08:00
Wayne Chen
502de63d3f fixing bug 2018-12-13 14:59:40 -08:00
Wayne Chen
3806914e76 fixing variable names to match coding standard 2018-12-13 14:34:25 -08:00
Wayne Chen
0daa909192 more dev feedback 2018-12-13 14:25:52 -08:00
Wayne Chen
1ce7d8a31c dev feedback 2018-12-13 13:47:07 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2 2018-12-12 18:00:07 -08:00
Zach Fox
735be62271
Merge pull request #14562 from zfox23/portalPrototype 
Add a "Portal" mode to the Secondary Camera
 2018-12-12 09:27:55 -08:00
Wayne Chen
2f07a0eb5d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-11 20:01:19 -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
Shannon Romano
a3c870ed90
Merge pull request #14479 from sabrina-shanman/hfm_mimetype 
(case 20037) Add robust MIME type detection for loading models in ModelCache
 2018-12-11 18:41:55 +00:00
Thijs Wenker
3943fe2861 avatar packager initial 2018-12-10 21:29:03 +01:00
Wayne Chen
4c9c785c24 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-10 07:57:44 -08:00
Wayne Chen
7ab1d649f1 fixing limit for overlay too far/close 2018-12-09 07:49:48 -08:00
Wayne Chen
9fd1b7fb2d cancel pitch and check if overlay too far/close 2018-12-07 17:25:55 -08:00
John Conklin II
0a80c16686
Merge pull request #14419 from SamGondelman/splash 
Case 19740: Improve startup times by pre-compiling shaders with splash screen
 2018-12-07 16:10:52 -08:00
SamGondelman
6aac596698 updated entityscriptinginterface API and related functions 2018-12-07 15:25:21 -08:00
sabrina-shanman
7cbe3776f5 Simplify serializer registration process 2018-12-07 12:05:27 -08:00
Wayne Chen
a2572d5710 fix switch display mode crash/keyboard spawn problem 2018-12-07 11:17:06 -08:00
Wayne Chen
2f4805dc04 adding focus disable signal to fix focus 2018-12-06 16:38:10 -08:00
Wayne Chen
1ddba8e787 KB following updated login screen/keep login screen active 2018-12-06 14:58:06 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3 2018-12-06 11:23:50 -08:00
Wayne Chen
30f1016f1c Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-06 09:55:00 -08:00
Jeff Clinton
e8c1c4a27b
Merge pull request #14536 from danteruiz/fix-audio-switching 
Respect changed audio settings when switch displays (Master)
 2018-12-06 09:13:47 -08:00
Wayne Chen
037abd9b5e don't allow PC keyboard in HMD login/fix sign up password 2018-12-05 18:14:59 -08:00
Wayne Chen
11c40666e4 removing trailing tests 2018-12-05 11:29:58 -08:00
Wayne Chen
27e4e1c245 pitch updates login pos/fix signup errors 2018-12-05 11:24:27 -08:00
SamGondelman
287878ff98 merge with master 2018-12-05 10:35:08 -08:00
Dante Ruiz
3123bb37e4 fix audio switching issue 2018-12-05 10:34:47 -08:00
Wayne Chen
37beab3ab3 fixing the desktop tablet problem again 2018-12-05 09:36:56 -08:00
Wayne Chen
40053ef13a make sure android still functions as expected 2018-12-05 09:10:17 -08:00
Wayne Chen
328e1ebc27 autotester param fully functional 2018-12-05 08:51:13 -08:00
Wayne Chen
07599c02c8 true reversion of scrips param 2018-12-05 08:16:54 -08:00
Wayne Chen
4daa943510 fixing scripts param/reverting some qml 2018-12-04 17:17:58 -08:00
Wayne Chen
3951203b55 adding tablet bg/no movement in login state 2018-12-04 16:50:01 -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 Gateau
d2ff4d4674 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-12-03 20:52:43 -08:00
Wayne Chen
dc3381d4a9 updating artwork 2018-12-03 17:28:10 -08:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
sabrina-shanman
243a1d6598 Add ModelFormatRegistry for handling model loading on the application side 2018-11-30 16:50:53 -08:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2 2018-11-30 13:05:17 -08:00
Jeff Clinton
0bca290de2
Merge pull request #14485 from sethalves/crash-on-exits 
suppress 'No instance available' messages during shutdown.  try a dif…
 2018-11-30 10:10:43 -08:00
Shannon Romano
1b24d051f7
Merge pull request #14432 from ctrlaltdavid/M17988 
Fix memory accumulating while Interface is minimized
 2018-11-30 09:39:14 -08:00
Wayne Chen
707339dd2a allowing clicking any mousearea back to the textfield/disable movement ctrls 2018-11-29 17:18:40 -08:00
Wayne Chen
e033492472 enable mouse capture upon resume 2018-11-29 15:40:00 -08:00
Wayne Chen
62848700f3 disable mouse capture in login state 2018-11-29 15:37:35 -08:00
Sam Gateau
54fa4365b8 FIxing build issue doh... 2018-11-28 22:21:58 -08:00
Sam Gateau
9353745054 MErge with master 2018-11-28 21:40:24 -08:00
Wayne Chen
34fb7159e2 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-11-28 19:24:20 -08:00
Wayne Chen
b0fb7778cf fixing some text, turning off lasers until they intersect login overlay 2018-11-28 19:17:30 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2 2018-11-28 19:10:20 -08:00
Wayne Chen
527f8a2b59 UI feedback + new overlay position update 2018-11-28 15:38:37 -08:00
Seth Alves
fac27553d7 suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient. 2018-11-27 17:02:48 -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
Seth Alves
8f21ade0c7 make cmake -DDISABLE_QML=1 work again 2018-11-27 12:41:40 -08:00
Wayne Chen
1258676d56 fixing text height/toolbar coming back 2018-11-26 21:01:34 -08:00
Wayne Chen
bf285b3570 adding experimental login state sound 2018-11-21 14:14:07 -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
cdee10d0b8 getting dominant hand laser + sign up working 2018-11-20 16:54:16 -08:00
Wayne Chen
5f658b90ff Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-11-20 10:44:29 -08:00
Wayne Chen
d55c9467e7 fixing keyboard offset 2018-11-20 10:37:30 -08:00
Wayne Chen
2820328137 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-11-19 15:21:24 -08:00
Wayne Chen
1419ec907b adding wip 2018-11-19 13:57:55 -08:00
David Rowe
7ffa70d0ac Fix memory accumulating while Interface is minimized 2018-11-20 09:36:58 +13: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
Jason Najera
da3ea682ba
Merge pull request #14347 from r3tk0n/19550-oculus-store-v2 
MS19550 - Don't show help for HMDs that aren't plugged in and active
 2018-11-16 15:49:46 -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
4f1361c0ea adding keyboard following login dialog 2018-11-16 12:31:22 -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
27f02c072a Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-15 18:49:49 -08:00
Wayne Chen
02248e77e4 got the overlay to start recentering 2018-11-15 17:03:55 -08:00
r3tk0n
60832b071c Fix logic for cases with rift headset but no touch controllers. 2018-11-15 14:08:38 -08:00
John Conklin II
8177d5bbcd
Merge pull request #14275 from Atlante45/fix/injector-crash 
Rework audio data memory ownership model to fix injector crashes
 2018-11-15 13:25:42 -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
6707bf55ef experimenting login overlay following hmd 2018-11-14 14:46:59 -08:00
Clement
7192aed131 Rework audio data memory ownership model 2018-11-14 14:45:18 -08:00
Wayne Chen
76f33ff853 dont allow auto-switch after display mode change 2018-11-14 13:27:00 -08:00
Wayne Chen
7375840eda adding 3d keyboard/get anchor id wip for reposition 2018-11-13 17:09:47 -08:00
Thijs Wenker
cc207537a3 Fix for unintended snapshots while parenting/un-parenting 2018-11-14 01:05:38 +01:00
r3tk0n
dd8bbeb0e5 Clean up code and remove comments. 2018-11-13 15:36:25 -08:00
r3tk0n
ecee319602 Get logic working correctly. 2018-11-13 15:20:46 -08:00
Wayne Chen
e84361f267 getting hmd/desktop switch working 2018-11-13 14:20:23 -08:00
Jamil Akram
822e4bfe48
Merge pull request #14386 from ctrlaltdavid/M19820 
Fix entities not loading when Interface doesn't have focus
 2018-11-13 13:45:42 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging 
remove urls from logs in Interface
 2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
4cab805392
Merge pull request #12718 from gcalero/tester_flag 
Detect if Interface is running on an android testing device
 2018-11-13 13:13:52 -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
47cd6b332c
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode 
Bug fix for head trackers in desktop mode
 2018-11-13 11:49:24 -08:00
Dante Ruiz
10d045b11b fix infinate loading if entity server is not running 2018-11-13 11:07:26 -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
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
Seth Alves
969776e476
Merge pull request #14312 from ctrlaltdavid/M18577 
Add option to start up at home location
 2018-11-13 09:29:37 -08:00
David Rowe
e12833da23 Fix entities not loading when Interface doesn't have focus 
Reverts https://github.com/highfidelity/hifi/pull/14286
 2018-11-13 14:50:02 +13:00
r3tk0n
597f83e6d5 HoMerge branch 'master' of https://github.com/highfidelity/hifi into 19550-oculus-store-v2 2018-11-12 13:58:37 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
John Conklin II
9d404a6cf3
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo 
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
 2018-11-12 10:45:52 -08:00
Wayne Chen
c927cd6287 wip on overlay spawn in play area 2018-11-09 15:02:14 -08:00
Wayne Chen
b500a9ebbb using experimental play area 2018-11-08 17:13:14 -08:00
David Rowe
c9b3fda724 Merge branch 'master' into M19768 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-11-09 13:56:44 +13:00
r3tk0n
d2a1b35f96 Fix desktop case showing Vive controls. 2018-11-08 16:50:11 -08:00
Wayne Chen
f66326fc4d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-08 15:51:24 -08:00
Wayne Chen
f4ae55d534 adding experimental play area position for overlay 2018-11-08 15:46:27 -08:00
Wayne Chen
fe0bbe19d7 creating login overlay upon startup in HMD/feedback changes 2018-11-08 14:32:11 -08:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard 
3D Keyboard.
 2018-11-08 13:35:13 -08:00
Zach Fox
1de4f9c3cc Correct portal math 2018-11-08 13:07:49 -08:00
Wayne Chen
e266532888
Merge branch 'master' into loginInitiative2 2018-11-08 11:17:24 -08:00
Jamil Akram
7c22a1954c
Merge pull request #14237 from NissimHadar/addNoLogin 
case 18450: Do not show login dialog if requested not to on the command line.
 2018-11-08 10:43:21 -08:00
Dante Ruiz
358aa547b1 feedback changes 2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Zach Fox
d2d5132f72 It's working! 2018-11-07 14:51:19 -08:00
Wayne Chen
b837cbd8a0 removing debug statement 2018-11-07 14:05:50 -08:00
Wayne Chen
8e075c2a7c fixing login qml/using HMD position for overlay 2018-11-07 14:05:06 -08:00
Zach Fox
668e4aeafd The Beginnings 2018-11-07 11:55:10 -08:00
Wayne Chen
fc32ba9ce3 fixing create app window on desktop 2018-11-07 09:26:34 -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
7c2dd973b7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-06 15:34:34 -08:00
Wayne Chen
8797c40d94 cleanup unused functions 2018-11-06 15:04:51 -08:00
Howard Stearns
05becb870f remove urls from logs in Interface 2018-11-06 13:47:07 -08:00
Wayne Chen
c8071e81b1 sending user to saved address if logged in 2018-11-06 13:32:31 -08:00
Wayne Chen
9beedf9292 changing login overlay size + add keyboard 2018-11-06 12:56:50 -08:00
Zach Fox
c33f9b6ea3 Fix build error 2018-11-06 11:26:09 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
Wayne Chen
77b47d4b32 adding class for creating overlay and lasers 2018-11-05 17:29:01 -08:00
Anthony Thibault
ac8281075b Code review feedback 
Added comment to explain removal of displayPlugin->resetSensors from Application::resetSensors()
 2018-11-05 17:25:00 -08:00
Anthony Thibault
ac8869eb61 Bug fix for head trackers in desktop mode 
Sitting and standing modes work even in desktop mode.
We were inadvertently checking for HMD Mode instead of if the head was valid.
* A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode.
* The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level.
* Sitting mode, walking mode and recentering flags are now visible in the AnimStats.
 2018-11-05 16:21:19 -08:00
Gabriel Calero
344774dcec Merge remote-tracking branch 'upstream/master' into tester_flag 2018-11-05 19:13:04 -03:00
Wayne Chen
9deeee6534 removing unused classes 2018-11-05 11:07:29 -08:00
Wayne Chen
2dd20de1bd Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-11-05 09:13:25 -08:00
Wayne Chen
23141662ff changing button channel to enum 2018-11-02 20:09:28 -07:00
Zach Fox
a87142b8b7 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-02 16:49:20 -07:00
Zach Fox
402c23e359 Use useragent instead of queryparam to determine limitedCommerce 2018-11-02 16:07:29 -07:00
Sam Gateau
fa0c58fa0e Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend 2018-11-02 00:08:47 -07:00
Wayne Chen
7f805ebcb4 more wip 2018-11-01 17:16:15 -07:00
Zach Fox
20cd1df22c Lotsa changes 2018-11-01 16:48:08 -07:00
Wayne Chen
c28ed9fc4b enabling certain menus/key events in login 2018-11-01 13:38:27 -07:00
Zach Fox
b43ad15fa7 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-01 11:32:38 -07:00
Wayne Chen
6822287d67 sending to tutorial if dismiss login 2018-10-31 16:13:01 -07:00
Zach Fox
d4e9a70564 Almost there 2018-10-31 16:12:16 -07:00
Zach Fox
41a0d09389 First pass 2018-10-31 15:31:51 -07:00
Wayne Chen
f62c8ae87a overlay HMD implementation 2018-10-31 15:26:49 -07:00
David Rowe
ae2715af31 Add option to start up at home location 2018-11-01 08:57:12 +13:00
Wayne Chen
67539bc87a Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-31 09:00:37 -07:00
Wayne Chen
03c39eb92f more wip 2018-10-31 07:45:55 -07:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
SamGondelman
dd96881724 don't submit frames while oculus says it's not visible 2018-10-30 12:15:46 -07:00
Zach Fox
d47fd44a47 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-29 14:57:23 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988 
Fix Interface eating memory when minimized
 2018-10-29 12:52:10 -07:00
Wayne Chen
ed847203ea wip for getting hmd overlay 2018-10-29 11:33:28 -07:00
Wayne Chen
6e0b89f0a6 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-29 08:48:02 -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
David Rowe
1cca975b37 Fix Interface eating memory when minimized 2018-10-27 11:40:02 +13:00
Bradley Austin Davis
28b45ce1d9 Resolve compositing glitches 2018-10-26 11:23:29 -07:00
Bradley Austin Davis
95d160a170 Working on mac GL issues 2018-10-26 11:23:29 -07:00
Wayne Chen
955b0a580e adding hooks for application for pause/resume 2018-10-25 17:25:44 -07:00
Howard Stearns
c85dbb8233 limitedCommerce switch 2018-10-25 11:25:56 -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
Zach Fox
d1556ae4e8 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 15:51:34 -07:00
Zach Fox
1d8994993c Whitelist TTS scripting interface to TTS app, which is now a default script 2018-10-22 17:05:31 -07:00
Zach Fox
493262052c Remove extraneous code changes; remove QUrlAncestry code; remove extra logging 2018-10-22 13:59:52 -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
Zach Fox
1eca1bfd55 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-22 11:18:10 -07:00
NissimHadar
c9f9679cf7 Merge branch 'master' of https://github.com/highfidelity/hifi into addNoLogin 2018-10-22 10:55:56 -07:00
NissimHadar
092f88e558 Change parameter name from --no-login to --no-login-suggestion 2018-10-22 10:55:50 -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
3bd10716b2 wip 2018-10-19 16:06:28 -07:00
Wayne Chen
e32460ed96 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-19 09:25:57 -07:00
NissimHadar
12d092609b Do not show login dialog if requested not to on the command line. 2018-10-18 17:20:26 -07:00
Anthony Thibault
3e68a1d5a5 Merge branch 'master' into feature/acceleration-limit-filter 2018-10-18 16:51:57 -07:00
Zach Fox
41742aaf9e Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-18 16:22:41 -07:00
Wayne Chen
5a381fdc03 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-18 14:53:49 -07:00
Zach Fox
2a9e0041b2 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-18 10:16:07 -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
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation 
Fix various ResourceCache bugs
 2018-10-17 11:13:35 -07:00
Zach Fox
26e388b139 Some experimentation yields promising results... 2018-10-16 17:34:48 -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
Zach Fox
daeedc6ef1 Lots of progress today 2018-10-11 17:10:14 -07:00
Anthony Thibault
a3a87ef48b Debug rendering of tracked objects, remove filters from body. 2018-10-10 17:52:26 -07:00
Zach Fox
7de784ce27 First steps (definitely not working) 2018-10-10 12:32:55 -07:00
Wayne Chen
60bbcc7fc3 adding initialization of qml when keyboard ready 2018-10-09 15:20:16 -07:00
Wayne Chen
ccebf3edef omitting keyboard focus hack 2018-10-08 17:18:40 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
Andrew Meadows
c3478dc018 remove expired avatarEntities from their avatars 2018-10-05 13:48:35 -07:00
danteruiz
d285080197 remmoving some debug statements 2018-10-04 18:38:25 -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
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -07:00
Clement
3c4e543b3c Better deadlock crash 2018-10-02 11:51:15 -07:00
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -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
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
John Conklin II
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan 
fix several uninitialized reads
 2018-10-01 16:48:54 -07:00
John Conklin II
dd5cd5de82
Merge pull request #14091 from gcalero/fix-case-18465 
Fix case 18465: redirect to domain after login
 2018-10-01 16:48:27 -07:00
sabrina-shanman
b988382918 Remove smaller RayPick constructor 2018-10-01 11:07:02 -07:00
luiscuenca
5ccbc5c029 Disable Hand Touch when Leap Motion is running 2018-10-01 10:47:06 -07:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-27 12:05:21 -07:00
sabrina-shanman
bb38efa061 Set joint state for the mouse RayPick of the EntityTreeRenderer 2018-09-27 10:58:28 -07:00
sabrina-shanman
b68031b969 Add simpler RayPick constructor with position/direction values set to default 2018-09-27 10:53:10 -07:00
Wayne Chen
747aab2097 persisting signed values 2018-09-27 10:16:11 -07:00
Wayne Chen
03d2fa2787 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-09-27 09:47:08 -07:00
Gabriel Calero
3163ae5997 Fix case 18465: redirect to domain after login 2018-09-26 19:41:43 -03: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
John Conklin II
7df90881cd
Merge pull request #14007 from kkurian/marketplace-item-tester 
Marketplace item tester interface
 2018-09-26 11:25:53 -07:00
Dante Ruiz
7e138ebfff update to new enabling method 2018-09-26 10:52:45 -07:00
sabrina-shanman
4011660435 Merge branch 'master' into stt_parenting2 2018-09-26 10:17:45 -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
John Conklin II
c5ff72bd20
Merge pull request #14024 from wayne-chen/toggle404Redirect 
Toggle going to 404 redirect domain
 2018-09-25 20:44:57 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
Dante Ruiz
57ae8ff8a1 update interstitial page stability count and loading bar 2018-09-24 16:09:53 -07:00
Roxanne Skelly
c1d2f00c9b Fix url.toString() 2018-09-24 15:45:38 -07:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Brad Davis
72fc686ec1 Fix timer managmement during shutdown 2018-09-24 14:52:13 -07:00
Roxanne Skelly
16dba169c5 Tray Notifier code review fixes 2018-09-24 14:36:54 -07:00
Roxanne Skelly
d5baadbefa Modify --url hifiapp: behavior to trigger through appUI when first 
starting interface.

Also, menu names and order follow UX documentation.
 2018-09-24 13:43:55 -07:00
Dante Ruiz
d3368146ce saving work 2018-09-21 11:42:26 -07:00
David Rowe
5719b7020d Merge branch 'master' into M17428-f 2018-09-21 10:47:56 +12:00
Roxanne Skelly
d5f756c79d Tray Notifier Checkpoint 
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
 2018-09-19 12:40:15 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
Gabriel Calero
72eeeac2ba Don't popup login dialog in android 2018-09-14 14:40:30 -03:00
sabrina-shanman
237022d304 Refactor new pick parenting system for use with RayPick, ParabolaPick 2018-09-14 10:28:15 -07:00
David Rowe
bbfb2b1374 Merge branch 'master' into M17428-f 2018-09-14 10:36:49 +12:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor 
Fixing Error State for Timeout/localhost Redirection
 2018-09-13 15:19:55 -07:00
Wayne Chen
647c4e1694 adding true fix for localhost timeouts 2018-09-13 13:51:42 -07:00
Wayne Chen
380f24b37f adding fix, changing window title 2018-09-13 11:53:21 -07:00
Dante Ruiz
d76a2c1add disable interstitial by default and fix crash 2018-09-12 15:31:03 -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
2267085dbf
removing unused counter variable 2018-09-11 17:46:01 -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
Stephen Birarda
2c056e5b22
Merge pull request #13912 from birarda/bug/agent-clear-avatars 
handle agent avatar clear on avatar mixer disconnect
 2018-09-11 16:34:15 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged 
making requested changes and fixing compile issue for jenkins
 2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908 expose domain connection error to Window 2018-09-11 16:29:39 -07:00
Dante Ruiz
c97d646083 making requested changes and fixing compile issue for jenkins 2018-09-11 15:57:44 -07:00
David Rowe
de95ee0a18 Merge branch 'master' into M17428-f 2018-09-12 09:49:29 +12:00
Dante Ruiz
b665dbe13e finished requested changes 2018-09-11 14:18:12 -07:00
Dante Ruiz
735ff04fad fixing merge conflicts 2018-09-11 12:10:19 -07:00
Dante Ruiz
5c9a88868d first round of requested changes 2018-09-11 12:01:55 -07:00
Wayne Chen
e931b661a5
login dialog pops up in HMD again 2018-09-11 11:00:39 -07:00
Wayne Chen
6bcf6eaae7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-11 09:13:41 -07:00
Wayne Chen
69ae475787 adding user activity logging 2018-09-10 23:04:50 -07:00
Wayne Chen
5ece8d8707 using different paradigm for checking login dialog popup 2018-09-10 18:32:21 -07:00
Wayne Chen
c194c236f1 adding inlines 2018-09-10 17:10:13 -07:00
Wayne Chen
e5a87aa58c removing unused variables 2018-09-10 16:56:13 -07:00
Wayne Chen
dcacfdba7c adding popup property to qml 2018-09-10 16:22:55 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms 
Remove all uniforms from our shaders
 2018-09-10 15:42:01 -07:00
Wayne Chen
e7616c7d34 added logging + activity logging 2018-09-10 15:06:14 -07:00
Wayne Chen
e721844b10 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-10 10:10:16 -07:00
Sam Gateau
983badf80a
Merge pull request #13663 from SamGondelman/lod 
Enable LOD manager on android
 2018-09-08 13:43:36 -07:00
David Rowe
7dba2e6a2e Merge branch 'master' into M17428-f 2018-09-08 12:45:11 +12:00
Stephen Birarda
adac872a11 clear other avatars in agent on avatar mixer disconnect 2018-09-07 15:04:14 -07:00
Sam Gondelman
57275422f2
Merge branch 'master' into lod 2018-09-07 10:01:26 -07:00
Wayne Chen
ef3449f96d Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged 2018-09-06 17:36:47 -07:00
Dante Ruiz
2f9119529a editing the interstitial page 2018-09-06 17:06:17 -07:00
Anthony Thibault
acc7f1f168 Moved AnimStats into its own qml panels. 
Added state machine tracking as well.
 2018-09-06 16:18:58 -07:00
Dante Ruiz
ec2d89fd25 fixing toolbar disappering 2018-09-06 11:16:58 -07:00
Dante Ruiz
200f6d540a Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-09-06 09:59:51 -07:00
Brad Davis
105a615745 Fix no-ui crashes 2018-09-06 08:59:05 -07:00
Wayne Chen
581aa0c02d Merge branch 'fly-login-upon-launch' of https://github.com/sethalves/hifi into loginOnLaunch 2018-09-05 20:04:34 -07:00
Sam Gateau
912e0abb0a
Merge pull request #13891 from samcake/black 
Improving the LOD manager behavior for better scaling
 2018-09-05 16:01:09 -07:00
John Conklin II
dc02ff66f5
Merge pull request #13907 from birarda/feat/mixer-trait-state-reset 
mark and cycle trait instances needing to be sent on mixer reconnect
 2018-09-05 12:43:27 -07:00
Seth Alves
1bea6c9ea3 if not already logged in, show login dialog at launch-time rather than connect-to-domain-time 2018-09-05 10:38:12 -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
9e0fa08cf1 adding property to location, updating domain 2018-09-04 17:46:23 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
Stephen Birarda
20912349a4 cycle avatar entity IDs for new avatar mixer 2018-08-31 16:53:58 -07:00
Wayne Chen
b6d23843dd adding fix to domain redirection URL 2018-08-30 22:32:02 -07:00
Wayne Chen
e3f5f4c55a Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect 2018-08-30 19:55:51 -07:00
Wayne Chen
82c7495615 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-30 19:41:06 -07:00
Sam Gateau
e0f4c8239e Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-30 19:16:53 -07:00
Sam Gateau
a7fd35747d
Merge pull request #13896 from AndrewMeadows/workload-feedback 
Filter timings used in feedback logic for workload region sizes
 2018-08-30 19:11:49 -07:00
Wayne Chen
5f43f5b276 adding different method for handling redirect 2018-08-30 17:40:13 -07:00
sam gateau
8179de35b0 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 14:46:40 -07:00
David Back
cee270780b
Merge pull request #13908 from dback2/androidCrashStateVariables 
Fix Android StateController assert
 2018-08-30 13:37:13 -07:00
Sam Gateau
9e2a540bab Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 12:12:24 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870 
Fixup PR13870: Make the feature work in Master
 2018-08-30 11:08:23 -07:00
David Back
8b1fcfcce9 fix double windows platform 2018-08-30 10:16:27 -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
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
Wayne Chen
eb29c9c4a2 updating with default landing location 2018-08-29 16:53:22 -07:00
Wayne Chen
3810984056 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-29 16:18:16 -07:00
Sam Gateau
349f782697 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-29 16:07:50 -07:00
David Back
96d2ba660c Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-29 12:05:51 -07:00
Andrew Meadows
f9d14e1351 filter time-cost drivers for region regulation 2018-08-29 11:17:59 -07:00
Sam Gateau
3c0e284e98 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-29 08:48:04 -07:00
Wayne Chen
6689c15564 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-28 19:22:34 -07:00
Sam Gateau
37b4cf6223 Picking pid values 2018-08-28 17:39:35 -07:00
Sam Gateau
0da22db837 Picking pid values 2018-08-28 16:05:57 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
David Rowe
e5c733e7f2 Merge branch 'master' into M17428-c 2018-08-29 08:20:00 +12:00
David Back
b6edb2c9d6 platform states, edit controller mapping, separate mac/win delete 2018-08-27 14:53:13 -07:00
danteruiz
e4293d9ad5 fixing some entity visual problems 2018-08-26 21:50:01 -07:00
Sam Gateau
294fe51fde Trying to simplify the LOD culling test 2018-08-24 16:48:23 -07:00
Dante Ruiz
af19849a75 fixing merge conflict 2018-08-24 15:48:42 -07:00
Dante Ruiz
3796675123 script update and visuallyReady entities 2018-08-24 15:46:39 -07:00
SamGondelman
98d145dc24 fix crash on shutdown in domain with material 2018-08-24 15:19:48 -07:00
John Conklin II
477fba4b15
Merge pull request #13847 from AndrewMeadows/workload-avatars-002 
workload tracks other avatars and adds/removes from physics simulation accordingly
 2018-08-24 12:43:51 -07:00
Andrew Meadows
10d0833c19 use DynamicsWorld::numCollisionObjects instead of our own count 2018-08-23 15:57:54 -07:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
Andrew Meadows
777b90bdc0 add 'physics body count' to debug stats 2018-08-23 12:59:28 -07:00
Andrew Meadows
87223946ad add/remove avatars according to workload region 2018-08-23 12:59:28 -07:00
Andrew Meadows
15665b25e8 give OtherAvatars a proxy in workload 2018-08-23 12:59:28 -07:00
Sam
bcf9c5a6b3 Merge branch 'master' of github.com:highfidelity/hifi into one 2018-08-22 17:14:58 -07:00
Dante Ruiz
db8e1bdfa3 compile error fix 2018-08-22 16:47:18 -07:00
David Rowe
883479d654 Merge branch 'master' into M17428-c 2018-08-23 10:43:44 +12:00
Dante Ruiz
f5441b2721 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-22 15:28:42 -07:00
Dante Ruiz
78458d62de revert some changes and fix toolbar issue 2018-08-22 15:20:56 -07:00
Sam Gateau
054f30b0de Merging with master 2018-08-22 13:30:44 -07:00
John Conklin II
50684f00c8
Merge pull request #13856 from sethalves/dont-squash-delete-events 
don't squash delete events during shutdown so that QtWebEngine process gets destoryed
 2018-08-22 12:44:35 -07:00
Seth Alves
579b2435c2 don't squash delete events during shutdown so that QWebEngine process gets destroyed 2018-08-22 11:04:26 -07:00
Sam Gateau
3aa47a6695 Merging with master after a bunch ofchanges 2018-08-22 08:46:40 -07:00
Stephen Birarda
3e2d4dc696 fixes and improvments addressing CR comments 2018-08-21 10:53:52 -07:00
Dante Ruiz
b2fb2c7f98 fix build error 2018-08-21 10:45:59 -07:00
Stephen Birarda
e33f349d53 fix flagging for avatar entity update/delete 2018-08-21 10:32:05 -07:00
Stephen Birarda
be7eb57205 handle whitelist avatar URL override via traits 2018-08-21 10:31:14 -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
David Rowe
4b12e18c27 Merge branch 'master' into M17428-c 2018-08-21 16:52:30 +12:00
Wayne Chen
acc7d493ec
Merge pull request #13812 from SimonWalton-HiFi/safe-landing 
Safe landing client-side improvements
 2018-08-20 20:36:17 -07:00
David Rowe
8a8bf6dc04 Reduce default size of tablet in HMD mode 2018-08-21 10:49:19 +12: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
Simon Walton
a891b74fac Reset SafeLanding in all cases 
Also remove unused data member, elevate load priority only
for entities with collisions, handle case of no nearby entities.
 2018-08-20 12:31:21 -07:00
Dante Ruiz
2261ad2bcb clean up the interstitial page 2018-08-20 11:14:48 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy 
Trying to fix dependency shutdown
 2018-08-16 13:14:58 -07:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable 
Use Create Entities as Grabbable option when adding asset to world
 2018-08-16 09:22:23 -07:00
Ryan Huffman
5d44877f56 Fix functionality sometimes getting stuck if window loses focus 2018-08-15 13:32:58 -07:00
John Conklin II
032e67fd8e
Merge pull request #13748 from ElderOrb/FB16831 
FB16831 qml-related warnings in log
 2018-08-14 16:40:07 -07:00
sabrina-shanman
e5cb078133 Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target 2018-08-13 14:51:37 -07:00
unknown
8a22d0adc7 set grabbable user data in addAssetToWorldCheckModelSize 2018-08-11 11:04:44 -07:00
Dante Ruiz
75cc1c62c0 mostly done interstitial page 2018-08-10 16:53:34 -07:00
Simon Walton
3c665b7de8 Don't delete sequence numbers outside of range as range may change 2018-08-10 14:40:08 -07:00
unknown
8c185aa04e fix menu option 2018-08-10 12:13:09 -07:00
unknown
45b9871fdb when adding asset to world set grabbable 2018-08-10 12:10:49 -07:00
unknown
5641c59f5f Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 09:49:37 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
Simon Walton
875407b3fe New approach to physics readiness - now (mostly) working 2018-08-09 16:24:04 -07:00
John Conklin II
59977fe1d3
Merge pull request #13764 from r3tk0n/17249-safe-landing 
Relocate Avatar Spawn Point from the Hips to the Feet
 2018-08-09 12:45:30 -07:00
Simon Walton
4395e1fa26 Safe Landing checkpoint 2018-08-09 11:11:58 -07:00
Dante Ruiz
faa5411757 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-09 08:42:14 -07:00
David Back
8db0711b5b set grabbable user data in addModelEntity, pass grabbable from asset browser 2018-08-08 16:33:47 -07:00
Simon Walton
88bd4e3d9a WIP - safe landing infrastructure 2018-08-08 12:32:45 -07:00