Commit graph

6786 commits

Author SHA1 Message Date
ZappoMan
1278470a91 properly handle FSTs that have translations and rotations 2014-05-20 13:31:08 -07:00
Stephen Birarda
e3dd6509d8 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 10:47:11 -07:00
Andrzej Kapolka
62e7a31602 More work on animation configuration. 2014-05-19 18:09:33 -07:00
Andrzej Kapolka
5da656e3f5 Working on animation dialog. 2014-05-19 16:55:33 -07:00
Andrzej Kapolka
e066d552a0 Added missing unlock that was causing a hang. 2014-05-19 12:48:26 -07:00
Atlante45
2839f5207b Merge branch 'master' of https://github.com/highfidelity/hifi into anchers_apply_rotation_and_scale 2014-05-17 22:08:39 -07:00
Atlante45
7d40790260 Don't compute avatar anchor specs if uneeded 2014-05-17 22:08:28 -07:00
Andrzej Kapolka
5ebb2659a4 Fixed initialization order warning. 2014-05-17 19:02:14 -07:00
Andrzej Kapolka
c8f2dae7bd Fix for stopping scripts on Windows. 2014-05-17 18:45:54 -07:00
Mohammed Nafees
b35134e325 Fix the chat widget's visibility when not logged in 2014-05-17 20:38:43 +05:30
Atlante45
0edcd732fe Added rotation and scale to overlay anchers 2014-05-16 17:36:27 -07:00
Brad Hefta-Gaub
06a0084269 Merge pull request #2862 from AndrewMeadows/inertia
improved model bounding shapes
2014-05-16 17:22:28 -07:00
Andrzej Kapolka
6eaa549f65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-16 16:26:47 -07:00
Andrzej Kapolka
4a23c0cfd9 Fix for arms' getting twisted up with new IK. 2014-05-16 16:25:24 -07:00
Philip Rosedale
d54ff7a2cf Merge pull request #2869 from huffman/19630
Code Review for Job #19630
2014-05-16 16:00:05 -07:00
Andrzej Kapolka
956c5d2eb6 More joystick fixes. 2014-05-16 14:24:49 -07:00
Ryan Huffman
cc952f9cee Reset node bounds overlay text when no nodes are selected 2014-05-16 13:56:28 -07:00
Ryan Huffman
4100e5c64a Merge branch '19630' of github.com:huffman/hifi into 19630 2014-05-16 13:21:44 -07:00
Ryan Huffman
e5d6a66ca9 Use char array instead of QString in NodeBounds 2014-05-16 13:21:10 -07:00
Mohammed Nafees
f23dd0fecf Fix scrolling of log data when Extra Debugging is enabled 2014-05-17 01:17:55 +05:30
Ryan Huffman
3f2d08871c Reorder includes in NodeBounds.cpp 2014-05-16 12:24:26 -07:00
Ryan Huffman
32974b4003 Remove QGLWidget include from NodeBounds 2014-05-16 12:16:42 -07:00
Andrzej Kapolka
4314e42116 Merge branch 'priority' of https://github.com/ey6es/hifi into priority
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/PrioVR.h
	interface/src/scripting/ControllerScriptingInterface.cpp
2014-05-16 12:16:40 -07:00
Andrzej Kapolka
a7234fd8d3 Stuff the joystick and position bits into the palms. 2014-05-16 12:10:21 -07:00
Ryan Huffman
b48b8aab12 Merge branch 'master' of git://github.com/highfidelity/hifi into 19630
Conflicts:
	interface/src/Application.cpp
