Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67108 commits 76 branches 59 tags 1.2 GiB
Commit graph

67108 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
f686ef1f25 Exposing more uniforms to ui for refining the controller 2018-04-23 18:02:09 -07:00
samcake
35bbc6e61f Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-23 10:20:22 -07:00
Sam Gateau
d1e2e9ce71
Merge pull request #12921 from SamGondelman/precisionq 
Fix AMD shader compilation
 2018-04-23 10:17:35 -07:00
samcake
990ee83f04 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-23 10:07:58 -07:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu 
Android: Hide menu and fix shader compilation
 2018-04-23 09:51:20 -07:00
Ken Cooke
ae33205d80
Merge pull request #12944 from humbletim/fix-pal-adjusted-injector-gain 
Support per-avatar gain adjustment on positional audio streams
 2018-04-23 09:22:53 -07:00
Sam Gateau
97934fe563 Adjusting the regulators and moving task to use chrono nad interesting tests 2018-04-23 00:07:00 -07:00
Sam Gateau
99a0e42b5d Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-22 20:26:49 -07:00
Seth Alves
9e1bd69af3
Merge pull request #12918 from kitely/fix-addentity-failure 
Fixed null pointer exception if importing an entity from JSON fails
 2018-04-21 18:12:48 -07:00
Sam Gateau
ec569b0e51 adjusting the bounding box for debug rendering 2018-04-21 12:05:27 -07:00
MiladNazeri
3710ce593d
Merge pull request #12922 from ctrlaltdavid/21815 
Controller API JSDoc
 2018-04-21 10:44:05 -07:00
Sam Gateau
f16d0c712e Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-21 08:16:59 -07:00
David Rowe
34d0a892a0 Point to example using Hardware.Application item 2018-04-21 15:01:46 +12:00
David Rowe
3792b28a3e Add input recorder examples 2018-04-21 14:53:40 +12:00
David Rowe
f865a13326 Doc review 2018-04-21 14:10:14 +12:00
SamGondelman
ac7e8623bf quiet shader warnings 2018-04-20 18:25:30 -07:00
MiladNazeri
080e26f408
Merge pull request #12952 from ctrlaltdavid/21851 
Vec3 API JSDoc
 2018-04-20 18:10:18 -07:00
samcake
b66ab6deaa Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-20 17:55:45 -07:00
samcake
d1b0e89fa3 merging with upstream correctly 2018-04-20 17:55:34 -07:00
samcake
b554aec317 Trying more drastic changes and learnign to use std::chrono the right way 2018-04-20 17:53:24 -07:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
Sam Gateau
07350b02c7
Merge pull request #12958 from AndrewMeadows/workload 
workload: merge from master
 2018-04-20 17:38:52 -07:00
SamGondelman
d59f368ad6 hide menu, fix shaders 2018-04-20 17:38:38 -07:00
David Rowe
7087abd201 Merge branch 'master' into 21815 2018-04-21 10:49:56 +12:00
John Conklin II
39ad8be1b8
Merge pull request #12743 from SimonWalton-HiFi/short-id 
Use 16-bit local IDs for Nodes in NL packets
 2018-04-20 15:28:18 -07:00
Andrew Meadows
3858e7b43c update workload::Engine to agree with new API 2018-04-20 15:08:51 -07:00
Andrew Meadows
06af31594e merge 'master' into 'workload' 2018-04-20 15:07:46 -07:00
John Conklin II
4705472960
Merge pull request #12889 from Atlante45/fix/threaded-crashes 
Fix threaded force crashes
 2018-04-20 13:20:40 -07:00
samcake
3d651de797 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-20 13:20:19 -07:00
humbletim
b86f553550 poke per-avatar gain into per-stream HRTF 2018-04-20 15:36:31 -04:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup 
Make Audio.cpp threadsafe
 2018-04-20 11:36:08 -07:00
Simon Walton
3f894fe5fa Merge fix 2018-04-20 11:15:59 -07:00
Simon Walton
ed0fd8c4d2 Merge fix 2018-04-20 11:13:15 -07:00
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -07:00
Stephen Birarda
7d68d5fd17
Merge pull request #12779 from birarda/cve/brace-expansion 
update to latest electron version for server console
 2018-04-20 10:53:07 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings 
fix some xcode warnings for unnecessary captured this
 2018-04-20 10:30:27 -07:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836 
Update location.hostname JSDoc per serverless domains
 2018-04-20 10:27:09 -07:00
SamGondelman
3b4b43cf66 try to fix audio crash on startup 2018-04-20 10:23:47 -07:00
John Conklin II
7378c87ade
Merge pull request #12690 from SimonWalton-HiFi/hmac-auth 
Change packet authentication to use HMAC
 2018-04-20 09:54:25 -07:00
John Conklin II
92bf99f436
Merge pull request #12786 from huffman/fix/node-list-connections 
Fix avatars not coming back when briefly disconnected from avatar mixer
 2018-04-20 09:53:50 -07:00
samcake
0f4aa7e27e Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-20 09:31:36 -07:00
Ken Cooke
a9c5edcb2f
Merge pull request #12942 from kencooke/audio-devices-crfix 
Minor changes to meet coding standard
 2018-04-20 08:20:32 -07:00
Sam Gateau
cfaf75e196 Using the std::chrono to measure the physics time 2018-04-19 23:28:32 -07:00
David Rowe
8173ac87a8 Minor improvement to Quat.IDENTITY JSDoc 2018-04-20 16:41:10 +12:00
David Rowe
b1e214de5a Vec3 API JSDoc 2018-04-20 16:40:15 +12:00
humbletim
238f59f229 make positional streams honor user-specified gain overrides 2018-04-20 00:08:25 -04:00
David Rowe
0a7cccc3f7 Move Vec2 and Vec4 JSDoc 2018-04-20 12:47:53 +12:00
samcake
9b1a887469 Starting to move dynamically yeah 2018-04-19 17:43:14 -07:00
Simon Walton
377fc6d6c6 Revert to old packet version for ICE packets 
Some ICE (& STUN) packets were using the default version,
which we bumped for the HMAC change. This commit breaks
out the switch for them and reverts to 17.
 2018-04-19 16:55:32 -07:00
David Rowe
8ade4f34f4 Tweak wording 2018-04-20 10:11:01 +12:00