Stephen Birarda
|
dc139a63da
|
Merge pull request #3556 from Atlante45/attenuation_zones
Table structure for DS settings
|
2014-10-08 14:12:12 -07:00 |
|
Andrzej Kapolka
|
b5b82ed387
|
Provide the option to display lower detail metavoxel data as points.
|
2014-10-08 14:05:14 -07:00 |
|
Atlante45
|
19d103c343
|
Indentation
|
2014-10-08 13:54:53 -07:00 |
|
Stephen Birarda
|
ce505c1b0c
|
add a missing HAVE_SDL wrap on setter in Joystick
|
2014-10-08 12:09:40 -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 |
|
Andrzej Kapolka
|
049a00b85b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-10-08 11:51:10 -07:00 |
|
ZappoMan
|
48071bbdb3
|
don't collide with entities with unknown IDs
|
2014-10-08 11:48:30 -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 |
|
Stephen Birarda
|
8e2d41f37f
|
remove deadzone handling from Joystick class
|
2014-10-08 11:41: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 |
|
Stephen Birarda
|
17b9f4a37d
|
allow a call to Joysticks.reset to reset SDL while interface is running
|
2014-10-08 11:34:45 -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 |
|
stojce
|
54ad9477e7
|
Add style to chat entry
|
2014-10-08 03:12:53 +02:00 |
|
Atlante45
|
2a5292732c
|
DomainServerSettings handles any types of objects
|
2014-10-07 18:01:32 -07:00 |
|
Andrzej Kapolka
|
04b628bede
|
Added option to display Hermite data
|
2014-10-07 16:44:55 -07:00 |
|
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 |
|