Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 16:16:41 +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
Seth Alves
990c7e6b28 Merge pull request #9498 from hyperlogic/tablet-ui 
Added username to tablet header
 2017-01-24 15:19:16 -08:00
Faye Li
71b6096644 toggle menu item 2017-01-24 15:12:46 -08:00
Zach Fox
463bff6750 Merge pull request #9496 from zfox23/FILTERS_NoModelChange_VelocityClamp 
ENTITY FILTERS: "Can't change model" & "Can't exceed velocity X"
 2017-01-24 15:09:04 -08:00
Zach Fox
9796a476ea Clamp negative velocity too 2017-01-24 15:08:17 -08:00
Faye Li
5bed68ac4c button toggle 2017-01-24 14:56:58 -08:00
Faye Li
95a92fc5eb added tablet button 2017-01-24 14:42:28 -08:00
Anthony J. Thibault
bff0eeef75 Added username to tablet header 2017-01-24 14:31:57 -08:00
ZappoMan
8c2c05719a fix warning 2017-01-24 14:21:47 -08:00
Stephen Birarda
bd340f99ce Merge pull request #35 from huffman/entity-script-server 
Fix bad ctor call causing build failure
 2017-01-24 14:17:51 -08:00
Ryan Huffman
f6a037339f Fix bad ctor call causing build failure 2017-01-24 14:00:55 -08:00
David Rowe
1b05ae8a82 Make handling of Clara.io download-ready state transition more robust 2017-01-25 11:00:07 +13:00
Howard Stearns
559051beca Merge pull request #9495 from howard-stearns/bypass-filter-with-lock-rights 
bypass entity-server edit filter if you have lock/unlock rights
 2017-01-24 13:38:27 -08:00
Zach Pomerantz
997c015b7f start audio-mix timestamp now 2017-01-24 21:30:07 +00:00
Zach Pomerantz
2bc725e2be change audio-mixer throttling to integral-based linear throttle/backoff 2017-01-24 21:30:05 +00:00
Zach Pomerantz
b028d84aab fix audio-mixer sleep 2017-01-24 21:29:20 +00:00
Zach Pomerantz
09f41bff00 improve audio-mixer timings 2017-01-24 21:29:20 +00:00
Zach Fox
53173d8f03 use var for maxvelocity 2017-01-24 12:50:18 -08:00
Seth Alves
19cf84dd5d Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto 2017-01-24 12:49:47 -08:00
ZappoMan
1309af6d7a CR feedback 2017-01-24 12:47:47 -08:00
ZappoMan
b3eb87e8db Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-24 12:22:20 -08:00
ZappoMan
44b8a57ed3 more CR feedback 2017-01-24 12:18:33 -08:00
howard-stearns
c25072c1db Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-24 12:15:39 -08:00
Zach Fox
0e16686fb8 Change the velocity filter to 5 2017-01-24 12:11:33 -08:00
ZappoMan
cb812ca506 CR feedback 2017-01-24 12:06:31 -08:00
ZappoMan
8b662647bd CR feedback 2017-01-24 12:01:57 -08:00
howard-stearns
da914f0a4f bypass entity-server edit filter if you have lock/unlock rights 2017-01-24 11:59:31 -08:00
Zach Fox
3a17a64c99 V1 of these filters 2017-01-24 11:56:50 -08:00
Stephen Birarda
9282f5555a Merge pull request #34 from Atlante45/ess-pr 
Temporarily remove AvatarList from EntityScriptServer
 2017-01-24 11:53:13 -08:00
Clément Brisset
c8e27ec31b Merge pull request #19 from huffman/feat/script-context 
Add the ability to get the context that a script is running in
 2017-01-24 11:52:35 -08:00
Atlante45
e54e35fbbe Temporarily remove AvatarList from EntityScriptServer 2017-01-24 11:49:54 -08:00
Anthony J. Thibault
d2f024e84d Fix for "ReferenceError: globalPosition is not defined" warning 2017-01-24 11:40:20 -08:00
Seth Alves
e0779db1ab Merge pull request #9494 from sethalves/tablet-ui 
fix near-grab to equip handoff
 2017-01-24 11:39:56 -08:00
Seth Alves
df9bc91f01 fix near-grab to equip handoff 2017-01-24 11:39:26 -08:00
Seth Alves
4de0b94b6c Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto 2017-01-24 09:42:20 -08:00
Seth Alves
a28becfb1a close tablet before changing domains 2017-01-24 09:42:12 -08:00
Ryan Huffman
fcaca8930a Fix enum name in EntityScriptServer 2017-01-24 08:31:58 -08:00
Seth Alves
48898f41b2 Merge pull request #9491 from hyperlogic/tablet-ui 
Tablet Help and Goto Buttons bug fixes.
 2017-01-23 20:04:10 -08:00
Anthony J. Thibault
432bb27119 The tablet Help button should be active if window is visible 2017-01-23 18:37:08 -08:00
Anthony J. Thibault
e30d77eba1 Tablet goto button now properly tracks address bar shown state 2017-01-23 18:37:07 -08:00
Zach Pomerantz
39acba5455 throttle audio streams by count using PI controller 2017-01-23 21:30:41 -05:00
Seth Alves
353b38286a Merge pull request #9490 from hyperlogic/tablet-ui 
For for Tablet Tilt and Oculus Touch A B buttons sending UINav events
 2017-01-23 18:14:53 -08:00
Howard Stearns
f3956b3fb0 Merge pull request #9477 from howard-stearns/minimum-edit-entity-filter 
Minimum edit entity filter
 2017-01-23 18:04:52 -08:00
Anthony J. Thibault
0ab956a0c1 A and B buttons on oculus touch no longer trigger UI Nav events 2017-01-23 17:08:25 -08:00
Stephen Birarda
479aa93ab2 Merge pull request #9480 from birarda/bug/web-entity-safe-url 
cleanup debug for safe web entity URLs
 2017-01-23 16:53:07 -08:00
Brad Hefta-Gaub
e4c59472ee Merge pull request #9468 from kencooke/audio-mixformat-float 
Fix another audio failure
 2017-01-23 16:52:54 -08:00
Seth Alves
e3717f0fc5 Merge pull request #9489 from sethalves/tablet-ui 
Tablet ui
 2017-01-23 16:51:22 -08:00
Seth Alves
3496e4cc7a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 16:50:41 -08:00
Seth Alves
9bf4cd7b8a Merge pull request #9488 from sethalves/tablet-ui-close-tablet-upon-goto 
Tablet ui close tablet upon goto
 2017-01-23 16:50:12 -08:00
Seth Alves
281b7a6eca close tablet anytime AddressManager::hostChanged fires 2017-01-23 16:49:05 -08:00
Stephen Birarda
9229a07f6a avoid failing scheme check 2017-01-23 16:46:59 -08:00