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

7947 commits

Author SHA1 Message Date
SamGondelman
96f32a9f72 fix keyboard focus thing 2019-02-11 15:17:32 -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
Shannon Romano
61459d5756
Merge pull request #14775 from roxanneskelly/QmlMarketplace 
Qml marketplace
 2019-02-06 11:20:49 -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
Roxanne Skelly
78aa1783a0 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-04 15:04:55 -08:00
SamGondelman
934abb3d52 fix keyboard focus and image overlays 2019-02-04 13:33:03 -08:00
SamGondelman
31cf623252 fix keyboard focus 2019-02-04 12:44:04 -08:00
SamGondelman
4b406bf41c fix getEntityObject and tablet highlighting (Overlays.findOverlays) 2019-02-01 16:23:06 -08:00
SamGondelman
b80d2a9b06 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-01 13:33:04 -08:00
Wayne Chen
03789e01da adding fix for oculus store argument check 2019-01-30 15:53:21 -08:00
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2 
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
 2019-01-29 13:12:51 -08:00
Ken Cooke
fa08e42da6 Restore legacy attenuation behavior for system sounds and scripts that do not set position. 
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
 2019-01-29 11:21:02 -08:00
Andrew Meadows
fb5ef95a5b disable bf triangle collisions for flying MyAvatar 2019-01-29 11:00:18 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature 
MS20874: Only initialize plugin if started through Oculus Store
 2019-01-29 10:57:03 -08:00
SamGondelman
a8dbe5e761 working on build errors 2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a showKeyboardFocusHighlight + fixes 2019-01-28 20:43:47 -08:00
SamGondelman
7b88efa42c trying to fix web surfaces?? 2019-01-28 18:29:09 -08:00
SamGondelman
0d1e4bed66 merge with master 2019-01-28 18:13:05 -08:00
luiscuenca
a6dce5dd84 Merge branch 'master' into multiSphereAvatar04 2019-01-28 17:48:22 -07:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization 
case 20883: GPU frame serialization and related tools
 2019-01-28 15:47:55 -08:00
Wayne Chen
0f1aebea82 adding init/shutdown for plugin init 2019-01-28 14:35:41 -08:00
SamGondelman
2db45b3ec9 dante's keyboard changes + getProperty + some fixes 2019-01-28 14:03:43 -08:00
Roxanne Skelly
d3cffa50d6 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-28 11:11:28 -08:00
luiscuenca
cc73649ef8 Merge branch 'master' into multiSphereAvatar04 2019-01-28 11:57:04 -07:00
Jeff Clinton
f9b63b975d
Merge pull request #14781 from danteruiz/script-print-log 
Case: 20770 allow debug prints in the log by default
 2019-01-28 10:49:18 -08:00
Seth Alves
15aa574afd
Merge pull request #14774 from danteruiz/window-ontop 
case 20705: Allow log window to stay on top
 2019-01-28 10:05:48 -08:00
SamGondelman
70b1e17a8c more wip 2019-01-27 00:05:25 -08:00
SamGondelman
0dd729232b simplify keyboard focus highlight 2019-01-26 22:49:12 -08:00
SamGondelman
8f0bd2449b pointerevents are working! 2019-01-26 21:53:46 -08:00
SamGondelman
abd7d6bddf some stuff is working! 2019-01-26 01:39:13 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type 
Added HMD Avatar Alignment Type
 2019-01-25 17:32:41 -08:00
Roxanne Skelly
dfac0d88a2 QmlMarketplace - Add 'logged out' behavior, fix issue with search scope 
display
 2019-01-25 16:41:13 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature 
MS20311: Oculus login feature
 2019-01-25 16:16:32 -08:00
Dante Ruiz
db58173977 fix mac issue 2019-01-25 15:10:53 -08:00
Roxanne Skelly
49e6120e73 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-25 14:06:44 -08:00
SamGondelman
a2083d949e IT'S BUILDING (but still wip) 2019-01-25 14:04:52 -08:00
Dante Ruiz
4ed54f63ea allow debug prints in the log by default 2019-01-25 13:56:54 -08:00
luiscuenca
f54f9e5bfd Merge branch 'master' into multiSphereAvatar04 2019-01-25 13:54:01 -07:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature 2019-01-25 11:44:14 -08:00
Brad Davis
81a7fa17bf PR feedback 2019-01-25 11:14:40 -08:00
SamGondelman
5ce8f566cc more overlay wip 2019-01-25 11:10:11 -08:00
Dante Ruiz
2c22fb82b1 keep log window on top option 2019-01-24 18:16:07 -08:00
Roxanne Skelly
cfaf01b22a Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d QML Marketplace 
Checkpoint full functionality
 2019-01-24 17:20:42 -08:00
SamGondelman
0bfcde67ea remove overlays from application.cpp 2019-01-24 14:11:24 -08:00
SamGondelman
217ff2b1b2 keyboardFocusOverlay 2019-01-23 18:33:35 -08:00