Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 20:03:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
78198 commits 25 branches 0 tags 1.1 GiB
Commit graph

78198 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shannon Romano
7fc92a74e0
Merge pull request #15429 from SamGondelman/leave 
Case 20989: Call leaveEntity when script on containing entity stops
 2019-05-02 15:42:47 -07:00
Sam Gateau
02530bdd02 Refining the test to resetInactiveTimer 2019-05-02 14:51:45 -07:00
SamGondelman
200cf7aacb try to fix transition crash 2019-05-02 14:31:43 -07:00
Angus Antley
ced5f52971 fixed possible divide by zero error in setpacketsendperiod in CongestionControl.cpp 2019-05-02 14:22:52 -07:00
David Kelly
0b2d11aeef Merge branch 'master' of github.com:highfidelity/hifi into dk/bugz-6 2019-05-02 12:37:16 -07:00
Wayne Chen
d31ed9ac22 adding timer for muted warning 2019-05-02 12:23:58 -07:00
John Conklin II
75b6705f19
Merge pull request #15464 from Atlante45/fix/cmake-warnings 
Case 22370: Fix cmake 3.14 warnings
 2019-05-02 11:43:19 -07:00
Shannon Romano
caefa3e06a
Merge pull request #15362 from ctrlaltdavid/M22075 
Case 22075: Controller JSDoc update
 2019-05-02 11:34:58 -07:00
Shannon Romano
c9f9a924d4
Merge pull request #15500 from mattr1x/add-ci-build-envvar 
Enable `--ci-build` setting via an environment variable
 2019-05-02 11:29:27 -07:00
jennaingersoll
57b9b18012
Merge pull request #15363 from ctrlaltdavid/M22068 
Case 22068: Clipboard JSDoc
 2019-05-02 11:15:25 -07:00
Thijs Wenker
119b97216f Fix crash for active async messageBoxes on exit of client 2019-05-02 19:11:02 +02:00
Matt Hardcastle
64bf8ec393 Enable --ci-build setting via an environment variable 
Prior to this comment the only way to enable the ci mode for the `prebuild.py` script was to pass it the `--ci-build` argument. The ci system doesn't call call prebuild directly, cmake does, so adding this argument via the CI system is impossible. This change adds the `CI_BUILD` environment variable so enabling the ci mode is possible through the CI system.

Prints timing with CI_BUILD environment variable set

    % CI_BUILD=foo cmake -G "Unix Makefiles" ../hifi
    ['/Users/mhard/src/hifi/prebuild.py', '--build-root', '/Users/mhard/src/hifi_build_make']
    1556815031 bcab3689-9ec6-49d4-bbdf-05de5840001f sha=3bb61335be
    1556815031 bcab3689-9ec6-49d4-bbdf-05de5840001f start
    Warning: Environment variable HIFI_VCPKG_BASE not set, using /Users/mhard/hifi/vcpkg
    Using vcpkg path /Users/mhard/hifi/vcpkg/c1966b8c
    [... snip ...]

Doesn't print timing when CI_BUILD environment variable is unset:

    % cmake -G "Unix Makefiles" ../hifi
    ['/Users/mhard/src/hifi/prebuild.py', '--build-root', '/Users/mhard/src/hifi_build_make']
    Warning: Environment variable HIFI_VCPKG_BASE not set, using /Users/mhard/hifi/vcpkg
    Using vcpkg path /Users/mhard/hifi/vcpkg/c1966b8c
    [... snip ...]
 2019-05-02 09:46:17 -07:00
Sam Gateau
7f22ac1be4 FIxing a warning on unix 2019-05-02 08:57:19 -07:00
Sam Gateau
c7702048ad Merge branch 'master' of github.com:highfidelity/hifi into coco 2019-05-02 08:50:30 -07:00
Sam Gateau
06dc9fc39f
Merge pull request #15494 from amerhifi/amdCursorbug 
case 22438: setting default cursor after display initialization for systems that …
 2019-05-02 08:50:19 -07:00
David Rowe
e217909f17 Merge branch 'master' into M22075 2019-05-02 20:19:17 +12:00
David Rowe
e94cafd88e Doc review 2019-05-02 20:16:53 +12:00
Sam Gateau
531ec14253 Applying my own comments, and refining the profile values 2019-05-02 00:54:00 -07:00
Sam Gateau
d031e8806a Merge branch 'master' of https://github.com/highfidelity/hifi into coco 2019-05-01 21:48:34 -07:00
amantley
a8b54cbe10 changed reinterpret to dynamic cast 2019-05-01 17:32:39 -07:00
Simon Walton
4c0dc118c9 Don't verify-fail if the fst has no certificate 
Also remove some debugging prints
 2019-05-01 17:28:10 -07:00
