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

20685 commits

Author SHA1 Message Date
howard-stearns
93414d802d fetch entity filter script asynchronously (but reject edits while waiting) 2017-01-30 11:06:36 -08:00
Thijs Wenker
a2da1e3dc1 Merge branch 'master' into fix-ac-playback-audio 2017-01-27 21:00:57 +01:00
Bradley Austin Davis
8d45f43ba8 Disable sparse textures 2017-01-27 10:06:31 -08:00
Chris Collins
5ed376afc9 Merge pull request #9257 from ZappoMan/tuneAvatarInfo 
avatar mixer bandwidth optimization
 2017-01-26 17:33:57 -08:00
Thijs Wenker
cdc0f3ddd2 - make AC recording audio play with right encoding 
- spelling fix
 2017-01-27 01:19:11 +01:00
Howard Stearns
866f9debcd Merge pull request #9526 from highfidelity/edit-entity-filter 
Edit entity filter (from branch)
 2017-01-26 16:00:48 -08:00
ZappoMan
af426063ac fix bad merge 2017-01-26 15:19:25 -08:00
ZappoMan
4c80422a73 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 14:34:58 -08:00
samcake
19858bda78 Merge pull request #9493 from AndrewMeadows/otherAvatars 
optimize, prioritize, and timebox processing of avatar updates
 2017-01-26 13:30:51 -08:00
samcake
52cbac0018 Merge pull request #9510 from jherico/sparse_size_estimation 
Attempt to account for sparse texture memory overhead
 2017-01-26 12:59:15 -08:00
Brad Hefta-Gaub
0c9e42e2d9 Merge pull request #9486 from huffman/fix/overlay-parent-reg-point 
Fix Overlay-as-child of model entity with reg point
 2017-01-26 10:59:01 -08:00
Andrew Meadows
b8afc87ad9 remove cruft 2017-01-26 08:35:26 -08:00
Andrew Meadows
e65d9309b3 remove cruft: Avatar::setShouldDie() 2017-01-26 08:35:26 -08:00
Andrew Meadows
09707217ec remove Model::simulateInternal() 2017-01-26 08:35:25 -08:00
Andrew Meadows
d8a10320d1 fix warning about implicit cast 2017-01-26 08:35:25 -08:00
Andrew Meadows
88bf126168 remove old avatar culling and LOD logic 2017-01-26 08:35:25 -08:00
Andrew Meadows
08bba5f45f add and remove some profile data points 2017-01-26 08:35:25 -08:00
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
Howard Stearns
f36b968860 Merge branch 'edit-entity-filter' into entity-filter-resource 2017-01-25 19:39:12 -08:00
Howard Stearns
a1afbe7d5e Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter 2017-01-25 19:16:29 -08:00
howard-stearns
4437063a3a remove logging, now that we have error logging 2017-01-25 17:04:09 -08:00
howard-stearns
9cbc4fd1b9 Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource 2017-01-25 16:23:52 -08:00
howard-stearns
b62f3e550a error check/log on execution, too 2017-01-25 16:23:07 -08: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
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -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
Bradley Austin Davis
70664b64eb Attempt to account for sparse texture memory overhead 2017-01-25 10:59:49 -08:00
Ryan Huffman
9e4f47d57f Update AvatarData to use the default parent joint index 2017-01-25 09:08:54 -08: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
Stephen Birarda
586c3512a7 remove useless additional includeThisEntity sets 2017-01-24 17:35:45 -08:00
Atlante45
b4400af026 Rename Steam.isRunning to Steam.running 2017-01-24 17:06:50 -08:00
Stephen Birarda
69b47dcf50 use currentParameters instead of getJSONParameters() 2017-01-24 16:49:17 -08:00
Stephen Birarda
67a3d97f81 cleanup includeThisEntity check 2017-01-24 16:41:20 -08:00
Stephen Birarda
543d0ce77e add a comment about usesFrustum check in EntityTreeElement 2017-01-24 16:36:44 -08:00
Stephen Birarda
33378ede5c force full scene send if json parameters changed 2017-01-24 16:34:57 -08:00
Atlante45
808d336fe6 Protect again empty plugin 2017-01-24 16:17:49 -08:00
howard-stearns
8eff3b1e83 restructure initialization so that server can do server-like things to get 
the filter program from file
 2017-01-24 16:14:41 -08:00
Atlante45
b4d3a2b79f Fix member not being set 2017-01-24 16:13:28 -08:00
Stephen Birarda
5a3f99a504 Merge pull request #9479 from birarda/bug/whitelist-starts-with 
use host check for entity script whitelist instead of startsWith
 2017-01-24 15:21:25 -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
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
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
Stephen Birarda
9229a07f6a avoid failing scheme check 2017-01-23 16:46:59 -08:00
ZappoMan
0655b47dd7 fix warnings 2017-01-23 16:44:55 -08:00