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

23412 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
1e1a277065 Scrollbar bar height varies with percentage of users displayed 2015-03-26 12:22:24 -07:00
David Rowe
98c88aab04 Handle no users able to be displayed, insufficient screen height 2015-03-26 12:22:23 -07:00
David Rowe
ba1a7c6761 Show/hide scrollbar depending on whether needed or not 2015-03-26 12:22:23 -07:00
David Rowe
567375368e Show first N users that can fit 2015-03-26 12:22:22 -07:00
David Rowe
8e66f5998a Add scrollbar background and bar 2015-03-26 12:22:21 -07:00
David Rowe
7c4ea855a8 Limit height of users window per screen space available 2015-03-26 12:22:20 -07:00
Philip Rosedale
6925de468a Merge pull request #4511 from ZappoMan/LODUITweaks 
More LOD Tweaks
 2015-03-26 01:21:22 -07:00
ZappoMan
9e34dda7c9 Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks 2015-03-25 16:54:37 -07:00
Brad Hefta-Gaub
918154e407 Merge pull request #4491 from huffman/export-json 
Update export entities to export as JSON
 2015-03-25 16:49:23 -07:00
ZappoMan
c031ce15a7 dead code 2015-03-25 16:45:51 -07:00
ZappoMan
19feeacc51 dead code 2015-03-25 16:38:57 -07:00
Philip Rosedale
da779fa0ef Merge pull request #4510 from birarda/new-entry 
use the new place 'entry' as entry point
 2015-03-25 16:38:08 -07:00
Philip Rosedale
4cfa4ada92 Merge pull request #4508 from huffman/right-click-marketplace 
Right click marketplace menu
 2015-03-25 16:36:23 -07:00
Philip Rosedale
29b9212259 Merge pull request #4501 from Atlante45/light_types 
Light types
 2015-03-25 16:34:05 -07:00
Philip Rosedale
0c85881908 Merge pull request #4504 from huffman/disable-duplicate-on-locked-entity 
Disable duplicate on locked entity
 2015-03-25 16:31:49 -07:00
ZappoMan
f46067b634 better tracking of being done with downshifting 2015-03-25 16:30:33 -07:00
Clément Brisset
b81e89ad3d Merge pull request #4488 from ctrlaltdavid/20407 
CR for 20407 - Make Sixense emulate mouse only if controllers aren't at the base
 2015-03-26 00:24:17 +01:00
ZappoMan
68e730af45 handle throttle render case and clean up code logic to be more obvious 2015-03-25 15:48:50 -07:00
Stephen Birarda
ef0281ab43 use the new placename entry as entry point 2015-03-25 15:30:03 -07:00
Seth Alves
c0b1ff4a57 Merge pull request #4500 from AndrewMeadows/inertia 
avatar can jump when using CharacterController
 2015-03-25 14:48:54 -07:00
Ryan Huffman
1c0e7e26a2 Merge pull request #4507 from birarda/friends-only-location 
make friends-only discoverability mode work as described
 2015-03-25 13:48:08 -07:00
Stephen Birarda
f075674415 Merge pull request #4502 from huffman/webwindow-open-url 
Add more functionality to WebWindow (get/set url, raise)
 2015-03-25 13:25:29 -07:00
ZappoMan
0c2a630a59 Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks 2015-03-25 12:51:21 -07:00
ZappoMan
ec2b11640c more tweaks to LOD logic 2015-03-25 12:51:13 -07:00
Ryan Huffman
b5b1c5a90b Remove extraneous print 2015-03-25 12:30:42 -07:00
Ryan Huffman
b8174b164f Update marketplace popup to hide on position or orientation change 2015-03-25 12:30:00 -07:00
Ryan Huffman
d07acfe9ac Add right-click marketplace popup 2015-03-25 12:29:38 -07:00
Ryan Huffman
8eed2b6603 Add PopupMenu to edit.js 2015-03-25 12:28:56 -07:00
Ryan Huffman
ea3ec91f71 Remove inspect tool from edit.js 2015-03-25 12:27:15 -07:00
Stephen Birarda
c40909cec5 Merge pull request #4506 from murillodigital/master 
More .com changes
 2015-03-25 12:06:23 -07:00
Leonardo Murillo
d1d183e190 More .com changes 2015-03-25 13:05:10 -06:00
Stephen Birarda
7a9c1e20ab use new AccountManager API in DiscoverabilityManager 2015-03-25 12:04:47 -07:00
Stephen Birarda
4bf8e9f625 change AccountManager request API, leverage in networking and DS 2015-03-25 12:04:04 -07:00
Stephen Birarda
78ebc3fde6 Merge pull request #4505 from murillodigital/master 
Switching to .com
 2015-03-25 11:54:49 -07:00
Stephen Birarda
89e5fef808 send friends_only key for discoverability 2015-03-25 11:46:08 -07:00
Leonardo Murillo
c3c1d4a5ae Switching to .com 2015-03-25 12:36:37 -06:00
Philip Rosedale
f90580b7ee Merge pull request #4503 from samcake/orange 
Putting the GLERRORCHECK only in debug
 2015-03-25 11:29:19 -07:00
Ryan Huffman
5b4b78043a Remove unneeded print messages 2015-03-25 11:22:28 -07:00
Ryan Huffman
dec89ba96f Disable duplicating locked entities 2015-03-25 11:22:07 -07:00
Sam Gateau
045dbb11a3 Putting the GLERRORCHECK only in debug 2015-03-25 11:07:19 -07:00
Andrew Meadows
2440c47648 remove extra whitespace 2015-03-25 11:06:19 -07:00
Andrew Meadows
2128f21308 only set ADD bit with UPDATE_SHAPE when enabled 2015-03-25 11:02:48 -07:00
Ryan Huffman
bb4417acc6 Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url 2015-03-25 10:49:24 -07:00
Atlante45
715fe1096f Random but persistant switch sound 2015-03-25 17:33:27 +01:00
Andrew Meadows
674b2c97a2 added comments to zlib license 2015-03-25 08:53:33 -07:00
Atlante45
725a8795fb Merge branch 'master' of https://github.com/highfidelity/hifi into light_types 2015-03-25 16:39:11 +01:00
Atlante45
19886bd33c Better handling of callback 2015-03-25 16:38:27 +01:00
Atlante45
afb96709f1 Only update userData when light entity is identified 2015-03-25 15:44:37 +01:00
Atlante45
92d3944044 Use preOp function for all common checks/updates 2015-03-25 15:04:06 +01:00
Clément Brisset
e6ac502fb5 Merge pull request #4497 from huffman/update-edit-help 
Update edit help
 2015-03-25 14:09:22 +01:00