Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 08:06:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
49171 commits 76 branches 59 tags 1.2 GiB
Commit graph

18473 commits

Author SHA1 Message Date
David Kelly
7750e86c13 Only send machine fingerprint when not logged in 
While at it, no longer grabbing it at all when starting up, as that
was just a dev thing.  Should consider not sending MAC address too, but
we may revisit that later.
 2016-12-20 13:47:58 -08:00
Howard Stearns
9aad93465d Merge pull request #9227 from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
Howard Stearns
891aba31a1 Merge pull request #9233 from samcake/ambient 
Introducing a fix for the overlayered model drawn in front
 2016-12-19 15:56:32 -08:00
howard-stearns
60cb7acb50 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 15:28:07 -08:00
samcake
c435afb728 Introducing a fix for the overlayered model drawn in front 2016-12-19 13:17:56 -08:00
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
aa837d8858 It's working! Untested on human avatars. 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
howard-stearns
9d9345cb65 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 09:19:14 -08:00
Brad Davis
ee3c8e6efd Merge pull request #9225 from jherico/chrome_tracing 
Additional work on tracing
 2016-12-16 17:53:55 -08:00
Brad Davis
2d73588361 Fix stat tracker missing in agents 2016-12-16 17:34:00 -08:00
Ryan Huffman
217d46704d Update req tutorial version for Oculus Touch 2016-12-16 15:41:04 -08:00
Ryan Huffman
b9598a28f3 Update to only send users to tutorial if they have Vive or Touch 2016-12-16 15:05:17 -08:00
Ryan Huffman
188bf600d1 Fix oculus touch labels in tutorial 2016-12-16 15:05:17 -08:00
Ryan Huffman
46251e805a Update oculus touch labels to be emissive 2016-12-16 15:05:17 -08:00
Ryan Huffman
46f5494af8 Fix emissive channel on touch models 2016-12-16 15:05:17 -08:00
Ryan Huffman
a1fea65aa5 Update right joystick mesh 2016-12-16 15:05:17 -08:00
Ryan Huffman
3df1819086 Fix right touch joystick 2016-12-16 15:05:17 -08:00
Ryan Huffman
cde558fb94 Update touch controller tips 2016-12-16 15:05:17 -08:00
Ryan Huffman
674bbe7de5 Add touch controller support to ControllerDisplay 2016-12-16 15:05:17 -08:00
Ryan Huffman
90e121ba47 Extend HMD scripting interface to check subdevices 2016-12-16 15:05:17 -08:00
Ryan Huffman
c953ceb58b Add send-to-tutorial logic for Oculus Touch 2016-12-16 15:05:17 -08:00
samcake
1ded581895 Merge pull request #9217 from zzmp/feat/render-forward-bounds 
Render bounds in Forward Render Task
 2016-12-16 14:57:14 -08:00
howard-stearns
3adc78fecc Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de sessionDisplayName set at server and passed to all clients (including 
oneself)
 2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506 adding profile stats relating to avatar CPU costs 2016-12-16 13:41:31 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
David Rowe
9bf8f25ed0 Update from Seth 2016-12-16 16:11:27 +13:00
David Rowe
9aaf55e6a3 Fix crash after manually closing Clara download status message box 2016-12-16 12:49:26 +13:00
Howard Stearns
ba8b585368 Merge pull request #9202 from howard-stearns/pal-proto 
People Action List prototype
 2016-12-15 13:56:12 -08:00
David Rowe
b8114b29b2 Make manually closing message box code more correct 2016-12-16 09:47:11 +13:00
Zach Pomerantz
41f6990051 change render forward flag to HIFI_... 2016-12-15 14:53:51 -05:00
samcake
7a29dbe7d4 Merge pull request #9207 from zzmp/feat/render-forward-empty 
Forward render task (empty and only used with RENDER_FORWARD set)
 2016-12-15 09:57:18 -08:00
Seth Alves
4494edae33 Merge pull request #9210 from zfox23/FB_2591 
FB 2591: Taking simultaneous GIF snapshots crashes Interface
 2016-12-15 07:01:58 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
David Rowe
16418d52d2 Scale all imported Clara models to have max dimension of exactly 1m 2016-12-15 20:11:29 +13:00
David Rowe
349765ad74 Fix Clara download status message box not auto-closing 2016-12-15 16:00:07 +13:00
howard-stearns
ae4064f445 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-14 17:04:52 -08:00
David Rowe
23b8bf7aab Fix crashing if manually close Clara download status message box 2016-12-15 13:35:58 +13:00
Atlante45
588fdd6efa Add steamworks to interface externals 2016-12-14 16:07:33 -08:00
Atlante45
bfc789f072 CR - CLI text 2016-12-14 15:44:00 -08:00
Atlante45
0dec97fc03 Make Steamworks a plugin 2016-12-14 15:37:49 -08:00
David Rowe
eb293fb579 Increase resize timeout to 5 mins to improve the odds of model rezzing 
Model needs to rez in order for its initial dimensions to be obtained
from FBX.
 2016-12-15 12:26:53 +13:00
David Rowe
c82cceccac Rescale models if necessary to have their largest dimension be 1m 
Models are still rescaled beforehand if thought to be in cm.
 2016-12-15 12:25:56 +13:00
David Rowe
dbd00e39a8 Handle unzip failure 2016-12-15 11:52:34 +13:00