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

78098 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ken Cooke
408fb56d57 MIDI error checking 2019-05-06 10:53:58 -07:00
Ken Cooke
f133ab65e4 MIDI bugfix 2019-05-06 10:48:53 -07:00
Ken Cooke
ea9690d72b Disable MIDI rescan after devicechange, to avoid deadlock 2019-05-06 10:46:54 -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
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
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 Gondelman
222d36c7d0
Merge pull request #15480 from SamGondelman/tests 
Case 22418: Fix model bounds on resize
 2019-05-01 16:50:07 -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
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
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
amer cerkic
49cecdee6e fixing spacing 2019-04-30 11:52:37 -07:00
amer cerkic
df3049cb44 simplified way to switch to system cursor if non hmd mode 2019-04-30 11:49:33 -07:00
amer cerkic
978108b3ba found a more simplified way to stop rendering the mouse unless its the Reticle cursor 2019-04-30 11:34:11 -07:00
amer cerkic
7d2b75673c fixed syntax for cursor 2019-04-29 16:42:49 -07:00
amer cerkic
00a153c730 moving work location 2019-04-29 16:39:34 -07:00
David Rowe
3032b58abc Revise formatting of Facilities and Entity Methods sections 2019-04-30 10:10:46 +12:00
Shannon Romano
9261df5c24
Merge pull request #15383 from ctrlaltdavid/M22196 
Case 22196: HMD JSDoc update
 2019-04-29 13:05:32 -07:00
Shannon Romano
69b1b38807
Merge pull request #15471 from danteruiz/mac-window-size 
Case 22363: Setting mac window size to 1/2 screen resolution on first Run
 2019-04-29 08:38:41 -07:00
Shannon Romano
e6c7bb56f3
Merge pull request #15392 from ctrlaltdavid/M22215 
Case 22215: Menu JSDoc update
 2019-04-29 08:37:37 -07:00
Shannon Romano
5bf872b1b8
Merge pull request #15470 from parkerchard/master 
- updated desktop icons and installer graphics
 2019-04-26 21:16:04 -07:00
Simon Walton
5ffce7f1a1
Merge pull request #15467 from samcake/sol 
case 22353: Mac Game loop performances was borked
 2019-04-26 17:19:16 -07:00
danteruiz
d73f685ef2 change mac default window size 2019-04-26 16:56:38 -07:00
Parker Richard
ae348babe4 - reverted to original installer + uninstaller graphics 2019-04-26 16:16:06 -07:00
David Rowe
407ce745d5 Merge branch 'master' into M22075 
# Conflicts:
#	libraries/controllers/src/controllers/Actions.cpp
 2019-04-27 10:51:13 +12:00
David Rowe
eff97d48d3 Doc review 2019-04-27 10:34:06 +12:00
David Rowe
72ef36db02 Merge branch 'master' into M22196 2019-04-27 10:26:10 +12:00
David Rowe
fbe49bbfd4 Doc review 2019-04-27 10:20:35 +12:00
David Rowe
311826c04d Merge branch 'master' into M22215 2019-04-27 10:03:24 +12:00
Parker Richard
4df3a29b00 - updated console+server icons, installer+uninstaller graphics, and console notification icon 2019-04-26 14:50:18 -07:00
Shannon Romano
a00545b48d
Merge pull request #15361 from SaracenOne/falling_push 
Case 22121: Allow players to disable automatic falling to flight threshold.
 2019-04-26 14:03:52 -07:00
Sam Gateau
d08e2e5ca1 Fixing th emerge conflict 2019-04-26 13:44:49 -07:00
Shannon Romano
324bbadcfc
Merge pull request #15466 from Atlante45/fix/traits-parsing 
Case 22255: Add size checks for trait packets parsing
 2019-04-26 13:29:50 -07:00
Shannon Romano
19bc46bb9d
Merge pull request #15461 from davidkelly/dk/22047 
There is no anon restriction - only open, hifi, acl
 2019-04-26 12:25:06 -07:00