Andrew Meadows
46ec3accfd
merge upstream/master into andrew/thermonuclear
2014-05-12 11:55:59 -07:00
Andrew Meadows
cea472b730
remove the last of Leap specific cruft
2014-05-12 11:48:56 -07:00
Andrew Meadows
efb3edf400
Store sixense data in meters not millimeters
2014-05-12 11:39:21 -07:00
Andrew Meadows
49dedb72c9
remove FingerData class and related cleanup
2014-05-12 11:09:12 -07:00
Stojce Slavkovski
070d996096
change key missing message
2014-05-12 19:47:41 +02:00
Stojce Slavkovski
ff9daa257c
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-12 19:42:44 +02:00
Clément Brisset
1d8b4432ff
Merge pull request #2831 from huffman/fix-ui-images
...
#19647 Fix missing file warning
2014-05-12 09:34:12 -07:00
Stojce Slavkovski
c835f2183e
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-12 18:32:46 +02:00
Clément Brisset
db9f2c563b
Merge pull request #2830 from huffman/19645
...
Code Review for Job #19645
2014-05-12 08:58:06 -07:00
Kai Ludwig
3e1d0536c1
Fix for: #19626 - Fix the Windows 7 crash
...
The image data for glTexImage2D is size=width x height without any borders. So there must be a border of 0 given when calling glTexImage2D, otherwise there is not enough image data causing crashes when textures get loaded.
The effect occurs reproducible on Win7 with ATI cards. Maybe their OpenGL-Implementation is less robust ...
2014-05-11 16:18:46 +02:00
Stojce Slavkovski
3b7e0814fe
CR fixes
2014-05-11 09:57:43 +02:00
Stojce Slavkovski
ac8d27ee3a
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-11 09:53:22 +02:00
Philip Rosedale
6a5affba3d
Merge pull request #2826 from ey6es/master
...
Fix for scripts' not correctly removing/reattaching on restart, don't render head attachments in first person mode.
2014-05-09 15:32:50 -07:00
Andrzej Kapolka
3329cb7638
Set the LOD distance on attachments (controls the load priority, too).
2014-05-09 15:25:48 -07:00
Andrzej Kapolka
0474375a39
Don't render head attachments in first person mode.
2014-05-09 15:13:58 -07:00
Philip Rosedale
e1717b1c53
Fix bug with mirror settings not initialized
2014-05-09 15:02:47 -07:00
Andrzej Kapolka
b9fecb8b92
Wait for scripts to finish before restarting them.
2014-05-09 14:34:13 -07:00
Stojce Slavkovski
9aa9b08397
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-09 19:55:18 +02:00
Andrew Meadows
217080fe1d
cleanup - remove unused leap fingers
2014-05-09 10:27:01 -07:00
Philip Rosedale
8c5a1c7bc8
Merge pull request #2822 from ey6es/master
...
Save attachment data for skeleton/attachment combinations so that they persist even when the attachment isn't present, and users can tweak script-attached models.
2014-05-08 19:42:57 -07:00
Philip Rosedale
14bab0adbc
Merge pull request #2821 from AndrewMeadows/inertia
...
avatar walks up ledges
2014-05-08 19:40:09 -07:00
Andrzej Kapolka
c424f6ce69
Save attachment data for attachment model/skeleton model combinations, let
...
scripts use those saved parameters so that you can tweak the location of
(for example) the gun and have it saved appropriately.
2014-05-08 18:00:41 -07:00
Andrew Meadows
d725be37d0
merge upstream/master into andrew/inertia
2014-05-08 17:11:55 -07:00
Andrew Meadows
f019e2366e
Add lift for walking up stairs
...
Also some fixes for freeing avatars trapped in voxel collisions
2014-05-08 17:10:02 -07:00
Andrzej Kapolka
acab09b89a
Update billboard when attachments change.
2014-05-08 16:23:15 -07:00
Andrzej Kapolka
c02b708ee5
Provide the option to avoid making duplicate attachments.
2014-05-08 15:54:30 -07:00
Stojce Slavkovski
96a9a47871
minor code fixes
2014-05-08 20:54:28 +02:00
Stojce Slavkovski
863a8887d3
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-08 20:29:26 +02:00
Stojce Slavkovski
a1c31522ba
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-08 20:09:36 +02:00
Philip Rosedale
71789b65e7
remove debug
2014-05-08 11:02:35 -07:00
Ryan Huffman
fdaa42b219
Add hifi:// clickable links to chat
...
The handling also needed to be updated to handle domains correctly -
just routing to goToURL instead of gTo fixes this.
2014-05-08 07:54:49 -07:00
Ryan Huffman
ef67a72f23
Remove icon paths from runningScriptsWidget.ui
...
These icon paths are already set programmatically.
2014-05-08 07:22:55 -07:00
Philip Rosedale
4185faa82a
Tweaks to improve mouth and brow appearance when just audio driven
2014-05-08 01:06:26 -07:00
Philip Rosedale
2c6c57eec2
increase hand restoration rate, improve function name clarity
2014-05-08 00:28:02 -07:00
Philip Rosedale
2797d0ab3b
removed hand trying to follow mouse and other cruft
2014-05-08 00:09:07 -07:00
Philip Rosedale
1e276f6dae
Improved hydra idle detection by tracking total distance moved, fixed NaN in starting velocities
2014-05-07 23:41:58 -07:00
Philip Rosedale
e439694d72
reset only pitch and roll on spacebar so that you don’t turn away from someone
2014-05-07 22:56:06 -07:00
Philip Rosedale
8f4fb04021
clearer visualization of controller hand target, remove hand paddles
2014-05-07 22:24:05 -07:00
Philip Rosedale
3a2562697c
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-07 21:00:11 -07:00
Philip Rosedale
538e785208
Merge pull request #2815 from ZappoMan/modelserver
...
More Model Improvements & some other tweaks
2014-05-07 20:59:04 -07:00
Philip Rosedale
01e5b009ee
scope menus better, pause hotkey, no stay paused, remove menu for shared face culling ops
2014-05-07 20:43:23 -07:00
Brad Hefta-Gaub
9c54576aca
Merge pull request #2814 from PhilipRosedale/master
...
More arrow controls to move camera in mirror mode, new guitar chords
2014-05-07 20:02:28 -07:00
ZappoMan
c56f0accec
fix unix build buster
2014-05-07 20:01:02 -07:00
ZappoMan
128e4a13de
place models in proper containing voxel
2014-05-07 17:32:51 -07:00
Philip Rosedale
a86cd9afa1
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-07 17:00:50 -07:00
Philip Rosedale
c6b4b7c250
Merge pull request #2811 from AndrewMeadows/inertia
...
prevent avatar from getting trapped in voxel collisions
2014-05-07 16:54:28 -07:00
Philip Rosedale
e6a8c79f9f
Added more arrow controls to move camera when in mirror mode, new guitar chords.
2014-05-07 16:51:22 -07:00
Philip Rosedale
4e1eaf8337
Merge pull request #2809 from Atlante45/mute_env
...
Mute environment
2014-05-07 16:18:23 -07:00
Andrew Meadows
a11b996a51
cleaner way to achieve the last commit
2014-05-07 16:00:39 -07:00
Andrew Meadows
2d3592e367
avoid resolving penetration twice
2014-05-07 15:58:00 -07:00
