Commit graph

1606 commits

Author SHA1 Message Date
Brad Davis
b6247e0850 Remove cmake spam 2018-09-06 08:59:05 -07:00
Liv Erickson
c081fd75f7 update serverless content 2018-09-04 09:08:35 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs
Migrating to scribe program descriptors
2018-08-20 14:48:54 -07:00
John Conklin II
5db751e4be
Merge pull request #13839 from misslivirose/master
RC 72 Tutorial - MS17378
2018-08-20 14:21:25 -07:00
John Conklin II
3f92430bb6
Merge pull request #13369 from SimonWalton-HiFi/check-pfx-file
Don't sign a production Windows installer if there's no key file
2018-08-20 11:14:00 -07:00
Liv Erickson
5ffe539360 change to tutorial audio file from mono to stereo files 2018-08-20 11:11:03 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
Brad Davis
e6fb2a9e15 Add scribe source files to project 2018-08-03 21:57:53 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
Simon Walton
dc5da4e22b Add cmake variable BYPASS_SIGNING to control signing-file behaviour 2018-08-01 16:35:14 -07:00
Liv Erickson
acf1afea01 fix audio files playing swapped input, trying to amplify audio playback 2018-07-31 15:41:59 -07:00
Liv Erickson
9ec14c1f0d update bubble context for RC 71 2018-07-30 18:03:26 -07:00
Clement
f038ba96b5 Move a couple dependency archives to dependencies 2018-07-13 10:52:32 -07:00
Clement
5a80eb646a Fix bad URL 2018-07-13 10:36:01 -07:00
Clement
284329209b Added missing MD5 2018-07-12 18:14:06 -07:00
Clement
e35cb374ae Re-host dependencies and update URLs to hifi.com 2018-07-12 18:04:10 -07:00
John Conklin II
de33ca512f
Merge pull request #13553 from Atlante45/feat/crashpad-mac
Add Crashpad to Mac
2018-07-11 19:16:24 -07:00
Clement
85f56e2aa7 Remove Mac domain exception 2018-07-10 17:41:07 -07:00
Clement
b5252da3f2 CR 2018-07-10 16:53:11 -07:00
Clement
107c5d74ac Generate debug symbols for Macos Release
And then strip them from the binary
2018-07-09 15:51:36 -07:00
Brad Hefta-Gaub
f8f206c2f9
Merge pull request #13450 from misslivirose/master
MS14398: Make tutorial not grabbable
2018-07-07 21:18:15 -07:00
Clement
d9d72774d8 Add exception for backtrace requests 2018-07-06 15:51:40 -07:00
Clement
72dbbd816b Fix cmake 2018-07-05 15:07:24 -07:00
Stephen Birarda
b4b0131065 grab correct commit hash for conflicting PR 2018-07-05 14:33:21 -07:00
Clement
546ee2b96f cleanup cmake code 2018-07-05 14:18:09 -07:00
SimonWalton-HiFi
21b2187f66
Merge branch 'master' into check-pfx-file 2018-07-03 13:22:27 -07:00
Stephen Birarda
bbc757a193
Merge pull request #13385 from marko8904/timestampServerUpdate
Updated time stamping server for authenticode signatures
2018-06-29 16:46:22 -07:00
Liv
2fe9913d22 update tutorial content 2018-06-22 20:48:59 -04:00
SamGondelman
64fdb8fe62 simplify etc2comp cmake 2018-06-21 09:32:39 -07:00
Sam Gondelman
ad00e1bdca
Merge pull request #13394 from sethalves/fix-osx-etclib-relwithdebinfo
fix etclib link when building RelWithDebInfo on OSX
2018-06-18 14:26:47 -07:00
Gabriel Calero
583c46b3a0 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-15 21:21:03 -03:00
Seth Alves
b60e3c6c7b fix etclib link when building RelWithDebInfo on OSX 2018-06-15 17:09:32 -07:00
Marko Kudjerski
0ac1ea078e Updated time stamping server for authenticode signatures
Symantec's time stamp server seems to be more robust.
2018-06-15 08:20:58 -07:00
Simon Walton
929f6f3059 Only try to sign a Win installer if we have a private key file 2018-06-13 16:42:05 -07:00
Simon Walton
ce7a10c143 Add AppUserModelID to desktop shortcut for Sandbox also 2018-06-13 15:30:35 -07:00
SimonWalton-HiFi
66cad7831e
Merge branch 'master' into snoretoast 2018-06-13 12:10:51 -07:00
Simon Walton
01ef636411 Merge branch 'master' into snoretoast
Two simple conflicts fixed.
2018-06-13 11:19:56 -07:00
John Conklin II
99b5835098
Merge pull request #13344 from birarda/feat/new-version-numbers
handle semantic version numbers in interface/sandbox update
2018-06-13 11:16:56 -07:00
Clement
920263ef49 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-06-12 17:00:25 -07:00
Stephen Birarda
be64f4bcbf
Merge pull request #12917 from kitely/cmake-fixes
CMake fixes
2018-06-11 10:51:49 -07:00
Stephen Birarda
7a9d77d0d9 force git abbreviated SHA to have length of 7 2018-06-08 17:21:09 -07:00
Stephen Birarda
8dd268addb handle semantic version updates in sandbox 2018-06-08 17:21:06 -07:00
Stephen Birarda
112abc9d7e
Merge pull request #13148 from birarda/feat/new-version-numbers
add SHA to PR/master version, add build_type (stable/master/pr/dev)
2018-06-08 14:44:22 -07:00
Gabriel Calero
3911a93a38 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-07 19:00:16 -03:00
Gabriel Calero
8869af069e Integrate Breakpad in android Interface 2018-06-07 18:59:43 -03:00
Sam Gateau
c53a15ec78
Merge pull request #13314 from jherico/feature/oculus_update
Update Oculus integration
2018-06-07 11:45:31 -07:00
Bradley Austin Davis
e38059797d Update Oculus integration 2018-06-06 17:27:30 -07:00
Ryan Huffman
f87775c269 Update serverless content to v2 2018-06-05 10:03:39 -07:00
Simon Walton
97613f1f07 Only set app ID on sandbox link
Also pass down the app ID from CMake files to installer and
server-console.
2018-06-01 14:13:52 -07:00