SamGondelman
50e538a73c try to fix materialMapping crash 2019-05-01 17:23:19 -07:00
sabrina-shanman
8a799967d1 Do sanity checks on data length in readBinaryArray in FBXSerializer_Node.cpp 2019-05-01 17:02:06 -07:00
Sam Gateau
7f71ec8d3d Apply my own comments 2019-05-01 16:57:03 -07:00
Sam Gondelman
222d36c7d0
Merge pull request #15480 from SamGondelman/tests 
Case 22418: Fix model bounds on resize
 2019-05-01 16:50:07 -07:00
Sam Gateau
ad60c51197 Merge branch 'master' of github.com:highfidelity/hifi into coco 2019-05-01 16:04:58 -07:00
danteruiz
f65f28c52a refresh rate controller 2019-05-01 16:04:33 -07:00
Anthony Thibault
b0af8b1bdc
Merge pull request #15489 from luiscuenca/jointIndicesCrashFix 
Fix memory corruption in _modelJointIndicesCache QHash
 2019-05-01 15:17:08 -07:00
David Kelly
02b960db33 Increase max heartbeat time to 10 sec on mac (for now - not long-term solution) 2019-05-01 15:06:02 -07:00
Clement
ecc38a8287 Push protocol version 2019-05-01 14:32:04 -07:00
Clement
281f92e3ea Query shape type outside lock 2019-05-01 14:31:53 -07:00
amerhifi
a878232c6d setting default cursor after display initialization for systems that do not call checkcursor on startup 2019-05-01 14:31:40 -07:00
amantley
4b7b416abf corrected the behaviour for ctrl-m so that when you unmute during push to talk you will see it reflected in the audio icon color 2019-05-01 14:00:56 -07:00
Anthony Thibault
4821e745cc
Merge pull request #15482 from amantley/bugAwayAudioToggle 
Fixed: turning on your microphone will now take you out of Away mode
 2019-05-01 12:44:13 -07:00
luiscuenca
6e2ac14c23
Change while loops 2019-05-01 12:42:41 -07:00
NissimHadar
bf24a083fc
Merge pull request #15479 from NissimHadar/22415-fixBackTraceUploadFailures 
Case 22145: Fix BackTrace upload failures
 2019-05-01 11:47:05 -07:00
NissimHadar
9dfcb675ca Moved script. 2019-05-01 10:47:40 -07:00
NissimHadar
b9e2174fe9 Use exit(1) on errors 2019-05-01 10:10:28 -07:00
luiscuenca
73454b06a2
Fix crash accessing _modelJointIndicesCache 2019-05-01 08:57:09 -07:00
Sam Gateau
c1ee4deb12
Merge pull request #15478 from amerhifi/feature/systemMouse 
Case 22378: System cursor in desktop mode instead of rendering texture from Displayplugin
 2019-04-30 20:17:18 -07:00
sabrina-shanman
ef1ff2183b Fix snapshots freezing Interface when no snap directory defined 2019-04-30 17:45:17 -07:00
Simon Walton
119b4fd826 Handle incoming clients to domain with existing verify-failed avatars 2019-04-30 17:39:39 -07:00
raveenajain
0a3a6c52f9 initial information needed for joint shape info 2019-04-30 17:12:35 -07:00
Simon Walton
a0fd828ef7 Set default av-mixer connection-rate to 1e7 2019-04-30 16:00:35 -07:00
NissimHadar
867f1f80df Improved messages. 2019-04-30 15:26:39 -07:00
Angus Antley
c0da46453b made correction 2019-04-30 14:34:10 -07:00
NissimHadar
125d182773 Added try/except blocks. 2019-04-30 14:09:16 -07:00
Angus Antley
5c6ea082db changed away script to make you active if you turn on your mic 2019-04-30 14:06:18 -07:00
SamGondelman
5a184bd584 fix model bounds 2019-04-30 13:38:11 -07:00
NissimHadar
dd1525c9b7 First version of BackTrace upload python script. 2019-04-30 12:27:08 -07:00