Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 01:16:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51434 commits 74 branches 59 tags 1.2 GiB
Commit graph

51434 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
a137659a35 Cleaning up pr for simpler merge 2017-02-08 11:13:55 -08:00
Clément Brisset
91bfa65fe2 Merge pull request #9586 from Triplelexx/21146 
21146
 2017-02-08 11:07:27 -08:00
Dante Ruiz
7db86204d1 general function to load QML for javascript for tablet 
(cherry picked from commit b50e20c545)
 2017-02-08 10:25:11 -08:00
David Kelly
c08adc9faa and the new filter class 2017-02-08 10:51:28 -07:00
David Kelly
4821180dd3 Just add a pointer to the filter class 
but do nothing with it
 2017-02-08 10:48:26 -07:00
David Kelly
61e558e568 Entity Edit Filters for zones 
Part 1 - just put them in the zones entities.  Next I'll hook them
up and actually filter...
 2017-02-08 09:53:25 -07:00
Philip Rosedale
4554d8ba68 Merge pull request #9630 from TopRamenGod/21138 
CR for Job #21138 Make jumping easier in the Vive
 2017-02-08 08:11:04 -08:00
Seth Alves
47976406fc Merge pull request #9607 from hyperlogic/bug-fix/better-haptics 
More consistent haptics on web overlays and entities
 2017-02-08 05:47:05 -08:00
Anthony J. Thibault
244437d971 set WANT_DEBUG_STATE back to false 2017-02-07 23:50:06 -08:00
Seth Alves
e1a3b0c551 Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos 
In desktop mode create tablet near mouse click location.
 2017-02-07 19:51:05 -08:00
mike
6cba2049dd Made jumping easier on the Vive 2017-02-07 19:46:16 -08:00
Anthony J. Thibault
cb58c567b8 In desktop mode create tablet near mouse click location. 
But prevent the tablet from being displayed off screen.
 2017-02-07 18:18:34 -08:00
samcake
7b49f548ed trying to remove the 24bits formats 2017-02-07 18:06:49 -08:00
Howard Stearns
811f8d9c1d Merge pull request #9627 from howard-stearns/pal-performance 
PAL performance
 2017-02-07 16:54:22 -08:00
howard-stearns
2e88f1ab1f conserving audio interval 2017-02-07 16:21:14 -08:00
howard-stearns
23fc9b6fb3 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-performance 2017-02-07 16:00:08 -08:00
howard-stearns
3bd11978aa low-hanging fruit on pal performance 2017-02-07 15:59:38 -08:00
Seth Alves
d75512f680 Merge pull request #9619 from birarda/bug/domain-settings-save-row 
fix for default value insertion in domain server settings
 2017-02-07 15:40:30 -08:00
Seth Alves
90fa8bf572 Merge pull request #9612 from druiz17/users 
some tweaks to users and menus got tablet
 2017-02-07 15:38:43 -08:00
Clément Brisset
eb0a316b6f Merge pull request #9604 from hyperlogic/feature/allow-multiple-instances 
Allow multiple instances to run if environment variable is set
 2017-02-07 15:32:31 -08:00
Howard Stearns
628ce1cf4f Merge pull request #9624 from howard-stearns/update-summon-crowd 
update crowd-agent and summon for bubble, avatar-mixer optimizations.
 2017-02-07 14:05:24 -08:00
Triplelexx
e7244b47a9 increase LETTER_OFFSET value 
allow more room for characters, could be improved by detecting each one
 2017-02-07 21:55:55 +00:00
Zach Pomerantz
553fffd8ae time mix instead of throttle with HIFI_AUDIO_MIXER_DEBUG 2017-02-07 21:49:23 +00:00
howard-stearns
9a44f63b74 update crowd-agent and summon for bubble, avatar-mixin optimizations. 2017-02-07 13:14:15 -08:00
samcake
2975f73fc9 merging 2017-02-07 13:13:21 -08:00
samcake
24a3a514a4 Merge pull request #9594 from AndrewMeadows/cap-fbx-texture-size 
Cap fbx texture size
 2017-02-07 12:46:22 -08:00