2014-05-16 11:48:58 -07:00
Andrzej Kapolka
c42368594d Scratch that; going to shoehorn joystick data into palms. 2014-05-16 11:24:45 -07:00
Andrzej Kapolka
20eadab970 Lock joystick states for thread safety. 2014-05-16 11:18:21 -07:00
Andrzej Kapolka
5a2f61084e Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-16 11:09:12 -07:00
Ryan Huffman
59b23efbd8 Update old comment 2014-05-16 10:37:28 -07:00
Ryan Huffman
91b1910b86 Explicitly null-terminate a string 2014-05-16 10:28:21 -07:00
Ryan Huffman
dbbd3351ef Fix node bounds overlay blinking
QString.to* do not seem to return null terminated strings.
2014-05-16 10:25:15 -07:00
Ryan Huffman
ea5dfbdf28 Update parameter to const 2014-05-16 09:53:48 -07:00
Ryan Huffman
8252b01e30 Cleanup NodeBounds 2014-05-16 09:31:36 -07:00
Ryan Huffman
f646eda7aa Move server borders to a submenu 2014-05-16 09:30:34 -07:00
Brad Hefta-Gaub
6bd1bdebde Merge pull request #2865 from talentraspel/19662
MenuOption::Visage now default to false.
2014-05-16 08:59:31 -07:00
Andrew Meadows
337bc8b947 reuse boolean results rather than recomputing them 2014-05-16 08:28:36 -07:00
Kai Ludwig
e8937852bc MenuOption::Visage now default to false. 2014-05-16 15:12:49 +02:00
Mohammed Nafees
c7acc80ad0 Fixes the log window to prevent halting of Interface when the log is long and the window is opened 2014-05-16 08:36:56 +05:30
Andrzej Kapolka
c29708f22c Basic joystick integration. 2014-05-15 19:18:19 -07:00
Andrzej Kapolka
e415006526 Fixed index of out bounds error, issue with head not being tracked in
PrioVR.
2014-05-15 18:22:57 -07:00
Andrzej Kapolka
e5ef65242f Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-15 17:44:54 -07:00
Andrzej Kapolka
a544489f30 First cut at adding external joysticks to the mix. 2014-05-15 17:44:35 -07:00
AndrewMeadows
ecbe61e32a Merge pull request #2864 from Atlante45/fix_jittery_overlays
Add ability to anchor an overlay
2014-05-15 17:32:33 -07:00
AndrewMeadows
0f2cb46188 Merge pull request #2863 from ey6es/master
Added alternate IK method for Hydras from code provided by Sixense.
2014-05-15 17:29:27 -07:00
Andrzej Kapolka
946e2b5743 Avoid unused variable warnings in Xcode. 2014-05-15 17:15:25 -07:00
Andrzej Kapolka
6dd08ca1bf Working on joystick support using SDL. 2014-05-15 17:09:28 -07:00
Atlante45
61fd09e0bd Add ability to anchor an overlay 2014-05-15 16:24:31 -07:00
Andrzej Kapolka
301234a397 Tabs -> spaces. 2014-05-15 15:34:01 -07:00
Andrzej Kapolka
3eefb6a93e Rotation bits for alternate IK. 2014-05-15 15:32:32 -07:00
Ryan Huffman
21819ce3b4 Merge branch '19630' of github.com:huffman/hifi into 19630
Conflicts:
	interface/src/Menu.h
2014-05-15 14:37:05 -07:00
Ryan Huffman
7a3826b72a Add Node border display 2014-05-15 14:35:01 -07:00
Philip Rosedale
074a6b7f38 Merge pull request #2861 from birarda/master
send an updated address to data-server with domain (when changed)
2014-05-15 14:01:39 -07:00
Andrew Meadows
49a7f8c910 formatting some lines that are too long 2014-05-15 12:42:38 -07:00
Andrew Meadows
e98f5c7486 merge upstream/master into andrew/inertia
Conflicts:
	interface/src/renderer/Model.cpp
