Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Brad Hefta-Gaub
1cb7d0c1a5
Merge pull request #5194 from jherico/qml_warnings
...
Removing qml warnings
2015-06-24 15:42:36 -07:00
Clément Brisset
6db4184748
Merge pull request #5171 from huffman/fix-edit-rotate
...
Fix edit.js rotation display
2015-06-24 15:35:15 -07:00
Ryan Huffman
1ccd72d01e
Revert "Disable edit.js rotation text overlay temporarily"
...
This reverts commit b9ecff02f9
2015-06-24 15:32:32 -07:00
Philip Rosedale
0bef506be2
Merge pull request #5190 from jherico/mirror_zoom
...
Mirror zoom
2015-06-24 14:43:14 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Philip Rosedale
584ecf73af
Merge pull request #5196 from howard-stearns/toolbar-auto-persist-as-percentage-of-screen
...
Toolbar auto persist as percentage of screen
2015-06-24 14:29:27 -07:00
Philip Rosedale
b7c64ef246
Merge pull request #5193 from SamGondelman/master
...
hydra dead zone to prevent drifting
2015-06-24 13:52:48 -07:00
Andrew Meadows
1ceed98ca2
Merge pull request #5166 from jherico/64bit
...
Enable Windows 64 bit builds
2015-06-23 17:03:42 -07:00
Ryan Huffman
8a1f446f05
Fix textoverlay3d text position
2015-06-23 14:43:41 -07:00
Seth Alves
b7a952baec
Merge pull request #5197 from ericrius1/quadFix
...
deleted empty files I accidentally committed.
2015-06-23 14:31:53 -07:00
ericrius1
b1190bee6e
deleted empty files I accidently committed.
2015-06-23 14:13:13 -07:00
Howard Stearns
5114f82dca
Fix https://app.asana.com/0/32622044445063/38213714069516
2015-06-23 12:07:01 -07:00
Howard Stearns
62ab4a45d2
Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound
2015-06-23 11:59:05 -07:00
Brad Davis
da031b039c
Removing qml wanrings
2015-06-23 10:58:52 -07:00
Sam Gondelman
c1fdbeb3b4
hydra dead zone to prevent drifting
2015-06-23 10:52:44 -07:00
Seth Alves
4bf4e9f5da
Merge pull request #5164 from ericrius1/lineBounds
...
Line bounds
2015-06-23 10:47:38 -07:00
Ryan Huffman
3e576fea92
Remove vertical scaling from Text3DOverlay
2015-06-23 10:27:01 -07:00
Philip Rosedale
1930043329
Merge pull request #5191 from ericrius1/gunFix
...
fixed bullet size to be smaller for gun.js script
2015-06-23 09:53:23 -07:00
ericrius1
cf579ab275
fixed bullet size to be smaller
2015-06-23 09:52:29 -07:00
Howard Stearns
fa4651e842
Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound
2015-06-23 07:09:39 -07:00
Brad Hefta-Gaub
be34b3c475
Merge pull request #5189 from jherico/retina_fix_459
...
Fixing the initial missing UI on retina displays, again
2015-06-22 20:26:37 -07:00
Bradley Austin Davis
07dce3856a
Fixing some math functions
2015-06-22 20:10:21 -07:00
Bradley Austin Davis
62af30761e
Fixing inverted mirror zoom setting
2015-06-22 20:07:51 -07:00
Bradley Austin Davis
f833121032
Fixing the initial missing UI on retina displays, again
2015-06-22 19:55:52 -07:00
Seth Alves
300a879ff4
Merge pull request #5186 from AndrewMeadows/antimony
...
fix crash when other avatar disconnects unexpectedly
2015-06-22 19:34:13 -07:00
Brad Hefta-Gaub
a3e1987078
Merge pull request #5176 from huffman/fix-raypicking-crash
...
DO NOT MERGE - Fix recalculateMeshBoxes being called outside of mutex
2015-06-22 19:03:31 -07:00
Brad Hefta-Gaub
de39049a56
Merge pull request #5187 from jherico/fix_overlay_backgrounds
...
Fix the 2D text overlay backgrounds to stop using a previously bound …
2015-06-22 17:32:06 -07:00
Brad Hefta-Gaub
ee85ad8bf8
Merge pull request #5185 from jherico/mouse_flicker
...
Removing flickering mouse cursor in HMD
2015-06-22 17:23:40 -07:00
Brad Hefta-Gaub
e0f9f8b613
Merge pull request #5183 from birarda/ac-scripts
...
fix AC crash with no controller scripting interface
2015-06-22 17:22:56 -07:00
Brad Hefta-Gaub
81541e6013
Merge pull request #5180 from jherico/hmd_offset
...
Fixing HMD position offset bug in picking & stereo rendering in HMD
2015-06-22 17:22:26 -07:00
Philip Rosedale
6ef7e486b1
Merge pull request #5165 from ctrlaltdavid/20582
...
CR for #20582 - Fix the issue with Domain backups
2015-06-22 17:02:38 -07:00
Bradley Austin Davis
ce3d1bd9a4
Fix the 2D text overlay backgrounds to stop using a previously bound texture
2015-06-22 16:19:31 -07:00
Andrew Meadows
ce9dfc098b
unhook motionstate before removing avatar
2015-06-22 15:40:26 -07:00
Andrew Meadows
b7c728a794
assert AvatarMotionState unhooked before delete
2015-06-22 15:40:02 -07:00
ericrius1
9014e8c038
increased dimensions for line entity
2015-06-22 15:34:46 -07:00
Howard Stearns
3746231d75
Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound
2015-06-22 14:10:13 -07:00
Brad Davis
98f7b0a689
Merge pull request #5181 from birarda/master
...
fix for double store on index path lookup
2015-06-22 13:58:36 -07:00
Brad Davis
d94cc3d785
Merge pull request #5182 from venkatn93/master
...
Fixed tooltip position relative to the cursor
2015-06-22 13:57:47 -07:00
Philip Rosedale
fd96c3a280
Merge pull request #5184 from ericrius1/utilities
...
Utilities
2015-06-22 12:14:17 -07:00
Howard Stearns
240272be11
Merge pull request #5161 from PhilipRosedale/master
...
Always test and remove DC Offset
2015-06-22 12:09:08 -07:00
Philip Rosedale
111b0f286d
Merge pull request #5160 from ctrlaltdavid/addressbar-tidy
...
Tidy address bar code
2015-06-22 12:08:33 -07:00
Philip Rosedale
e5c1e0ca67
Merge pull request #5159 from howard-stearns/refactor-playSound
...
Refactor playSound
2015-06-22 12:07:08 -07:00
Brad Davis
1cfc0b2e42
Fixing mac/linux compilation
2015-06-22 12:06:08 -07:00
Brad Davis
8c9deb9d16
Removing flickering mouse cursor in HMD
2015-06-22 12:04:55 -07:00
Stephen Birarda
ff21c22245
fix AC crash with no controller scripting interface
2015-06-22 11:56:07 -07:00
Niraj Venkat
e66206ec4f
Fixed tooltip position relative to the cursor
2015-06-22 11:29:44 -07:00
Stephen Birarda
a9eccb687a
fix for double store on index path lookup
2015-06-22 11:26:17 -07:00
Brad Davis
4cd1c52987
Fixing HMD position offset bug in picking & stereo rendering in HMD
2015-06-22 11:20:48 -07:00
ericrius1
6c84e5ad77
actually syncing brush to line color
2015-06-22 11:08:40 -07:00
