Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 00:53:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17650 commits 25 branches 0 tags 1.1 GiB
Commit graph

17650 commits

This branch
This branch
All branches
Author SHA1 Message Date
stojce
fa58f53bff remove font settings for chat entry 2014-10-08 01:28:24 +02:00
Philip Rosedale
244256bb91 Merge pull request #3482 from DaveDubUK/19970 
Code Review for Job #19970
 2014-10-07 15:37:15 -07:00
Stephen Birarda
6e81bde7bd make position path clearer for address bar 2014-10-07 15:30:44 -07:00
Stephen Birarda
ec6b6999a0 fix for location hash in address bar 2014-10-07 15:29:57 -07:00
David Rowe
373d2f0532 Work-around for right hand roll on Windows is no longer needed 2014-10-07 14:50:29 -07:00
Andrzej Kapolka
604fc84232 More fiddling with averages. 2014-10-07 14:33:01 -07:00
Leonardo Murillo
a10aeb8958 Merge pull request #3554 from birarda/path-changes 
repairs for new user scoped paths
 2014-10-07 15:27:06 -06:00
Stephen Birarda
67fdfbb7f1 fix for user domains path in domain settings 2014-10-07 14:19:15 -07:00
Stephen Birarda
ea4c5a8900 repairs for new user scoped paths 2014-10-07 14:18:05 -07:00
Stephen Birarda
30740afe80 fix a typo in README.md 2014-10-07 12:42:29 -07:00
Atlante45
4fd6094ea4 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-07 10:28:48 -07:00
Grayson Stebbins
484d97a2b8 Update README.md 
Added section about documentation, turned Worklist URLs into links.
 2014-10-07 10:20:15 -07:00
Grayson Stebbins
d1ea91bdf5 Update CONTRIBUTING.md 
Updated to new URLs for coding standard, worklist. Updated details on how to contribute via Worklist.
 2014-10-07 10:15:09 -07:00
AndrewMeadows
c555c50b4c Merge pull request #3553 from PhilipRosedale/master 
Bring initial walk speed down for easier maneuvering around people
 2014-10-07 09:50:27 -07:00
Andrzej Kapolka
c9fb73ecf8 Playing around with using points to represent distant voxel surfaces. 2014-10-06 18:52:10 -07:00
Clément Brisset
3283c861b1 Merge pull request #3529 from huffman/19903 
CR for Job #19903 - When you bring in an FBX apply the default scale to the model
 2014-10-06 18:21:28 -07:00
Atlante45
8be5c18412 Get table data over to DS 2014-10-06 17:52:41 -07:00
Andrzej Kapolka
9fc0abe2b3 Working on metavoxel averaging. Still pretty rough. 2014-10-06 17:30:28 -07:00
David Rowe
ebf615fc30 Fix header declaration 2014-10-06 17:25:40 -07:00
Philip Rosedale
63730a37da Bring initial walk speed down for easier maneuvering around people 2014-10-06 15:26:47 -07:00
Stephen Birarda
b4cfce8ffa final NetworkAccessManager return repairs 2014-10-06 14:58:23 -07:00
Stephen Birarda
a358b4e2af repair another reference to NetworkAccessManager 2014-10-06 14:57:54 -07:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Philip Rosedale
8084c5c77d Merge pull request #3552 from AndrewMeadows/inertia 
Tweak low velocity avatar keyboard control.
 2014-10-06 14:56:38 -07:00
Atlante45
c69aba36fc Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-06 14:55:17 -07:00
Stephen Birarda
78920234bb handle changed domain-server port on start 2014-10-06 14:49:15 -07:00
Leonardo Murillo
7400104f87 Merge pull request #3551 from ZappoMan/fixHTTPSIncludes 
fix include for https relative urls
 2014-10-06 15:43:30 -06:00
Stephen Birarda
14cd044359 handle custom local UDP port for domain-server from webpage 2014-10-06 14:41:16 -07:00
Brad Hefta-Gaub
2d06b150c4 Merge pull request #3548 from ctrlaltdavid/overlays_example_fix 
Fix property names used for text overlay colors
 2014-10-06 14:35:47 -07:00
Brad Hefta-Gaub
4b33cfe838 Merge pull request #3547 from birarda/new-qt 
fix for ThreadedAssignment readyRead on Qt 5.3.x
 2014-10-06 14:35:25 -07:00
ZappoMan
07832fdd68 fix include for https relative urls 2014-10-06 14:34:19 -07:00
Stephen Birarda
2d3f3edcad Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-06 14:31:39 -07:00
Brad Hefta-Gaub
4e038687cf Merge pull request #3550 from murillodigital/master 
Missed one reference to the old bucket.
 2014-10-06 14:31:35 -07:00
Andrew Meadows
6aba2359ed Tweak low velocity avatar keyboard control. 2014-10-06 14:27:43 -07:00
Leonardo Murillo
65b559ca3d Missed one 2014-10-06 15:21:51 -06:00
ZappoMan
12deec928c add tick marks to planar ellipse/circle overlays 2014-10-06 14:15:22 -07:00
Atlante45
ace8b98064 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-06 14:12:57 -07:00
David Rowe
08147380c7 Fix property names used for text overlay colors 2014-10-06 14:09:23 -07:00
Stephen Birarda
499e748d54 rebind the node socket when switching to ThreadedAssignment 2014-10-06 13:45:11 -07:00
Brad Hefta-Gaub
e867b49701 Merge pull request #3546 from murillodigital/master 
Fixing globals var scopt
 2014-10-06 13:29:20 -07:00
Leonardo Murillo
1de473a013 Fixing globals var scopt 2014-10-06 14:27:25 -06:00
Stephen Birarda
0fd7ec34fc remove an unused const 2014-10-06 12:34:12 -07:00
Stephen Birarda
3cd71a33c9 disable ephemeral port for DS until ACs can discover 2014-10-06 12:28:44 -07:00
Stephen Birarda
319cf34b83 use an ephemeral port when using auto-networking for domain-server 2014-10-06 12:24:18 -07:00
Stephen Birarda
253fe53571 cleanup a couple of debug lines 2014-10-06 12:24:12 -07:00
Andrzej Kapolka
0d5f81c062 Merge pull request #3540 from samcake/temp0 
replacing glutSolidSPhere by a cached Geometry
 2014-10-06 12:23:44 -07:00
Sam Gateau
ba2d072a65 fix syntax issues for constant names and the CmakeLists.txt useless change 2014-10-06 12:15:36 -07:00
Clément Brisset
b8c7a9263c Merge pull request #3544 from murillodigital/master 
Changing bucket name
 2014-10-06 11:39:52 -07:00
Sam Gateau
4f26c9e0fa fix formatting and syntax issues 2014-10-06 11:06:23 -07:00
Leonardo Murillo
0b7ff18970 Changes in non-Js code 2014-10-06 11:24:10 -06:00