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

50652 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
42083a1a6d Merge pull request #9457 from Atlante45/entity-script-server 
Entity script server
 2017-01-25 15:37:27 -08:00
Faye Li
6f46136699 reorder buttons to match mockup 2017-01-25 15:02:55 -08:00
howard-stearns
34e9c5debc initial script error checking 2017-01-25 14:56:06 -08:00
Faye Li
49a8964c4e reference new users icon art 2017-01-25 14:43:39 -08:00
Faye Li
ce0ee610ea a test on polling friends 2017-01-25 14:32:36 -08:00
howard-stearns
df91ef5f5f blocking fetch of http scripts 2017-01-25 14:22:42 -08:00
Seth Alves
98f1664a46 use a setting to decide which UI is enabled 2017-01-25 14:17:45 -08:00
Dante Ruiz
6671d7f9e6 removed some unnessary menu item 2017-01-25 21:23:04 +00:00
Clément Brisset
3f34a9e832 Merge pull request #40 from birarda/entity-script-server 
hack to accept possibly newer server scripts
 2017-01-25 13:21:45 -08:00
Zach Pomerantz
fb31254f57 add proportional term to audio-mixer throttling controller 2017-01-25 21:18:03 +00:00
Zach Pomerantz
46afa7e764 DRY audio-mixer all-stream mixes 2017-01-25 21:18:03 +00:00
Zach Pomerantz
1153c1900f reorder AudioMixerSlave::prepareMix to be sequential 2017-01-25 21:18:03 +00:00
Zach Pomerantz
66c82f3193 clean AudioMixerSlave::addStreamToMix 2017-01-25 21:18:03 +00:00
Zach Pomerantz
6cfaa624a5 mv helpers from AudioMixerSlave 2017-01-25 21:18:03 +00:00
Stephen Birarda
11005bdc55 Merge pull request #41 from Atlante45/ess-pr 
Merge branch 'master' of https://github.com/highfidelity/hifi into es…
 2017-01-25 13:14:03 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
kunalgosar
7b896f961b change server to default to not auto-muting 2017-01-25 13:00:57 -08:00
Ryan Downe Karpf
b053fb55aa Merge pull request #9478 from birarda/bug/too-many-casts 
some reinterpret/dynamic cast cleanup in domain-server
 2017-01-25 12:47:27 -08:00
Stephen Birarda
304618f51d cleanup comment and scoping for server script URL changes 2017-01-25 12:39:41 -08:00
Stephen Birarda
f1b4f79ad9 a simple hack to accept newer server scripts 2017-01-25 12:39:41 -08:00
Seth Alves
f18094f565 make use of tablet or HUD depend on a single variable. avoid some duplicated code 2017-01-25 12:00:34 -08:00
Faye Li
f02b2ef40a auto poll users when page loads 2017-01-25 11:59:31 -08:00
Faye Li
c7a0e609fc created a friends button for metaverse friends page 2017-01-25 11:41:07 -08:00
Zach Pomerantz
9bdea98d21 clean AudioMixerSlave::mix 2017-01-25 19:24:12 +00:00
Zach Fox
fc18df4942 Merge pull request #9504 from zfox23/FILTERS_ZoneFilter 
ENTITY FILTERS: "Zone Filter"
 2017-01-25 11:04:33 -08:00
Bradley Austin Davis
70664b64eb Attempt to account for sparse texture memory overhead 2017-01-25 10:59:49 -08:00
Zach Pomerantz
275e337a80 rm unused LOUDNESS_TO_DISTANCE_RATIO 2017-01-25 18:55:54 +00:00
Dante Ruiz
0d7f15e41b removed more qml errors 2017-01-25 18:22:28 +00:00
Seth Alves
11d01a0c00 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-HUD-ui 2017-01-25 09:42:59 -08:00
Ryan Huffman
f165e364e2 Merge pull request #39 from huffman/entity-script-server 
Remove entity server script status log spam from edit.js
 2017-01-25 09:33:25 -08:00
Ryan Huffman
2bb7a7a4a6 Remove entity server script status log spam from edit.js 2017-01-25 09:32:25 -08:00
Seth Alves
7d370fb791 Merge pull request #9507 from cozza13/tablet-ui 
Changes to tablet formatting
 2017-01-25 09:29:16 -08:00
Seth Alves
4c8e90533b Merge pull request #9508 from druiz17/tabletBug 
fixed tablet bug when reloading scripts
 2017-01-25 09:28:50 -08:00
Ryan Huffman
9e4f47d57f Update AvatarData to use the default parent joint index 2017-01-25 09:08:54 -08:00
Dante Ruiz
c811839163 tablet is not selectable in edit mode 2017-01-25 16:46:17 +00:00
Ryan Huffman
d607e74d3c Merge pull request #9501 from Atlante45/fix/steam-api 
Fix Steam scripting interface calls
 2017-01-25 08:21:02 -08:00
Dante Ruiz
bc75cf5bed removed tabs 2017-01-25 16:11:37 +00:00
Dante Ruiz
bda8b65e79 fixing spaceing 2017-01-25 16:06:40 +00:00
Dante Ruiz
a147ce3f5f fixed load script issue 2017-01-25 08:00:41 -08:00
Dante Ruiz
096b2e876f removing qml null print error 2017-01-25 08:00:40 -08:00
Chris Collins
df9bfa6eff Changes to tablet formating 
Changes to QML and .js formating to match style of mockup.
 2017-01-25 07:41:04 -08:00
David Rowe
74b878a276 Fix threading of message box updates 2017-01-25 17:48:58 +13:00
David Rowe
dcd632013f Better variable name 2017-01-25 16:37:35 +13:00
David Rowe
7e56d0fae6 Fix up Clara.io error handling 2017-01-25 16:36:06 +13:00
Seth Alves
4335bbe4fe provide a way to switch mostly back to HUD-based ui 2017-01-24 18:48:11 -08:00
Clément Brisset
5cd0af9136 Merge pull request #37 from birarda/entity-script-server 
fix interest list checks, remove unecessary sets
 2017-01-24 18:46:26 -08:00
Stephen Birarda
cd1ddd3a3a Merge pull request #38 from Atlante45/ess-pr 
Fix wrong status when removing script
 2017-01-24 18:44:05 -08:00
Atlante45
9cacde2416 Fix wrong status when removing script 2017-01-24 18:36:27 -08:00
Stephen Birarda
9b8cbba53f add isInInterestSet to DomainServer for extra checks 2017-01-24 18:32:33 -08:00
Stephen Birarda
586c3512a7 remove useless additional includeThisEntity sets 2017-01-24 17:35:45 -08:00