Zach Pomerantz
ee699d3fa6 Revert 'use tbb::atomic for cp' 2017-02-07 20:40:06 +00:00
Anthony J. Thibault
7d630f6c9a Added Mat4.createFromColumns 2017-02-07 12:03:28 -08:00
Anthony J. Thibault
2952be5fc8 Added MouseX and MouseY axes to Keyboard device. 2017-02-07 12:02:41 -08:00
Zach Pomerantz
5e9fb17949 use tbb::atomic for cp 2017-02-07 15:01:23 -05:00
Zach Pomerantz
ad7c01e86e modularize audio ignore zone computations 2017-02-07 15:01:22 -05:00
Zach Pomerantz
308e3cab71 fix memoized ignoreZone assertion for initialization 2017-02-07 15:01:22 -05:00
Zach Pomerantz
d42b6a64c4 use threadsafe map for audio node ignore cache 2017-02-07 15:01:22 -05:00
Zach Pomerantz
4bcc9d3072 bail audio mix if node is not initialized 2017-02-07 15:01:22 -05:00
Zach Pomerantz
093f748d7d make auto stream explicit 2017-02-07 15:01:22 -05:00
Zach Pomerantz
e7cf84324b abstract audio ignore caching 2017-02-07 15:01:22 -05:00
Zach Pomerantz
207d2e78f0 fix should ignore opts 2017-02-07 15:01:21 -05:00
Zach Pomerantz
310c8b18ee add caching over symmetric nodes for audio shouldIgnore 2017-02-07 15:01:21 -05:00
Zach Pomerantz
8a42755e8f mv shouldIgnore from AudioMixerSlave to ClientData 2017-02-07 15:01:21 -05:00
Zach Pomerantz
3c1cf504d0 rename getIgnoreBox to getIgnoreZone to prevent confusion 2017-02-07 15:01:21 -05:00
Zach Pomerantz
9bcc5c95b4 reduce stream lock usage in AudioMixerClientData::getIgnoreBox 2017-02-07 15:01:21 -05:00
Zach Pomerantz
569ae113a0 memoize audio ignore box in AudioMixerClientData 2017-02-07 15:01:21 -05:00
Zach Pomerantz
ff56eb24c8 Merge pull request #9537 from zzmp/audio/throttle-filter 
Add injector/avatar attenuation to audio-mixer throttling
 2017-02-07 20:57:43 +01:00
David Kelly
9788b4bdaf Merge pull request #9601 from davidkelly/dk/deadlockPrevention 
Minor cleanup
 2017-02-07 12:56:03 -07:00
Ryan Huffman
534d3c581c Update EntityEditSender PPS to be 3000 in ESS 2017-02-07 11:50:44 -08:00
Chris Collins
4ae46c7cd7 Merge pull request #9600 from highfidelity/RC-33 
Beta Release 33 - Includes up to Developer Release 5990
 2017-02-07 10:55:13 -08:00
Andrew Meadows
6d1d36e0f0 fix for bad merge around cauterizedClusterMatrices 2017-02-07 10:22:43 -08:00
Brad Davis
d1fc30435b Merge remote-tracking branch 'upstream/stable' into RC-33 
Conflicts:
	libraries/render-utils/src/MeshPartPayload.cpp
	libraries/render-utils/src/MeshPartPayload.h
	scripts/system/controllers/handControllerGrab.js
 2017-02-07 09:31:41 -08:00
Seth Alves
725917af0d send UserActivityLogger events when tablet is opened or closed 2017-02-07 09:12:30 -08:00
Brad Hefta-Gaub
0fb9ef947a Merge pull request #9618 from druiz17/snapshot 
Remove duplicate snapshot settings in general settings and avatar settings
 2017-02-07 08:53:38 -08:00