2014-05-15 12:33:09 -07:00
Andrew Meadows
4640587445 more correct model bounding capsule 2014-05-15 12:28:55 -07:00
Stephen Birarda
8e9defad3e send an updated address to data-server with domain (when changed) 2014-05-15 12:18:24 -07:00
Andrzej Kapolka
8ee2642f0e Fixed compile error. 2014-05-15 12:10:59 -07:00
Andrzej Kapolka
c12f436a7c Try smoothing the PrioVR input over a couple of frames. 2014-05-15 11:47:11 -07:00
Andrzej Kapolka
f28ba72f75 When PrioVR is connected but head rotation is unavailable, use Faceshift
rotation.
2014-05-15 11:37:58 -07:00
Andrzej Kapolka
94988ed5e6 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-15 11:31:30 -07:00
Andrzej Kapolka
7bee0478be More work on integrating IK solution from Sixense. 2014-05-15 11:30:09 -07:00
AndrewMeadows
565f6b9491 Merge pull request #2858 from ZappoMan/modelserver
Fix bug where sometimes models don't render
2014-05-15 09:51:43 -07:00
Brad Hefta-Gaub
4c05f4f374 Merge pull request #2857 from ctrlaltdavid/interface_log_dir
Fix interface log file location
2014-05-15 08:58:53 -07:00
ZappoMan
62eb8335e9 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-15 00:40:47 -07:00
ZappoMan
ca2d2c751c fixing models not rendering sometimes 2014-05-15 00:34:09 -07:00
Andrzej Kapolka
8388255542 Working on alternate IK mode. 2014-05-14 15:29:16 -07:00
Philip Rosedale
186f7766fc Merge pull request #2856 from ZappoMan/modelserver
Animation Support in Models
2014-05-14 15:03:49 -07:00
David Rowe
dbfa60ff1b Fix interface log file location
Put in \High Fidelity\Interface\Logs rather than \interface\Logs.
2014-05-14 14:46:48 -07:00
Andrzej Kapolka
4346040520 Merge branch 'priority' of https://github.com/ey6es/hifi into priority 2014-05-14 13:56:04 -07:00
Andrzej Kapolka
2cc3720217 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-14 13:55:31 -07:00
Andrzej Kapolka
95c05a720d Tabs -> spaces. 2014-05-14 13:48:03 -07:00
Andrzej Kapolka
cf230d1cc3 PrioVR tweaks. 2014-05-14 13:36:26 -07:00
ZappoMan
0c34d9e065 cleanup remove some debug 2014-05-14 12:59:59 -07:00
ZappoMan
18de6dddec Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-14 12:21:44 -07:00
Atlante45
4f93858849 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-14 10:41:29 -07:00
Andrzej Kapolka
3db3154a5b Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-14 10:29:58 -07:00
Andrzej Kapolka
498f9e73ac Merge branch 'master' of https://github.com/highfidelity/hifi into priority
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
2014-05-14 10:23:44 -07:00
Brad Hefta-Gaub
f03e9f8364 Merge pull request #2841 from birarda/master
use sheet modality so OAuth window doesn't take over full screen
2014-05-14 10:23:43 -07:00
Brad Hefta-Gaub
fecd56d177 Merge pull request #2851 from AndrewMeadows/bispinor
removal of FingerData revisited
2014-05-14 10:02:16 -07:00
Brad Hefta-Gaub
fab1fcb8b5 Merge pull request #2850 from huffman/19654
19654 - Fix running scripts not properly updated when done programmatically
2014-05-14 09:59:52 -07:00
Brad Hefta-Gaub
f12d47181c Merge pull request #2844 from talentraspel/19652
Changed start domain to sandbox. Changed start location to xyz: 6270, 21...
2014-05-14 09:58:29 -07:00
Brad Hefta-Gaub
c397db3606 Merge pull request #2845 from talentraspel/19656
No more hand movement when clicking with the mouse.
2014-05-14 09:57:56 -07:00
Ryan Huffman
146b9958cb Fix style issue 2014-05-14 09:41:13 -07:00
Andrew Meadows
aad9d0441e merge upstream/master to andrew/bispinor
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/SkeletonModel.cpp
	libraries/avatars/src/HandData.cpp
	libraries/avatars/src/HandData.h
