Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 16:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51490 commits 71 branches 56 tags 1.2 GiB
Commit graph

51490 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
f208f5e2d1 fix a couple of problems related to grabbing tablet while edit.js is active 2017-02-24 11:34:10 -08:00
Seth Alves
e43c4c17f5 in 2d mode, clicks on tablet don't get used for other things 2017-02-23 21:27:25 -08:00
Seth Alves
ce717d04e9 merge in tablet-as-overlay code 2017-02-23 18:40:20 -08:00
Seth Alves
610c20e01a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-23 17:41:38 -08:00
Seth Alves
c725393423 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-02-23 17:41:30 -08:00
Seth Alves
57ab2ba7ca Merge pull request #7 from fayeli/edit-js-create-tab 
Create Tab and Tab Bar QML Styling
 2017-02-23 17:40:48 -08:00
Seth Alves
d6428ee98c Merge pull request #6 from fayeli/tablet-edit-layout-fix 
fix overlapping issue with the delete button
 2017-02-23 17:40:15 -08:00
Chris Collins
e723385df2 Merge pull request #9726 from ZappoMan/avatarBandwidthBudgetImprovements 
Avatar bandwidth budget improvements
 2017-02-23 17:12:18 -08:00
Faye Li
c60360b6e0 particle explorer icon 2017-02-23 16:34:10 -08:00
Seth Alves
0a2a1b1637 include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet 2017-02-23 15:25:09 -08:00
Seth Alves
a286c72b3b cleanups 2017-02-23 15:12:45 -08:00
Seth Alves
4600d546c0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-23 14:56:06 -08:00
Seth Alves
9c0104a060 don't use Entities.getEntityProperties on tablet when it's an overlay 2017-02-23 14:55:52 -08:00
Faye Li
80c3c00398 switch to properties tab when you create an entity 2017-02-23 14:48:06 -08:00
Faye Li
d4ea0c116d asset server button 2017-02-23 14:36:39 -08:00
Brad Hefta-Gaub
1b7ec7d61e Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2017-02-23 13:50:16 -08:00
Brad Hefta-Gaub
1e91f74ce7 clean up some uneedded nullptr checks, make them asserts 2017-02-23 13:32:35 -08:00
Seth Alves
2c42309aaa perfer tablet over other overlays for mouse-clicks 2017-02-23 13:32:24 -08:00
Faye Li
3850bc35a9 icons on new entity buttons 2017-02-23 13:31:03 -08:00
Andrew Meadows
ed932fead5 Merge pull request #9611 from kunalgosar/AvatarEntityMapMetaObj 
Add QMetaObject for AvatarEntityMap
 2017-02-23 13:27:55 -08:00
Brad Hefta-Gaub
8cb8d686ec more cleanup and some CR feedback fixes 2017-02-23 13:09:39 -08:00
Chris Collins
57beeeefb9 Merge pull request #9739 from sethalves/stable-to-master-update 
Stable -> Master update
 2017-02-23 13:09:00 -08:00
Faye Li
bd834097d5 tab bar styling 2017-02-23 12:36:27 -08:00
Seth Alves
c765c8da73 pull stable into master 2017-02-23 11:57:32 -08:00
Faye Li
8e89e07732 text choose an entity type to create 2017-02-23 11:50:39 -08:00
Faye Li
88318c1911 create tab background and new entity buttons 2017-02-23 11:40:26 -08:00
Brad Hefta-Gaub
f61e16fccf more aggressive out of view data culling 2017-02-23 11:01:55 -08:00
kunalgosar
3af05ece7d Made QScript Object more JS friendly 2017-02-23 10:57:06 -08:00
kunalgosar
99e51e88ae Add QMetaObject for AvatarEntityMap 2017-02-23 10:57:06 -08:00
Seth Alves
84d9af14b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-23 10:40:18 -08:00
Brad Hefta-Gaub
dde9640c66 remove old full rate distance code 2017-02-23 10:29:17 -08:00
Chris Collins
de84e07281 Merge pull request #9714 from thoys/fix-recorder-js-playback 
Fix recorder.js playback in interface
 2017-02-23 09:59:37 -08:00
Thijs Wenker
5033e7be11 CR fixes 2017-02-23 18:22:36 +01:00
Seth Alves
37004e4347 steps toward making mouse work on tablet 2017-02-23 08:11:31 -08:00
Brad Hefta-Gaub
4f17498daf fix warning 2017-02-23 00:19:06 -08:00
Brad Hefta-Gaub
d4adee8b38 add over bandwidth exit to sorted avatar loop 2017-02-23 00:15:07 -08:00
Brad Hefta-Gaub
40037bee55 added some stats for the random drops 2017-02-22 23:28:40 -08:00
Brad Hefta-Gaub
06f0087459 wire up radius properly 2017-02-22 22:36:37 -08:00
Brad Hefta-Gaub
edf7c016a1 more cleanup 2017-02-22 22:06:28 -08:00
Brad Hefta-Gaub
4c4506b1f7 some cleanup 2017-02-22 21:47:40 -08:00
Seth Alves
41ef7b8dbb add setting to control if tablet is an entity or overlay 2017-02-22 21:13:42 -08:00
Seth Alves
4a778b9113 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-22 20:39:47 -08:00
Seth Alves
1b26c3469f fix signed/unsigned joint index problem 2017-02-22 20:39:34 -08:00
Seth Alves
84f95e6776 oops 2017-02-22 19:18:42 -08:00
Seth Alves
b4be942348 trying to get tablet overlay to show up in the right place 2017-02-22 19:18:03 -08:00
Chris Collins
b295a146e0 Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight 
More consistent highlights/toggle for toolbar buttons
 2017-02-22 18:07:38 -08:00
Brad Hefta-Gaub
10f465f8ea Merge pull request #8 from AndrewMeadows/avatarBandwidthBudgetImprovements 
count avatar joint updates and non-updates
 2017-02-22 17:53:15 -08:00
Seth Alves
273f0130f3 fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug. 2017-02-22 17:43:09 -08:00
Andrew Meadows
6ac33dbf61 count avatar joint updates and non-updates 2017-02-22 17:23:36 -08:00
Seth Alves
bcf1f9ab4c Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-22 16:50:29 -08:00