Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 08:37:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71632 commits 71 branches 56 tags 1.2 GiB
Commit graph

71632 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
f872a95a7a Added number of failures to log. 2018-09-18 08:49:11 -07:00
NissimHadar
0c3e3e977e Corrected pulling PR number from the executable name. 2018-09-17 16:06:11 -07:00
NissimHadar
f046d3b87d Delete allocated memory where needed. 
Added option to run server-less
Added option to select build.
 2018-09-17 13:21:01 -07:00
NissimHadar
46b00535c8 Running all night. 2018-09-13 22:59:54 -07:00
NissimHadar
35eb019524 Can run installer in a thread. 2018-09-13 15:34:10 -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
NissimHadar
cbc53f1e5d WIP. 2018-09-12 17:37:02 -07:00
SamGondelman
2b2091290e fix everything 2018-09-12 15:32:35 -07:00
NissimHadar
8ee051ea14 Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests 2018-09-12 14:57:28 -07:00
Seth Alves
d5456eda6c
Merge pull request #13980 from birarda/bug/parented-traited-entities 
revert avatar entity XORing, perform avatar entity cleanup in handleRemovedAvatar
 2018-09-12 14:29:39 -07:00
John Conklin II
e243792cac
Merge pull request #13623 from wayne-chen/fixGrabWebSurface-case-16192 
MS16192: Fix Near Grabbing After Using Web Entity
 2018-09-12 12:50:44 -07:00
Stephen Birarda
b1f44d2ad7 perform avatar entity cleanup in AvatarManager::handleRemovedAvatar 2018-09-12 12:30:15 -07:00
Stephen Birarda
1789d51d6e Revert "cycle avatar entity IDs for new avatar mixer" 
This reverts commit 20912349a4.
 2018-09-12 12:22:07 -07:00
Stephen Birarda
6d3e6a661f Revert "XOR incoming trait instance IDs for other avatars" 
This reverts commit 9b3d9dd0f3.
 2018-09-12 12:20:31 -07:00
Stephen Birarda
4b93f9f5cd Revert "use different XORed instance ID for replicas" 
This reverts commit a37a19da1e.
 2018-09-12 12:20:03 -07:00
Wayne Chen
521361293a
moving comment locations inside conditionals 2018-09-12 11:03:00 -07:00
Wayne Chen
acf34dcfdf
one more unused variable 2018-09-12 10:58:05 -07:00
Wayne Chen
8bef0d0de4
removing unused variables 2018-09-12 10:55:40 -07:00
Wayne Chen
a96e78c72d
removing debug 2018-09-12 10:54:38 -07:00
Wayne Chen
b9f0af63e1 changing check for near grabbing modules - fixes grabbing for dynamic 2018-09-12 10:38:21 -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
Sam Gateau
f79c92b4ff
Merge pull request #13974 from samcake/black-ter 
Fix a missing std::chrono::duration_cast
 2018-09-12 08:27:19 -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
30e9d57026 adding pattern for during timeout to put into error state 2018-09-11 18:52:28 -07:00
Wayne Chen
a7321f950a pushing requested changes - adding timeout refusal 2018-09-11 18:32:17 -07:00
Brad Hefta-Gaub
d319bea2ac
Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb 
Avatar loading orb now indicates loading status
 2018-09-11 18:01:40 -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
045ac4cb0d allowing grip button for interrupting web scroll 2018-09-11 17:43:03 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
Wayne Chen
8bca1bc5fe
reverting, oversight 2018-09-11 17:09:21 -07:00
Wayne Chen
a85a7a6119
adding back goToLastAddress back 2018-09-11 17:07:49 -07:00
Wayne Chen
84f95dd4b8
updating typo 2018-09-11 17:03:06 -07:00
Wayne Chen
d4dfaec8ea
updating typo 2018-09-11 17:02:38 -07:00
Wayne Chen
d478fcf027
remove unused signal from domain handler 2018-09-11 17:01:14 -07:00
SamGondelman
1a36693161 I hate blendshapes 2018-09-11 16:58:38 -07:00
Wayne Chen
9ee21c9956
removing virtual keyword from destructor 2018-09-11 16:49:11 -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
sam gateau
8c7781a6d4 use the std::chrono duration the way it should be 2018-09-11 15:57:57 -07:00
Dante Ruiz
c97d646083 making requested changes and fixing compile issue for jenkins 2018-09-11 15:57:44 -07:00
Wayne Chen
b6c5ae2a68 staging changes 2018-09-11 15:23:40 -07:00
Sam Gateau
3fc47bf6fc
Merge pull request #13972 from samcake/black-ter 
Replacing cpu timing calls from gl to std::chrono
 2018-09-11 15:02:15 -07:00
Anthony Thibault
23ed314250 Fix for missing return warning 2018-09-11 14:50:50 -07:00
Wayne Chen
07bda90519
Merge pull request #2 from danteruiz/interstitalMerged 
Dev review requests
 2018-09-11 14:23:54 -07:00
Dante Ruiz
b665dbe13e finished requested changes 2018-09-11 14:18:12 -07:00
Seth Alves
3b3006efb0
Merge pull request #13911 from ElderOrb/FB17982_master 
Avatar App: stop reloading existing selected bookmarks on app relaunch (master)
 2018-09-11 14:04:19 -07:00