Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 01:55:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
48969 commits 71 branches 56 tags 1.2 GiB
Commit graph

48969 commits

Author SHA1 Message Date
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Howard Stearns
ba8b585368 Merge pull request from howard-stearns/pal-proto 
People Action List prototype
 2016-12-15 13:56:12 -08:00
Brad Hefta-Gaub
0923a79139 Merge pull request from PhilipRosedale/rescale 
Rescale yourself or entities using the grip buttons
 2016-12-15 12:32:04 -08:00
howard-stearns
0e81e71325 fix selection and hud-hiding issues 2016-12-15 11:00:32 -08:00
Brad Hefta-Gaub
25c6e8021f Merge pull request from zzmp/chmod/render-utils 
Change file permissions of source code to remove execute bits
 2016-12-15 10:37:36 -08:00
samcake
7a29dbe7d4 Merge pull request from zzmp/feat/render-forward-empty 
Forward render task (empty and only used with RENDER_FORWARD set)
 2016-12-15 09:57:18 -08:00
Seth Alves
4494edae33 Merge pull request from zfox23/FB_2591 
FB 2591: Taking simultaneous GIF snapshots crashes Interface
 2016-12-15 07:01:58 -08:00
Seth Alves
26639aac15 Merge pull request from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
Seth Alves
b11bfd405d Merge pull request from birarda/min-cores-comment 
fix a confusing comment about min cores required
 2016-12-15 06:55:26 -08:00
Stephen Birarda
4c1f99954b fix confusing MIN_CORES_SPEC comment 2016-12-14 17:49:08 -08:00
Stephen Birarda
6c344b0c75 Merge pull request from Atlante45/disable_steamworks 
Make Steam client calls into a plugin
 2016-12-14 17:35:51 -08:00
howard-stearns
ae4064f445 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-14 17:04:52 -08:00
Atlante45
588fdd6efa Add steamworks to interface externals 2016-12-14 16:07:33 -08:00
Atlante45
bfc789f072 CR - CLI text 2016-12-14 15:44:00 -08:00
Atlante45
0dec97fc03 Make Steamworks a plugin 2016-12-14 15:37:49 -08:00
Philip Rosedale
14c867fdbd Can't resize if objects in both hands, avatar resize is seek + grips 2016-12-14 13:38:37 -08:00
Andrew Meadows
c1e283fa6d Merge pull request from samcake/red 
Fix local light shading tiling issue
 2016-12-14 12:25:02 -08:00
Zach Fox
c53111781b Fix the bug 2016-12-14 12:17:00 -08:00
howard-stearns
66e2c651c6 clean up avatar nodes properly (and add some logging) 2016-12-14 11:26:33 -08:00
Stephen Birarda
1829f540cf Merge pull request from Atlante45/controller-mapping 
Fix Oculus Touch flags check
 2016-12-14 11:17:03 -08:00
Howard Stearns
d5c219a761 deal with bubble-bounces (and comment the code a bit) 2016-12-13 19:52:27 -08:00
Clément Brisset
1aec8c5a65 Merge pull request from ZappoMan/avatarMixerTweaks 
drop avatar data rate to 45hz & bump default per client bandwidth from mixer
 2016-12-13 18:25:35 -08:00
Zach Pomerantz
87a8ad1289 strip forward render task to clear and blit 2016-12-13 20:48:05 -05:00
Zach Pomerantz
bbb7229392 skip graphics config if not in engine 2016-12-13 20:47:28 -05:00
Atlante45
07802eb284 Fix Oculus Touch flags check 2016-12-13 17:08:00 -08:00
Brad Hefta-Gaub
92632e72b6 make default avatar mixer send bandwidth 5mbps 2016-12-13 17:04:25 -08:00
howard-stearns
4503855ae8 don't keep selection while things are disappearing 2016-12-13 17:00:24 -08:00
howard-stearns
a50b731faa fix broken search for myself 2016-12-13 16:52:18 -08:00
Brad Hefta-Gaub
e3bc49c302 drop avatar data rate to 45hz 2016-12-13 16:51:59 -08:00
howard-stearns
773bbc4ef1 update canKick whenever we get new data, instead of just at first use. 2016-12-13 16:30:16 -08:00
howard-stearns
00653b6b19 missing the ban button 2016-12-13 16:23:43 -08:00
Zach Pomerantz
bc59be12ef create flagged forward render task 2016-12-13 19:19:30 -05:00
howard-stearns
03d3e0b550 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-13 16:03:00 -08:00
howard-stearns
b0547750b0 people.svg 2016-12-13 15:53:45 -08:00
Brad Hefta-Gaub
a2ba03284e Merge pull request from ZappoMan/kinectPlugin 
Kinect Plugin
 2016-12-13 15:29:41 -08:00
samcake
d9cb07bf9a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-13 15:28:33 -08:00
samcake
0b221abfb2 writting the abs differently 2016-12-13 15:27:50 -08:00
howard-stearns
b0a69468d2 Don't show admin columns if you can't kick. 2016-12-13 15:16:18 -08:00
howard-stearns
adbfa0752a no debug printing 2016-12-13 15:09:46 -08:00
howard-stearns
c9827d1521 checkpoint 2016-12-13 15:05:08 -08:00
David Kelly
97a5c0ef4b Merge pull request from zfox23/fix_bubble_audio_bug 
Fix audio injector bug after space bubble changes
 2016-12-13 14:23:01 -08:00
Zach Fox
2c97d7f9c2 Merge pull request from jazmincano/jazmin_bubble_improvements 
Bubble visualization improvements
 2016-12-13 13:21:11 -08:00
howard-stearns
86010af828 checkpoint 2016-12-13 13:01:45 -08:00
samcake
f509d1fca4 Clening up the fix 2016-12-13 12:48:16 -08:00
Zach Fox
44c6eb303b Fix the bug 2016-12-13 12:46:31 -08:00
Jazmin
b7b4c685e7 Fixed typo 2016-12-13 11:48:06 -08:00
samcake
f8f4ddb16a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-13 11:47:41 -08:00
Jazmin
4effdd0394 Update Bubble model in script 2016-12-13 11:46:40 -08:00
Jazmin
0a031e204e Delete old bubble model 2016-12-13 11:46:22 -08:00
Jazmin
efc9f6549b Add new bubble model 2016-12-13 11:45:50 -08:00