Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 15:52:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51276 commits 75 branches 59 tags 1.2 GiB
Commit graph

51276 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
dedd85d296 saving work 2017-02-17 18:47:59 +00:00
Dante Ruiz
08ffa18008 Merge branch 'master' into menuFix 2017-02-17 15:53:33 +00:00
Dante Ruiz
80551cf0dd Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-17 15:50:27 +00:00
Dante Ruiz
3189b44612 refreshing with master 2017-02-17 15:50:08 +00:00
Howard Stearns
5bef6ea029 Merge pull request #9687 from davidkelly/dk/3177 
Ban only by machine fingerprint, when possible
 2017-02-16 18:50:38 -08:00
Seth Alves
b6b6ad780d allow isSpotlight to be 0 or 1 2017-02-16 17:15:52 -08:00
Howard Stearns
7afd13d2cb Merge pull request #9693 from howard-stearns/fix-requestsDomainListData 
fix rquestsDomainListData
 2017-02-16 17:06:29 -08:00
Stephen Birarda
24591ee82b Merge pull request #9691 from zzmp/fix/audio-packet-queue 
Fix audio packet queue behavior
 2017-02-16 16:45:51 -08:00
howard-stearns
04712e3744 fix rquestsDomainListData 2017-02-16 16:43:16 -08:00
Dante Ruiz
628b97bfc6 fixed merge issues 2017-02-17 00:08:31 +00:00
Dante Ruiz
afd56bbbbe fixed qml font path issue for desktop and tablet 2017-02-17 00:01:12 +00:00
Zach Pomerantz
07e97a0cab unqueue from front for audio packets 2017-02-16 21:40:53 +00:00
David Kelly
821c01eeca Merge pull request #9689 from howard-stearns/pal-mini-code-cleanup 
cleaner living for pal
 2017-02-16 13:51:26 -07:00
howard-stearns
6e3ae1fe4f cleanup some accumulated cruft in pal code 2017-02-16 10:53:02 -08:00
Seth Alves
21b0e45b0f don't show keyboard in edit.js unless HMD is being worn 2017-02-16 09:56:50 -08:00
Seth Alves
1412fd6dab Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-16 09:24:37 -08:00
David Kelly
a8831e89ff Ban only by machine fingerprint, when possible 2017-02-16 09:50:56 -07:00
Dante Ruiz
648e8fccac Merge branch 'master' into menuFix 2017-02-16 16:30:43 +00:00
Dante Ruiz
7ad8a389f6 refreshing with master 2017-02-16 08:13:17 -08:00
Dante Ruiz
b50bc99cbd updated menu stack 2017-02-16 08:13:16 -08:00
Dante Ruiz
2a97ebb076 updating branch with master 2017-02-16 08:11:50 -08:00
Dante Ruiz
896f9d7181 refreshing with master 2017-02-16 15:58:26 +00:00
Stephen Birarda
a3c123818d Merge pull request #9661 from Atlante45/fix/possible-race 
Fix possible race condition
 2017-02-15 18:38:01 -08:00
Seth Alves
12b8a77488 in edit.js, convert entity property ID to be a text-field so the data can be copied 2017-02-15 16:29:50 -08:00
Seth Alves
3d7733219c edit's open-asset-browser button works, again 2017-02-15 16:15:18 -08:00
Seth Alves
e030a4a518 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 15:20:14 -08:00
Seth Alves
33c1c3ac11 when a new particle-entity is created, hook the particle explorer to it 2017-02-15 15:19:49 -08:00
Howard Stearns
34a4770ffa Merge pull request #9669 from davidkelly/dk/2656 
inform gatekeeper immediately when kicking someone
 2017-02-15 15:13:10 -08:00
Seth Alves
bfa5f6a425 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-02-15 15:00:36 -08:00
Seth Alves
076b0ed3ab get particle explorer working, again 2017-02-15 15:00:25 -08:00
Zach Pomerantz
a976d191ad Merge pull request #9679 from zzmp/fix/audio-assert-ignore-memoization 
Loosen audio memoization precondition
 2017-02-15 17:50:33 -05:00
David Kelly
5ec3bbde52 Merge pull request #9648 from davidkelly/dk/zoneFilters2 
Zone Filters
 2017-02-15 13:36:11 -07:00
David Kelly
f0e87360c1 don't capture a temporary by reference. Ugh 2017-02-15 12:37:00 -07:00
Seth Alves
c0b5f7b005 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 11:36:50 -08:00
Seth Alves
3ea0f6d2d2 allow lasers to scroll tablet while in edit-mode 2017-02-15 11:34:48 -08:00
Clément Brisset
eba6a8f028 Merge pull request #9674 from Atlante45/fix/mac-macro 
Fix SSE2 macros for Macs
 2017-02-15 11:29:55 -08:00
Seth Alves
1038e97c7f fix windows build 2017-02-15 11:14:23 -08:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
Dante Ruiz
e6853a9255 updated menu stack 2017-02-15 18:57:06 +00:00
Seth Alves
a19bc31a78 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 10:51:22 -08:00
Seth Alves
792c7ff51f PointerEvent will now relay keyboard modifiers 2017-02-15 10:41:56 -08:00
Zach Pomerantz
2e9217fb47 loosen audio memoization precondition 2017-02-15 13:36:03 -05:00
Zach Pomerantz
ed4f96eadd Merge pull request #9646 from zzmp/load/audio/packets-in 
log full i/o stats
 2017-02-15 13:32:48 -05:00
Faye Li
2388ec65fe Merge pull request #9659 from fayeli/users-fix 
Tablet Users Fixes
 2017-02-15 10:25:06 -08:00
Faye Li
8aae2aa5f0 simpler filter code 2017-02-15 10:23:36 -08:00
Faye Li
5ece3f1e1a use new users icon 2017-02-15 10:16:20 -08:00
Chris Collins
d1a236954b Merge pull request #9673 from zzmp/audio/threaded-decode 
Parallelize audio packet decoding in mixer
 2017-02-15 09:44:42 -08:00
Seth Alves
4aeed2093c Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 08:57:30 -08:00
Brad Hefta-Gaub
0cdcee33d8 Merge pull request #9677 from kunalgosar/logFilter 
Revamped Search Feature on Log Window
 2017-02-15 08:56:16 -08:00
David Kelly
e6969321ca fix for not properly filtering entity adds 2017-02-15 09:15:35 -07:00