Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 20:10:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
49405 commits 71 branches 56 tags 1.2 GiB
Commit graph

49405 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
5acae04420 fix some warnings 2017-01-04 19:40:03 -08:00
Brad Hefta-Gaub
acca9dbe87 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2017-01-04 18:07:22 -08:00
Brad Hefta-Gaub
368f48f0a7 Merge pull request #9247 from huffman/feat/tutorial-touch-grip 
Add support for new Touch grip mappings to tutorial
 2017-01-04 17:58:05 -08:00
Clément Brisset
e34ecac843 Merge pull request #9299 from Atlante45/settings 
Fix settings hitch
 2017-01-04 17:19:44 -08:00
Brad Hefta-Gaub
f9ca41e89c Merge pull request #9302 from jherico/expose_dropped_count 
Expose dropped frames count to stats UI
 2017-01-04 16:12:35 -08:00
Howard Stearns
90cc9c565a Merge pull request #9298 from howard-stearns/pal-show-lastEditedBy 
selecting user in pal shows entities lastEditedBy user this session
 2017-01-04 16:10:55 -08:00
howard-stearns
97780ac97e color, infront 2017-01-04 16:09:15 -08:00
howard-stearns
d78b7d9a28 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-show-lastEditedBy 2017-01-04 15:48:45 -08:00
Zach Fox
9a44cf1720 Merge pull request #9304 from zfox23/ClearPersonalMute 
Also clear personalMutedList upon reset()
 2017-01-04 15:07:28 -08:00
Zach Fox
e80ae92327 Also clear personalmutedlist upon reset() 2017-01-04 15:06:18 -08:00
Howard Stearns
3d8da683db Merge pull request #9290 from zfox23/PersonalMute 
Personal mute; Quasi-ignore; Reversible PAL actions
 2017-01-04 14:37:09 -08:00
Zach Fox
675159be45 Last commit to fix final bugs 2017-01-04 14:33:02 -08:00
Zach Fox
ac41e8abc4 Bugfix re: population; remove user image for now 2017-01-04 14:06:51 -08:00
Zach Fox
03fbfc85f9 Short delay before populating PAL when changing domains 2017-01-04 13:50:37 -08:00
Zach Fox
c695878025 Clear local ignored list upon domain change 2017-01-04 13:31:16 -08:00
Brad Davis
3f2fdd1915 Expose dropped frames count to stats UI 2017-01-04 13:20:58 -08:00
Zach Fox
dde5f69ac9 More CR & simplifications 2017-01-04 12:41:30 -08:00
Brad Hefta-Gaub
2d1dd13d2a Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-04 12:33:02 -08:00
Atlante45
56a25dfdee Check setting value changed 2017-01-04 11:56:24 -08:00
howard-stearns
c79c489002 selecting user in pal shows entities lastEditedBy user this session 2017-01-04 11:19:32 -08:00
Ryan Huffman
afdd1f3de1 Merge pull request #9286 from ZappoMan/improveScriptRPC 
Improve performance of Entities.callEntityMethod()
 2017-01-04 08:16:09 -08:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Zach Fox
899dd21328 Lots of CR feedback 2017-01-03 15:43:30 -08:00
Brad Hefta-Gaub
60d48bcd49 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-03 14:42:59 -08:00
Brad Hefta-Gaub
94fcecb0ec Merge branch 'master' of https://github.com/highfidelity/hifi into improveScriptRPC 2017-01-03 14:42:37 -08:00
Brad Hefta-Gaub
fcd6c0a878 Merge pull request #9269 from zzmp/graphics/fetch-cull-sort 
Factor out render item fetch/sort/cull
 2017-01-03 13:57:54 -08:00
Brad Hefta-Gaub
3c7fa41be9 update test script 2017-01-03 11:29:52 -08:00
Brad Hefta-Gaub
4c1aaa376d remove cruft 2017-01-03 11:13:03 -08:00
Brad Hefta-Gaub
ecaf3b7b3d remove debugging 2017-01-03 11:11:48 -08:00
Brad Hefta-Gaub
d440532cff make sure RPC is timely 2017-01-03 11:10:07 -08:00
Zach Pomerantz
26cfc83e20 Merge branch 'master' into graphics/fetch-cull-sort 2017-01-03 14:04:39 -05:00
Brad Hefta-Gaub
45c71fd24d Merge pull request #9288 from kencooke/audio-hrtf-avx2 
Faster HRTF
 2016-12-30 17:25:32 -08:00
Chris Collins
f077ac7672 Merge pull request #9282 from zzmp/graphics/forward-bg 
Add background to forward rendering path
 2016-12-30 16:55:09 -08:00
Zach Fox
4a21eaa33f Cleanup before PR 2016-12-30 15:18:01 -08:00
Zach Fox
951db2e2da Bugs fixed! 2016-12-30 15:12:17 -08:00
Ken Cooke
a42ac89a6d Faster HRTF 
New AVX2 implementation of FIR_1x4() achieves 24 FLOPS per clock on HSW/BDW/SKL
Removed old AVX implementation
32-byte alignment of SIMD buffers and tables
Fixed the poorly optimized code produced by GCC -O2
 2016-12-30 13:47:31 -08:00
Zach Fox
ea40582afb Remaining bug: Hover when sort 2016-12-30 12:55:46 -08:00
Zach Pomerantz
15656a0592 include spatialSelection in RenderFetchCullSortTask::Output 2016-12-30 15:08:16 -05:00
Brad Hefta-Gaub
82ab8635d7 debugging 2016-12-30 12:02:48 -08:00
Brad Hefta-Gaub
74384a69ae Merge branch 'master' of https://github.com/highfidelity/hifi into improveScriptRPC 2016-12-30 12:01:27 -08:00
Brad Hefta-Gaub
2096e98aa6 Merge pull request #9283 from ZappoMan/improveInterval 
more precise use of timers
 2016-12-30 11:46:58 -08:00
Zach Fox
f26b7c0134 Checkpoint 2016-12-30 09:51:43 -08:00
Brad Hefta-Gaub
7c7d239e00 first cut at using wait signals to improve RPC timing 2016-12-30 09:13:21 -08:00
Brad Hefta-Gaub
1fcfc9444b revert bow.js changes 2016-12-30 08:14:41 -08:00
Brad Hefta-Gaub
b1d556aee2 more debugging of bow 2016-12-29 19:21:18 -08:00
Brad Hefta-Gaub
65c8d4b16b more debugging of bow 2016-12-29 19:16:55 -08:00
Brad Hefta-Gaub
1bf3965223 more debugging of bow 2016-12-29 19:03:29 -08:00
Brad Hefta-Gaub
73cb100d76 more debugging of bow 2016-12-29 19:00:06 -08:00
Brad Hefta-Gaub
6c86675f24 tweaks to bow script to debug judder 2016-12-29 18:36:32 -08:00
Brad Hefta-Gaub
4b9345d7c6 cleanup accidental change 2016-12-29 16:45:16 -08:00