Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 18:43:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
78197 commits 21 branches 28 tags 1.2 GiB
Commit graph

78197 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
844fbec36f So that both Jenkins and local Mac are happy. 2019-05-04 18:09:54 -07:00
NissimHadar
50d1958c4c Reverted unneeded changes. 2019-05-04 17:30:49 -07:00
NissimHadar
c9e372aa53 Updated for Ubuntu 16.04/18.04 2019-05-04 17:30:10 -07:00
NissimHadar
ec4a3fed43 Using Andrew's configure line. 2019-05-03 21:20:18 -07:00
NissimHadar
b7f8e7802d Error in variable name. 2019-05-03 21:10:19 -07:00
NissimHadar
cec0cd658b Typo. 2019-05-03 20:42:49 -07:00
NissimHadar
80bf1e592d Allow build on both Ubuntu 16.04 (Jenkins) and 18.04 2019-05-03 20:37:40 -07:00
NissimHadar
604f506dec Merge branch '22007-hifiQtBuildv2' of github.com:NissimHadar/hifi into 22007-hifiQtBuildv2 2019-05-03 19:24:45 -07:00
NissimHadar
88a89de7c6 Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2 2019-05-03 19:18:34 -07:00
Shannon Romano
2618ad09c3
Merge pull request #15501 from thoys/fix/asyncDailogsExitCrash 
BUGZ-73: Fix crash for active async messageBoxes on exit of client
 2019-05-03 15:40:48 -07:00
Shannon Romano
0cdde4b5dc
Merge pull request #15422 from ctrlaltdavid/M22224 
Case 22224: Midi JSDoc
 2019-05-03 15:10:40 -07:00
Sabrina Shanman
3c5bf63c55
Merge pull request #15505 from SamGondelman/stageCrash 
Case 22419: Try to fix transition crash
 2019-05-03 14:38:42 -07:00
Shannon Romano
74a79d04e7
Merge pull request #15504 from amantley/bugMaxBandwidth 
Fixed possible divide by zero error in setPacketSendPeriod()
 2019-05-03 09:17:32 -07:00
John Conklin II
16ece6c2fc
Merge pull request #15493 from amantley/bugPushToTalk 
When you unmute using ctrl-m during push to talk, you now see that reflected in the audio icon
 2019-05-03 09:03:36 -07:00
David Rowe
95e45a5aff Merge branch 'master' into M22224 2019-05-03 17:07:35 +12:00
David Rowe
8458d746cd Doc review 2019-05-03 17:07:14 +12:00
Angus Antley
1f004f34c4 added check for valid dynamic casts 2019-05-02 21:59:11 -07:00
Angus Antley
f019fa3a7c Merge remote-tracking branch 'upstream/master' into bugPushToTalk 2019-05-02 18:28:34 -07:00
Angus Antley
1911301005 changed to match type of _mss in compare. also changed float to double for correct return type 2019-05-02 18:21:08 -07:00
Sam Gateau
46f4b13f2f
Merge pull request #15499 from samcake/coco 
BUGZ-92: Refresh rate Throttling refinements
 2019-05-02 17:24:34 -07:00
Shannon Romano
29e415a104
Merge pull request #15498 from SamGondelman/crash 
Case 22444: Try to fix materialMapping crash
 2019-05-02 16:29:39 -07:00
Shannon Romano
5d3c88b964
Merge pull request #15502 from sabrina-shanman/crash_snapshot_no-directory 
(case 22368) Fix snapshots freezing Interface when no snap directory defined
 2019-05-02 15:59:25 -07:00
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
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
SamGondelman
50e538a73c try to fix materialMapping crash 2019-05-01 17:23:19 -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
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