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

72789 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Back
34afe7a69a remove fixing search cases (for separate PR) 2018-09-13 15:01:49 -07:00
David Back
56ddafed26 fix deleting scroll-away items, fix searching case sensitivity, comments 2018-09-13 14:56:12 -07:00
Gabriel Calero
1215ddbe88 Remove debug files from linux qt build. Remove extra space 2018-09-13 18:50:46 -03:00
luiscuenca
ceccc6d6ec make getCollisionCapsule thread safe 2018-09-13 14:49:35 -07:00
Simon Walton
74ea1548a9 Use chrono::system_clock for usecTimestampNow() on all platforms 2018-09-13 14:24:49 -07:00
John Conklin II
8e5f2d0e08
Merge pull request #13983 from danteruiz/disable-interstitial 
disable interstitial by default and fix crash
 2018-09-13 14:01:28 -07:00
Wayne Chen
647c4e1694 adding true fix for localhost timeouts 2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling 
Performance improvements for Avatar Mixer
 2018-09-13 13:43:18 -07:00
John Conklin II
28140fc0c0
Merge pull request #13988 from sabrina-shanman/crash_bubble-tp 
Fix crash when teleporting into avatars with bubble active
 2018-09-13 13:07:31 -07:00
Gabriel Calero
ec2c0226a5 Replace qt build version (osx) 2018-09-13 16:42:12 -03:00
Wayne Chen
873859455a Revert "adding fix for getting DomainHandler into error state" 
This reverts commit 3fe3f674d0.
 2018-09-13 11:53:56 -07:00
Wayne Chen
380f24b37f adding fix, changing window title 2018-09-13 11:53:21 -07:00
sabrina-shanman
f3d86cfc7d Fix crash when teleporting into avatars with bubble active 2018-09-13 10:51:53 -07:00
David Back
5c4901facd
Merge pull request #13982 from dback2/centerScaleCubeHMD 
HMD Edit Handles - add highlighting and fix center scale cube
 2018-09-13 10:45:00 -07:00
Wayne Chen
96ab7d417e removing connection for on login failed 2018-09-13 10:35:43 -07:00
Gabriel Calero
27c7592d98 Patch qt 5.11.1 to support voice_communication opensl es preset 2018-09-13 14:30:42 -03:00
Wayne Chen
bcd014ddc8 Merge branch 'master' of https://github.com/highfidelity/hifi into fixLoopingConnectionMonitor 2018-09-13 10:29:02 -07:00
David Back
fc771e345c Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-13 10:18:35 -07:00
Seth Alves
36886ca9b8
Merge pull request #13985 from wayne-chen/fixLoggingForEncourageLogin 
Fixing user activity logging for encourage login
 2018-09-13 09:56:42 -07:00
Wayne Chen
9a657559ef Merge branch 'master' of https://github.com/wayne-chen/hifi 2018-09-13 09:52:20 -07:00
Bradley Austin Davis
d90551ac3e
Merge pull request #13954 from jherico/fix/reduce_pointer_duplication 
Reduce needless smart pointer duplication
 2018-09-13 08:56:50 -07:00
Dante Ruiz
dca34c7cbe remove warning for GCC 2018-09-13 08:32:47 -07:00
NissimHadar
f3bc8bdc16 WIP - adding Runner process. 2018-09-13 07:53:42 -07:00
Wayne Chen
47b5ce706e Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-13 07:09:00 -07:00
Wayne Chen
5902699870 adding updated models for redirect 2018-09-12 22:54:23 -07:00
NissimHadar
cc9196fc26 Merge branch 'addDailyTests' of https://github.com/NissimHadar/hifi into addDailyTests 2018-09-12 22:22:49 -07:00
NissimHadar
74f4a28990 Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests 2018-09-12 22:22:10 -07:00
Sam Gateau
6285487214
Merge pull request #13976 from SamGondelman/crash 
Blendshape fixes
 2018-09-12 22:19:44 -07:00
Wayne Chen
fc007982e0 muting opt out activity if login fail/success 2018-09-12 21:25:41 -07:00
luiscuenca
b517808bc2 Fix smaller size avatar capsule and land on detailed mesh 2018-09-12 21:24:19 -07:00
Wayne Chen
ad233677b8 adding changes for overriding host change for error state 2018-09-12 18:31:01 -07:00
NissimHadar
cbc53f1e5d WIP. 2018-09-12 17:37:02 -07:00
David Rowe
4978f80f43 Don't turn on laser when mini tablet is expanding 2018-09-13 12:27:30 +12:00
David Rowe
0437c50c06 Fix mini tablet not reliably being grabbed 2018-09-13 12:20:00 +12:00
David Rowe
54dd868b3c Rotate mini tablet to keep it "vertical" 2018-09-13 11:54:59 +12:00
David Back
430ad87c20 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-12 16:17:41 -07:00
David Back
7768e08510 rename func 2018-09-12 16:06:14 -07:00
Zach Fox
5a1d074e2f Goto now uses AppUi; lint 2018-09-12 16:04:37 -07:00
David Back
06504ade88 Merge branch 'master' of https://github.com/highfidelity/hifi into centerScaleCubeHMD 2018-09-12 16:04:22 -07:00
David Back
1b8e9ed906 get controller position from avatar frame 2018-09-12 16:02:43 -07:00
Wayne Chen
be650d5af0 changing when to log - there is broken code in bodyLoader 2018-09-12 16:00:43 -07:00
Zach Fox
01073ca18d Lots of changes; marketplaces.js working now 2018-09-12 15:46:17 -07:00
Wayne Chen
3fe3f674d0 adding fix for getting DomainHandler into error state 2018-09-12 15:45:06 -07:00
Wayne Chen
49f26d968a adding fix for getting DomainHandler into error state 2018-09-12 15:42:55 -07:00
SamGondelman
2b2091290e fix everything 2018-09-12 15:32:35 -07:00
Dante Ruiz
d76a2c1add disable interstitial by default and fix crash 2018-09-12 15:31:03 -07:00
Brad Davis
d92c62c742 Make android use the existing shared pointers 2018-09-12 15:04:36 -07:00
Brad Davis
700c6519bf More PR comments 2018-09-12 15:04:36 -07:00
Brad Davis
37cf37e3e1 PR feedback 2018-09-12 15:04:36 -07:00
Brad Davis
cfff28ad0a More shared pointer deduplication 2018-09-12 15:04:35 -07:00