2014-05-14 09:38:31 -07:00
Andrew Meadows
498f2843b0 Fix for bad hand rotations 2014-05-14 09:06:46 -07:00
Andrew Meadows
366e9c7d34 PalmDataA::getPalmDirection --> getNormal() 2014-05-14 09:05:54 -07:00
Andrew Meadows
d2d9ca8788 optimization: only compute baseTransform once 2014-05-14 09:04:59 -07:00
Kai Ludwig
b01b144854 No more hand movement when clicking with the mouse. 2014-05-14 07:36:27 +02:00
Ryan Huffman
d59bedfa96 Fix running scripts not properly updated when done programmatically
Add a slot to Application to receive ScriptEngine::finished signals.
Notify the Running scripts widget of stopped scripts so it can properly
move them to the recent scripts list.
2014-05-13 22:25:08 -07:00
Kai Ludwig
19404fe0e5 Changed start domain to sandbox. Changed start location to xyz: 6270, 211, 6000.
goHome behaviour is unchanged and will still just go to the start location keeping the currently select domain.
2014-05-14 07:10:31 +02:00
Andrzej Kapolka
553e6d7313 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-13 16:11:22 -07:00
Andrzej Kapolka
da70813002 On Windows, Visage takes the folder containing the license file, not the
license file itself.
2014-05-13 15:45:24 -07:00
Andrzej Kapolka
eceb600de7 More work on PrioVR integration. 2014-05-13 14:44:24 -07:00
Atlante45
57343be200 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-13 14:10:26 -07:00
Andrzej Kapolka
f2ba2a48f2 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-13 11:38:51 -07:00
Andrzej Kapolka
0321821b55 More work on PrioVR integration. 2014-05-13 11:38:24 -07:00
Andrew Meadows
607094075c Revert "Merge pull request #2834 from andrew/thermonuclear"
This reverts commit e088c3d115, reversing
changes made to d124c0319d.
2014-05-13 10:38:56 -07:00
Stephen Birarda
debd76b2cb use sheet window modality so OAuth window doesn't take over full screen 2014-05-13 10:38:43 -07:00
ZappoMan
02bb816d5a Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-13 09:44:49 -07:00
Brad Hefta-Gaub
629a6d4440 Merge pull request #2838 from talentraspel/19651
Stats area is now always right of mirror display
2014-05-13 08:37:15 -07:00
Brad Hefta-Gaub
e088c3d115 Merge pull request #2834 from AndrewMeadows/thermonuclear
remove leap fingers
2014-05-13 08:04:40 -07:00
Bennett Goble
55d9614757 Menu.cpp Typo: goToOrientation calling goToDestination. 2014-05-13 00:58:49 -04:00
Andrzej Kapolka
6c58bec550 Untabbed. 2014-05-12 17:32:06 -07:00
Andrzej Kapolka
52a3c70bf5 Updates to PrioVR interface. 2014-05-12 17:11:02 -07:00
Atlante45
37700c6ad3 Fixed prompt size 2014-05-12 17:10:19 -07:00
Kai Ludwig
90d577a48c Stats area is now always right of mirror display, regardless if mirror display is enabled or not as there is always a remaining audio meter.
Display, resize and click cases have been adapted by removing the condition for checking display status of mirror.
2014-05-13 00:37:36 +02:00
Andrzej Kapolka
e0486b2654 Starting on PrioVR integration. 2014-05-12 15:25:25 -07:00
AndrewMeadows
3e78d63e34 Merge pull request #2833 from stojce/19597
fixed mention sounds dir for deployment
2014-05-12 14:33:21 -07:00
AndrewMeadows
5a0f4e99a5 Merge pull request #2832 from ey6es/master
After uploading new models, refresh locally cached versions so that the change is immediately apparent.
2014-05-12 14:32:23 -07:00
Andrew Meadows
a1a5372b74 add missing glPushMatrix() 2014-05-12 14:07:33 -07:00
Andrzej Kapolka
8541df9c32 Remember attachment parameters per joint (as well as the last joint used) so
that the gun script correctly allows both guns' positions to be tweaked.
2014-05-12 12:16:30 -07:00
Andrew Meadows
46ec3accfd merge upstream/master into andrew/thermonuclear 2014-05-12 11:55:59 -07:00
Stojce Slavkovski
7ffb700564 fixed mention sounds dir for deployment 2014-05-12 20:55:24 +02: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
Andrzej Kapolka
47268fef32 Fixed kooky conditional. 2014-05-12 11:06:14 -07:00
Andrzej Kapolka
501d071eb1 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-12 11:04:50 -07:00
Andrzej Kapolka
e1266ef74d Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-12 10:48:41 -07:00
Stojce Slavkovski
070d996096 change key missing message 2014-05-12 19:47:41 +02:00
Stojce Slavkovski
c835f2183e Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-12 18:32:46 +02:00
ZappoMan
ed6f828b36 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-12 09:14:04 -07:00
ZappoMan
3ffd4cd65d removed some debug 2014-05-12 09:13:53 -07: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
Andrzej Kapolka
363f545f7c After uploading, refresh the uploaded files so that they are immediately
redownloaded.
2014-05-09 17:50:08 -07:00
ZappoMan
106c8bffd8 first cut at animations in models 2014-05-09 16:08:06 -07: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
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
Andrew Meadows
b92bbafc26 prevent avatar from getting trapped in voxels 2014-05-07 15:21:12 -07:00
Atlante45
fd1f6befff CR 2014-05-07 15:19:32 -07:00
Andrzej Kapolka
350fe5bf14 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-07 14:50:49 -07:00
Atlante45
6308c39aab Fix for windows 2014-05-07 14:03:30 -07:00
Brad Hefta-Gaub
fec2ba71b5 Merge pull request #2807 from PhilipRosedale/master
AirGuitar.js, arrow keys move fwd/back in mirror view
2014-05-07 13:15:35 -07:00
Atlante45
9d2df69bab Merge branch 'master' of https://github.com/highfidelity/hifi into mute_env 2014-05-07 12:57:51 -07:00
Atlante45
40ed72989c mute environment packet 2014-05-07 12:57:11 -07:00
Andrzej Kapolka
55b677dd02 Provide options for model translation: by default, pivot about mesh bounds'
center; allow numeric translation or pivot about joint position.
2014-05-07 12:53:38 -07:00
ZappoMan
37ca6efc7c correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't 2014-05-07 11:48:32 -07:00
Andrew Meadows
9fc1c765d3 overhaul of CollisionInfo
store Cube info for sphereAACube collisions
2014-05-07 11:40:00 -07:00
Philip Rosedale
a6fcf915af Merge branch 'master' of https://github.com/worklist/hifi 2014-05-07 10:02:10 -07:00
Philip Rosedale
fc962749c0 Arrow keys adjust distance from camera in mirror mode, air guitar script 2014-05-06 22:41:08 -07:00
Stojce Slavkovski
490ec23d8c Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-07 07:38:48 +02:00
Andrzej Kapolka
d0537e7ead Specular map support. 2014-05-06 17:32:10 -07:00
Clément Brisset
72e6ff3649 Merge pull request #2803 from ZappoMan/modelserver
Model Server Bug Fixes/Bandwidth improvements
2014-05-06 17:18:25 -07:00
Brad Hefta-Gaub
439c873a68 Merge pull request #2794 from AndrewMeadows/thermonuclear
misc maintenance and bug fixes
2014-05-06 16:51:28 -07:00
ZappoMan
91e4a89573 cleanup old references to node which are really elements 2014-05-06 15:47:18 -07:00
Andrew Meadows
80ed8e7cf0 disable environment gravity when not set in menu 2014-05-06 14:56:16 -07:00
Stojce Slavkovski
8ee282e7d2 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-06 22:01:48 +02:00
Andrzej Kapolka
432df1b65f Only add each texture once. 2014-05-06 12:41:31 -07:00
Andrzej Kapolka
983a3af4b9 Attachment translations in world space. 2014-05-06 11:50:37 -07:00
Andrzej Kapolka
082ff760d6 Un-default the "OK" button so that we can press enter on the URL field. 2014-05-06 11:47:35 -07:00
Andrzej Kapolka
9421af9f10 Fix for attachments' not appearing in rear view mirror head mode. 2014-05-06 11:14:48 -07:00
Andrew Meadows
68b0e91630 gravity disabled by default 2014-05-06 11:09:13 -07:00
Andrew Meadows
8a630a148e fix copy-n-paste typo 2014-05-06 11:03:51 -07:00
Andrzej Kapolka
72ebeffa5c Scratch that; I just didn't understand how magic invisible disappearing scroll
bars worked on OS X.
2014-05-06 10:59:28 -07:00
Andrzej Kapolka
c5fbf1b55f Force the scroll bar. 2014-05-06 10:57:11 -07:00
Andrew Meadows
2d0e4fb94f use START_LOCATION as default settings 2014-05-06 10:55:30 -07:00
Andrzej Kapolka
e0ecd611c9 Better attachment styling. 2014-05-06 10:53:54 -07:00
Andrzej Kapolka
a06697f2a1 Update attachment data on attachment delete. 2014-05-06 10:37:27 -07:00
Andrzej Kapolka
7eef1b56a2 Don't use the scale to determine the depth in Faceplus. Apparently it's not
reliable.
2014-05-06 10:19:29 -07:00
Andrew Meadows
d1a262bb56 maintenance: replace implicit casts with explicit 2014-05-06 10:02:41 -07:00
Andrew Meadows
2ea10428c8 properly wrap XMPP stuff with "#ifdef HAVE_XMPP" 2014-05-06 09:34:44 -07:00
AndrewMeadows
7a191961cf Merge pull request #2793 from PhilipRosedale/master
Further improvements to avatar eye contact based on head direction
2014-05-06 09:08:19 -07:00