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

7930 commits

Author SHA1 Message Date
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