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

17527 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
cdd60dead2 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-08 15:28:56 -07:00
Philip Rosedale
01bef6be6d remove unused cameraPushback variable 2014-10-08 15:28:29 -07:00
Clément Brisset
8bf29f85d7 Merge pull request #3562 from birarda/master 
styling changes for domain-server tables
 2014-10-08 15:00:52 -07:00
Stephen Birarda
51afd52ffb vertically center the glyphicon for table button 2014-10-08 14:56:09 -07:00
Stephen Birarda
f4eddbc93b change number to numbered for domain-server settings 2014-10-08 14:54:41 -07:00
Stephen Birarda
fb8c5c3bf0 initial styling changes to domain table 2014-10-08 14:52:53 -07:00
Stephen Birarda
4fd16f5444 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-08 14:52:18 -07:00
Stephen Birarda
dc139a63da Merge pull request #3556 from Atlante45/attenuation_zones 
Table structure for DS settings
 2014-10-08 14:12:12 -07:00
Atlante45
19d103c343 Indentation 2014-10-08 13:54:53 -07:00
Clément Brisset
e4f5f11429 Merge pull request #3557 from birarda/master 
fix for window modalities
 2014-10-08 11:53:48 -07:00
Stephen Birarda
960ece98d0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-08 11:53:46 -07:00
Atlante45
9a87e764e2 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
	domain-server/src/DomainServerSettingsManager.cpp
 2014-10-08 11:46:07 -07:00
Atlante45
cd67c9d456 Removed console logs 2014-10-08 11:40:43 -07:00
AndrewMeadows
4873528068 Merge pull request #3543 from birarda/domain-tunnel 
handle local socket changes when moving networks for auto networked domains
 2014-10-08 11:36:56 -07:00
Philip Rosedale
905b52eab4 Merge pull request #3558 from ctrlaltdavid/leap-hand-fixes 
Leap hand fixes
 2014-10-08 11:35:56 -07:00
Atlante45
11b38d554f reindentation 2014-10-08 11:24:01 -07:00
Atlante45
e2d3ca53e6 Changed data to row-data 2014-10-08 11:14:39 -07:00
Philip Rosedale
12349a8854 Fix rearview mirror camera 2014-10-08 10:59:46 -07:00
Philip Rosedale
00c182ad7b Fix full screen mirror keyboard controls 2014-10-08 10:51:06 -07:00
Stephen Birarda
d064919cb0 fix a missed reference to NetworkAccessManager 2014-10-08 10:41:16 -07:00
Atlante45
dd90ea01bd Removed setting-input 2014-10-08 10:25:01 -07:00
Philip Rosedale
2636fdd3cb Fix third person camera distance 2014-10-08 10:23:45 -07:00
David Rowe
a3cce3ae22 Fix Leap hand roll 2014-10-08 10:11:18 -07:00
Stephen Birarda
b0a99c48a7 don't force metavoxel editor to stay on top 2014-10-08 10:05:13 -07:00
Stephen Birarda
a8a8b81386 don't make long and address bar modal so they don't steal input 2014-10-08 10:00:50 -07:00
Philip Rosedale
c4c9f4820d First pass at simplifying camera, removes interpolation to target and setbacks 2014-10-08 10:00:47 -07:00
Stephen Birarda
3794e166ad change LoginDialog modality so it doesn't steal input 2014-10-08 09:51:16 -07:00
AndrewMeadows
c56923d316 Merge pull request #3549 from ZappoMan/editToolsImprovements 
add tick marks to planar ellipse/circle overlays
 2014-10-08 09:33:34 -07:00
Stephen Birarda
7773a94df7 resolve conflicts on merge with upstream master 2014-10-08 09:27:16 -07:00
Brad Hefta-Gaub
e38562b99d Merge pull request #3555 from birarda/path-changes 
fix location hash suggestion in address bar
 2014-10-08 09:24:58 -07:00
Philip Rosedale
f4b9ccbceb remove unused camera functions 2014-10-07 21:51:46 -07:00
Atlante45
ebfb9495dc Made helpers private methods 2014-10-07 21:04:59 -07:00
Atlante45
9c2e688477 indentation 2014-10-07 21:03:02 -07:00
Atlante45
c9e4c12ce2 Removed line number 2014-10-07 21:00:53 -07:00
Atlante45
4e0e9d1dba Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-07 20:52:27 -07:00
Atlante45
91727232f8 Indentation 2014-10-07 20:52:06 -07:00
Atlante45
ec8fcb6b59 removed debug and name in posted object 
:
 2014-10-07 20:43:41 -07:00
Atlante45
92be06bb84 Reordered a few operations 2014-10-07 18:12:56 -07:00
Atlante45
2a5292732c DomainServerSettings handles any types of objects 2014-10-07 18:01:32 -07: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
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