Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 09:52:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23685 commits 75 branches 59 tags 1.2 GiB
Commit graph

23685 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
0035e8df88 merge 2015-03-26 15:17:14 -07:00
Andrew Meadows
8a951e0dd3 minor cleanup 2015-03-26 15:16:57 -07:00
Andrew Meadows
0ef4022e94 tweak gravity and step heights of controller 2015-03-26 15:14:46 -07:00
Stephen Birarda
42a0f719d8 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-26 14:10:41 -07:00
Stephen Birarda
eea4c56547 use TBB release libraries for apple external project 2015-03-26 14:03:25 -07:00
Leonardo Murillo
f3c9e8cd26 Merge pull request #4494 from birarda/master 
update version of TBB external project
 2015-03-26 14:32:36 -06:00
Andrew Meadows
858dbeb674 remove one line of cruft 2015-03-26 13:23:15 -07:00
Andrew Meadows
9c6ea7380f merge 2015-03-26 13:20:51 -07:00
Seth Alves
212f564131 Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-26 13:08:44 -07:00
David Rowe
ef9d665146 Highlight scrollbar when it is being moved 2015-03-26 12:22:27 -07:00
David Rowe
876f3e8a23 Scroll when click above or below bar 2015-03-26 12:22:26 -07:00
David Rowe
c7fe7aa157 Update users displayed per scrollbar position 2015-03-26 12:22:26 -07:00
David Rowe
14e92eecad Click and drag scrollbar 2015-03-26 12:22:25 -07:00
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
Stephen Birarda
5f633a6b24 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-26 11:45:46 -07:00
Atlante45
c26b499671 Add forgotten include 2015-03-26 15:58:18 +01:00
Atlante45
716e9bfe4f Hint order for FST files 2015-03-26 15:40:48 +01:00
Seth Alves
0d4b0ad11e Merge branch 'multi-hull-collisions' of github.com:sethalves/hifi into vhacd-knobs 2015-03-26 06:37:35 -07:00
Seth Alves
7c4ada9953 multiply points from fbs meshes by their transformation matrices 2015-03-26 06:37:05 -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
923951143c comment out line that's killing cmake for me 2015-03-25 15:21:53 -07:00
Seth Alves
a3a54e8d7d style 2015-03-25 15:21:36 -07:00
Seth Alves
dd9290bd59 clear points for non-hull shapes 2015-03-25 15:21:28 -07:00
Seth Alves
c68f5dd1fa added various controls for the convex hull generator 2015-03-25 15:13:40 -07:00
Andrew Meadows
48d4647a1b merge upstream/master into andrew/inertia 2015-03-25 15:06:02 -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
Andrew Meadows
429a258df0 enable hover when far above floor 2015-03-25 14:38:27 -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