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

22839 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
d071bc50a4 Change from paragraph of usernames to single column of usernames 2015-03-10 17:20:08 -07:00
David Rowe
4e8fcd47c0 Show/hide users window with menu item 2015-03-10 13:51:25 -07:00
David Rowe
59762175e4 Grow/shrink window as size of users list changes 2015-03-10 12:44:34 -07:00
David Rowe
a4fe9c1a12 Click on username to TP to them 2015-03-10 12:32:48 -07:00
David Rowe
abb62fd8f9 Fix typo found in passing 2015-03-10 10:57:48 -07:00
David Rowe
63d8da0233 Display user names in 2D window 2015-03-10 10:57:47 -07:00
David Rowe
d25d3bc6ab Get users online from Web API 2015-03-10 10:57:46 -07:00
Andrew Meadows
a758ccd75a Merge pull request #4402 from birarda/master 
add underlying controls for user discoverability
 2015-03-10 08:30:46 -07:00
Brad Hefta-Gaub
d662c30405 Merge pull request #4403 from AndrewMeadows/thermonuclear 
fix crash: avoid assert for zero-length character velocity
 2015-03-09 20:56:42 -07:00
Andrew Meadows
fd76eda383 slightly better hardcoded size for avatar capsule 
we'll be measuring avatar dimensions more correctly soon
 2015-03-09 17:59:45 -07:00
Andrew Meadows
3c05d685d7 avoid assert for zero-length character velocity 2015-03-09 17:37:34 -07:00
Stephen Birarda
de38221cf6 default to All discoverability until UI is present 2015-03-09 17:28:44 -07:00
Stephen Birarda
c6afa131d9 store discoverability mode as an int 2015-03-09 17:26:56 -07:00
Stephen Birarda
cd382eeea5 expose discoverability changes to js 2015-03-09 17:20:09 -07:00
Stephen Birarda
6d900d5a40 handle discoverability change in DiscoverabilityManager 2015-03-09 17:05:57 -07:00
Stephen Birarda
0658b54263 move location update to DiscoverabilityManager 2015-03-09 16:48:39 -07:00
Stephen Birarda
77a60a3d72 remove discoverability setter until API ready 2015-03-09 16:34:00 -07:00
Stephen Birarda
f81ae30918 fix getUsername for AccountManager include in implementation 2015-03-09 16:32:09 -07:00
Stephen Birarda
2f22c0cd96 cleanup username API from GlobalServicesScriptingInterface 2015-03-09 16:28:01 -07:00
Brad Hefta-Gaub
0586cced11 Merge pull request #4401 from ZappoMan/fbxFixes 
more hacking on mixamo pipeline files
 2015-03-09 16:13:26 -07:00
ZappoMan
2a5d25e010 more hacking on mixamo pipeline files 2015-03-09 16:02:07 -07:00
Brad Hefta-Gaub
2ce80fe3d6 Merge pull request #4395 from sethalves/avatars-can-collide 
Avatars can collide
 2015-03-09 15:44:33 -07:00
Seth Alves
c947f3b62c use meters in wire-protocol for versions greater than VERSION_ENTITIES_USE_METERS_AND_RADIANS 2015-03-09 14:06:59 -07:00
Seth Alves
ab8784f1b4 add comment about character capsule being hard-coded 2015-03-09 13:51:08 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Stephen Birarda
74ab67c251 Merge pull request #4398 from murillodigital/master 
Fixing updater
 2015-03-09 13:19:15 -07:00
Leonardo Murillo
9ccd0a5afa Fixing updater 2015-03-09 14:12:47 -06:00
Brad Hefta-Gaub
750f8a09fa Merge pull request #4394 from AndrewMeadows/isentropic 
EntityItem now stores position in meters and angular velocity in radians/sec
 2015-03-09 12:47:00 -07:00
Brad Hefta-Gaub
5686a4a48d Merge pull request #4397 from ZappoMan/fbxFixes 
temporarily remove skeleton check from upload
 2015-03-09 11:01:20 -07:00
ZappoMan
559945c0c6 temporarily remove skeleton check from upload 2015-03-09 10:50:09 -07:00
Andrew Meadows
e418872f7b namechanges: setFooInMeters() --> setFoo() 
also fixed some warnings, made code abide to standard,
and moved some variables to be closer to where they're used
 2015-03-09 09:56:15 -07:00
Andrew Meadows
c3a8c44545 oops, removing a typo 2015-03-09 09:55:35 -07:00
Andrew Meadows
c0ed3edbbb remove exception when connecting to old server 2015-03-09 09:38:26 -07:00
Brad Hefta-Gaub
2de19ec6b3 Merge pull request #4396 from Atlante45/disk_cache 
Fix dialog labels
 2015-03-09 09:19:42 -07:00
Andrew Meadows
51d05cc43e merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-03-09 08:51:49 -07:00
Seth Alves
0833fc588b coding standard 2015-03-09 06:56:35 -07:00
Atlante45
61649ee0a5 Fix dialog labels 2015-03-09 13:42:14 +01:00
Seth Alves
3604fd639a formatting 2015-03-08 20:03:10 -07:00
Seth Alves
a180eadc91 remove stray control-Ms 2015-03-08 18:07:07 -07:00
Seth Alves
08c3fa6363 merge from upstream 2015-03-08 17:29:05 -07:00
Brad Hefta-Gaub
e2a1ae41b7 Merge pull request #4393 from ctrlaltdavid/20389 
CR for Job #20389 - hmdDefaults.js
 2015-03-08 11:42:54 -07:00
Brad Hefta-Gaub
80675f8459 Merge pull request #4391 from ZappoMan/fbxFixes 
different mixamo detection
 2015-03-08 11:42:29 -07:00
Brad Hefta-Gaub
e2a367607a Merge pull request #4384 from ctrlaltdavid/20369 
CR for Job #20369 - Uploaded avatars without skeletons crash Interface
 2015-03-08 11:42:07 -07:00
Brad Hefta-Gaub
21cd7e36e0 Merge pull request #4381 from Atlante45/disk_cache 
Disk cache tweaks
 2015-03-08 11:40:40 -07:00
Brad Hefta-Gaub
375fa4803e Merge pull request #4377 from jaso-r/master 
High Fidelity interview project -- Jason Rickwald
 2015-03-08 11:31:22 -07:00
Seth Alves
b2cfed8bca removed unused blob of code 2015-03-08 09:04:00 -07:00
Jason
0fd9540bc3 Sync to upstream 
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
 2015-03-07 21:40:06 -08:00
Seth Alves
e4baaa38b4 collision model url 2015-03-07 20:33:00 -08:00
Seth Alves
1a1863679d bump entity-data message version number 2015-03-07 20:32:41 -08:00
Seth Alves
d713d5596f bump entity-data message version number 2015-03-07 20:32:28 -08:00