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

50652 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
0582aca598 Merge pull request #9511 from kunalgosar/master 
change server to default to not auto-muting
 2017-01-26 10:59:50 -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
Brad Hefta-Gaub
5ada689ab7 Merge pull request #9497 from ctrlaltdavid/fix-clara-download 
Fix intermittent Clara.io download crashes
 2017-01-26 10:58:27 -08:00
Seth Alves
ad96a66c39 Merge pull request #9520 from sethalves/tablet-ui 
Users to USERS in button
 2017-01-26 10:23:56 -08:00
Seth Alves
68de5c9757 Users to USERS in button 2017-01-26 10:23:38 -08:00
Seth Alves
728d05a927 Merge pull request #9519 from sethalves/tablet-ui 
include tablet fbx with interface distribution rather than get it fro…
 2017-01-26 10:22:02 -08:00
Seth Alves
e2b1f4b2ab include tablet fbx with interface distribution rather than get it from s3 2017-01-26 10:20:46 -08:00
Andrew Meadows
5783db910b remove some unhelpful trace profiling data 2017-01-26 08:35:26 -08:00
Andrew Meadows
82f52b9658 fix bug: Avatar instance not getting deleted 2017-01-26 08:35:26 -08:00
Andrew Meadows
2264c29604 less magic 2017-01-26 08:35:26 -08:00
Andrew Meadows
0f09e60acd remove unhelpful comment 2017-01-26 08:35:26 -08:00
Andrew Meadows
01e14eec47 remove commented out cruft 2017-01-26 08:35:26 -08:00
Andrew Meadows
ac180758ad sort, optimize, and timebox process avatar updates 2017-01-26 08:35:26 -08:00
Andrew Meadows
d3dcc2b415 remove cruft: billboard option for Head::simulate() 2017-01-26 08:35:26 -08:00
Andrew Meadows
887707426e remove cruft: Head::getScalePivot() 2017-01-26 08:35:26 -08:00
Andrew Meadows
69a7b1ef76 move some stuff out of Avatar::simulate() 
call it explicity in AvatarManager::updateOtherAvatars()
 2017-01-26 08:35:26 -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
e363423992 compute priority of avatar and sort before update 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
44f5510a2a Merge pull request #9517 from howard-stearns/edit-entity-filter 
merge from master
 2017-01-25 19:23:08 -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
Faye Li
6a4a9bcb32 end of day commit 2017-01-25 17:53:32 -08:00
Faye Li
0a3a0e817e polling users and displaying user count 2017-01-25 17:36:50 -08:00
Seth Alves
fb01df1ab8 Merge pull request #9516 from sethalves/tablet-ui 
Tablet ui
 2017-01-25 17:24:36 -08:00
Seth Alves
9497b2b7c5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-25 17:16:12 -08:00
Seth Alves
129fe6ea49 dammit, emacs 2017-01-25 17:15:54 -08:00
Seth Alves
007a433537 Merge pull request #9515 from hyperlogic/tablet-ui 
Better legibility of tablet in 2D with small window sizes.
 2017-01-25 17:13:36 -08:00
howard-stearns
4437063a3a remove logging, now that we have error logging 2017-01-25 17:04:09 -08:00
howard-stearns
1c30da42af change placeholder text in settings 2017-01-25 17:01:07 -08:00
Faye Li
b5b781f4a5 tab content switching 2017-01-25 16:59:16 -08:00
Anthony J. Thibault
2af59630fb Better legibility of tablet in 2D with small window sizes. 2017-01-25 16:43:36 -08:00
Anthony J. Thibault
5eb7849a80 Support for Window.geometryChanged signal. 2017-01-25 16:43:35 -08:00
Seth Alves
0b2f7beaed Merge pull request #9514 from sethalves/tablet-ui 
fix some fallout from toolbar changes
 2017-01-25 16:33:56 -08:00
Seth Alves
204652514e fix some fallout from toolbar changes 2017-01-25 16:29:36 -08:00
Faye Li
5ad522668a tabs header for everyone and friends 2017-01-25 16:29:25 -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
Seth Alves
ad5c3f0b44 Merge pull request #9513 from sethalves/tablet-ui 
Tablet ui
 2017-01-25 15:58:29 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Seth Alves
bbe3f11fd7 Merge pull request #9506 from sethalves/tablet-ui-HUD-ui 
provide a way to switch mostly back to HUD-based ui
 2017-01-25 15:49:16 -08:00
Seth Alves
f382b541c7 merge from upstream 2017-01-25 15:42:33 -08:00
Seth Alves
888d326783 Merge pull request #9509 from druiz17/tabletBug 
removed more qml errors
 2017-01-25 15:41:07 -08:00
Seth Alves
10ecc271cf Merge pull request #9512 from fayeli/users-icon 
Tablet Button Improvements
 2017-01-25 15:40:42 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00