Adrianl3d
2532a54a2d
code tidy up
...
Fixed indentation, fixed text overflow.
2014-10-30 13:28:50 +10:00
Adrianl3d
1d335c1218
Added textInputOverlayExample.js
...
Displays a text overlay and captures keystrokes which appear on the
overlay. Demonstrates keystroke events, mouse click events, clickable
text overlay and image overlay buttons
2014-10-29 23:39:44 +10:00
AndrewMeadows
acaff7ea13
Merge pull request #3566 from ctrlaltdavid/leap-finger-fixes
...
Leap finger fixes
2014-10-09 08:11:30 -07:00
David Rowe
8954e1d6e1
Document non-usage of Leap controller's first finger joints
2014-10-08 22:11:36 -07:00
David Rowe
cf3d2c7b4a
Fix Leap finger joints
2014-10-08 21:31:46 -07:00
Brad Hefta-Gaub
c9c3ab985a
Merge pull request #3565 from PhilipRosedale/master
...
Simplify camera class to have no interpolation, simpler structure
2014-10-08 17:06:21 -07:00
Brad Hefta-Gaub
80e82c95ca
Merge pull request #3560 from birarda/xbox-controller
...
allow a call to Joysticks.reset to reset SDL while interface is running
2014-10-08 17:06:12 -07:00
Brad Hefta-Gaub
a673634245
Merge pull request #3559 from stojce/20084
...
CR for Job #20084 - Microsoft Windows - Chat window font needs to be fixed (see attached)
2014-10-08 17:05:40 -07:00
Philip Rosedale
27a5042943
Merge pull request #3563 from ey6es/metavoxels
...
Basic averaging for dual contour data, added option to display Hermite data.
2014-10-08 17:04:24 -07:00
Clément Brisset
ff2e811b60
Merge pull request #3564 from birarda/master
...
tweaks to domain-server error messages
2014-10-08 16:02:31 -07:00
Stephen Birarda
1136c1bf13
remove custom font and large X for errors
2014-10-08 15:49:08 -07:00
Stephen Birarda
4daa379b03
use sweet alert for nice error messages in domain-settings
2014-10-08 15:32:56 -07:00
Clément Brisset
b5b7cdbc71
Merge pull request #3561 from ZappoMan/master
...
don't collide with entities with unknown IDs
2014-10-08 15:31:48 -07:00
Philip Rosedale
01bef6be6d
remove unused cameraPushback variable
2014-10-08 15:28:29 -07:00
Andrzej Kapolka
19ec68309b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-08 15:22:17 -07:00
Andrzej Kapolka
37eff685bc
Remove the "render lower detail as points" option. It doesn't seem too
...
promising.
2014-10-08 15:11:55 -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
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
