Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-01 02:28:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14225 commits 71 branches 56 tags 1.2 GiB
Commit graph

7170 commits

Author SHA1 Message Date
AndrewMeadows
b849c07faf Merge pull request #2945 from huffman/19725 
Code Review for Job #19725
 2014-05-29 09:06:43 -07:00
AndrewMeadows
31237003db Merge pull request #2944 from Barnold1953/master 
Disable oculus overlay until it is curved.
 2014-05-29 09:01:52 -07:00
AndrewMeadows
21f045ebe0 Merge pull request #2939 from huffman/19648 
Code Review for Job #19648
 2014-05-29 08:53:31 -07:00
Ryan Huffman
425632e072 Add 'f' to end of const float to follow coding standard 2014-05-29 08:48:22 -07:00
Andrew Meadows
86d6fd45de safe copy of JointState data 2014-05-29 08:19:43 -07:00
Andrzej Kapolka
ff77644caa Progress on selecting cascades. 2014-05-28 18:35:30 -07:00
Andrew Meadows
ec25982a58 add JointState::updateWorldTransform() 2014-05-28 17:51:17 -07:00
wangyix
5d4b0df108 added flag,seq,st to EnvironmentData, untested 
removed/commented out debug prints
 2014-05-28 17:41:38 -07:00
Andrew Meadows
b15b0fd96c cleaner initialization of JointState 2014-05-28 17:31:07 -07:00
wangyix
c799077379 added flag,seq,ts to ParticleErase and ModelErase 
... this fixes unreasonable flight-time issue
 2014-05-28 17:20:10 -07:00
barnold1953
81ed0d99f7 Added prediction for Oculus rift to reduce apparent latency. 2014-05-28 17:13:59 -07:00
Andrew Meadows
9f2a4ae626 Make JointState a proper class 
JointState gets a pointer to its corresponding FBXJoint
 2014-05-28 16:49:39 -07:00
Atlante45
b4deed775e Added joints position and combined rotation to scripting interface 2014-05-28 15:59:42 -07:00
Andrzej Kapolka
698ecbf9c5 Fix for shadow map rendering. 2014-05-28 15:58:45 -07:00
Atlante45
8cd101ac57 Added getJointCombinedRotation to Models 2014-05-28 15:57:38 -07:00
barnold1953
e6d12bf239 Disabled overlay for oculus. We still have to call 
applicationOverlay.renderOverlay(true) or prioVR cant calibrate.
 2014-05-28 15:56:14 -07:00
Ryan Huffman
8f6ad2faab Add 'Load default scripts' button to preferences 2014-05-28 15:27:50 -07:00
Andrzej Kapolka
c3f6cab199 Working on cascading shadow maps. 2014-05-28 15:20:09 -07:00
Andrew Meadows
e74da5f2a0 merge upstream/master into andrew/inertia 2014-05-28 14:55:08 -07:00
Andrew Meadows
13f11e1056 Remove "fromBind" arg in Model::setJointRotation 
It was always set 'true'.
 2014-05-28 14:53:32 -07:00
barnold1953
9311eeb8f5 Fixed compiler warning 2014-05-28 14:41:30 -07:00
Andrzej Kapolka
4cbc550820 Fix arguments to applyRotationDelta. 2014-05-28 12:03:57 -07:00
Brad Hefta-Gaub
9546fe477c Merge pull request #2940 from AndrewMeadows/inertia 
fix for lack of neck rotations
 2014-05-28 11:00:55 -07:00
Mohammed Nafees
8b0212dc1e remove all key bindings from running scripts dialog 2014-05-28 23:19:15 +05:30
barnold1953
ebfb11c1ce Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory 2014-05-28 10:46:46 -07:00
Andrew Meadows
676a8882fe fix for no neck motion 
FaceModel needs similar override to updateJointState() as SkeletonModel
 2014-05-28 10:43:21 -07:00
barnold1953
21fb18a92e Fixed SkeletonModel compilation errors with PrioVR 2014-05-28 10:24:50 -07:00
barnold1953
35e63757ed Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-28 09:25:55 -07:00
matsukaze
619db8ee93 Job #19694 - Add option for larger number of frames to the audio scope display 2014-05-27 23:24:28 -04:00
Andrzej Kapolka
62eeeaa1c6 Fix for Windows build failure. 2014-05-27 18:12:15 -07:00
wangyix
e89d33dc60 added if to not track ParticleErase packets 2014-05-27 18:02:49 -07:00
Andrzej Kapolka
222655d948 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 17:43:34 -07:00
Andrzej Kapolka
9796334160 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 17:26:56 -07:00
barnold1953
216a73cf60 Fixed coding standard issues 2014-05-27 16:40:51 -07:00
Andrew Meadows
d1a8c18d10 simplified hand index constants 2014-05-27 16:32:29 -07:00
barnold1953
2570c55241 Touched up comments 2014-05-27 16:21:34 -07:00
barnold1953
5665e4d278 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-05-27 16:16:27 -07:00
barnold1953
75580cfd0f Made Overlay appear as flat image in front of camera in Oculus Rift. It 
needs to be a curved surface instead.
 2014-05-27 16:13:56 -07:00
Andrew Meadows
9f72d6ca3f fix bug -- negate logic around invalid joint index 2014-05-27 15:53:20 -07:00
Andrew Meadows
ae3b792a35 move face/head code from Model into SkeletonModel 2014-05-27 15:28:41 -07:00
Andrew Meadows
6efa417742 move hand/arm stuff from Model to SkeletonModel 2014-05-27 15:06:50 -07:00
Andrew Meadows
afc7660d74 merge upstream/master into andrew/inertia 2014-05-27 14:57:44 -07:00
Andrew Meadows
f7b8c4f0a0 remove unused Head::_gravity data memeber 2014-05-27 14:50:17 -07:00
Andrzej Kapolka
2b54d627c0 Try rounding to nearest texel unit to reduce shimmer. 2014-05-27 14:25:27 -07:00
Ryan Huffman
6ef8026215 Add console to script editor 2014-05-27 14:10:09 -07:00
Ryan Huffman
44c5e56a4b Update JSConsole colors 2014-05-27 14:09:53 -07:00
ZappoMan
c63c0c0ce3 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-27 13:39:45 -07:00
ZappoMan
8ec14568fe support ray picking against the AABB for the rotated model extents 2014-05-27 13:39:32 -07:00
Andrew Meadows
07544c7b43 removal of unused getNeckRotation() 2014-05-27 12:52:44 -07:00
Andrzej Kapolka
3f478b1939 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 12:31:12 -07:00
Andrzej Kapolka
ee00a86915 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 11:44:10 -07:00
Andrzej Kapolka
edaa251e5f Provide option to disable avatar shadowing. 2014-05-27 11:43:34 -07:00
Mohammed Nafees
5055b18a4b Merge branch master from upstream 2014-05-28 00:02:15 +05:30
barnold1953
d1a4192ac5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-27 11:20:23 -07:00
barnold1953
d4f66a4a3d Added OverlayRenderer class and moved displayOverlay from Application to 
OverlayRenderer.
 2014-05-27 11:19:45 -07:00
Andrzej Kapolka
70ab33b65b Some tricks to avoid shadow artifacts: render back faces to shadow buffer, 
use polygon offset.
 2014-05-27 10:54:18 -07:00
Brad Hefta-Gaub
13366d9ba1 Merge pull request #2926 from ctrlaltdavid/chat_window 
Fix chat window scrolling
 2014-05-27 10:07:34 -07:00
Brad Hefta-Gaub
d63374f656 Merge pull request #2927 from AndrewMeadows/inertia 
Improved detection of floor surfaces
 2014-05-27 09:33:50 -07:00
Ryan Huffman
4a0a9f8a36 Update console style 2014-05-27 08:57:29 -07:00
Ryan Huffman
9af0269151 Update console style 2014-05-27 08:05:56 -07:00
Ryan Huffman
b9248e0bbf Update JSConsole to QWidget 2014-05-27 08:03:46 -07:00
Ryan Huffman
422c2eac67 Update showConsole -> toggleConsole and change shortcut 2014-05-27 07:29:48 -07:00
Andrew Meadows
9175ae20d6 Merge upstream/master into andrew/inertia 2014-05-26 16:26:15 -07:00
Andrew Meadows
51850076e4 more correct detection of floor surfaces 2014-05-26 16:24:47 -07:00
Ryan Huffman
099777ef8c Merge branch 'master' of git://github.com/highfidelity/hifi into 19648 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-05-26 10:01:44 -07:00
Ryan Huffman
5a5d5b4983 Add JSConsole 2014-05-26 09:59:28 -07:00
Ryan Huffman
3d28cff9df Add console to menu 2014-05-26 09:58:06 -07:00
Ryan Huffman
c362731226 Add support to load script engines not based on a file 2014-05-26 09:57:37 -07:00
David Rowe
7c3d3976ee Fix chat window scrolling to stay at bottom 
Stay at bottom window when:
- There is new chat.
- People come and go from online list.
- Chat window hides and restores when application focus changes.
- Interface is minimized and restored.
 2014-05-25 16:42:36 -07:00
David Rowe
97e5c928a4 Fix chat scroll bar widget jumping 
Hovering over the chat window's scroll bar was causing it to jump
around. Replaced the 12px style spacing that was causing the problem
with a widget-based solution.
 2014-05-25 16:41:01 -07:00
Kai Ludwig
78e311f885 separate style handling for chat area and its context menu. 2014-05-25 20:24:15 +02:00
Clément Brisset
6bb933996f Merge pull request #2920 from ZappoMan/aacube 
Add RayPick support for models
 2014-05-24 17:03:59 -07:00
ZappoMan
a98ac0782a CR feedback 2014-05-24 16:37:32 -07:00
Kai Ludwig
587f60631f missed a tab 2014-05-24 21:28:03 +02:00
Kai Ludwig
c832df0783 added missing locking against crashing in Overlays::~Overlays() 2014-05-24 21:22:34 +02:00
ZappoMan
9d9600aad5 fix max dimension 2014-05-23 22:08:31 -07:00
Clément Brisset
3e671c1968 Merge pull request #2922 from birarda/master 
fix credit amount in window title
 2014-05-23 17:43:04 -07:00
Stephen Birarda
fe05beb88d remove an unneeded debug 2014-05-23 17:41:58 -07:00
Stephen Birarda
9df0f2c1e5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 17:38:28 -07:00
Stephen Birarda
714e29c887 fix credit amount in window title 2014-05-23 17:37:36 -07:00
Andrzej Kapolka
632f87dc88 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 17:15:03 -07:00
Andrzej Kapolka
e48f02f2c5 Remove unused variable. 2014-05-23 17:13:27 -07:00
Clément Brisset
965d5778d6 Merge pull request #2917 from stojce/19705 
Code Review for Job #19705
 2014-05-23 17:07:17 -07:00
Andrzej Kapolka
ac2137c3b6 Fixed a couple copy and paste errors. 2014-05-23 16:56:10 -07:00
Andrzej Kapolka
84b78429f2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-23 16:37:25 -07:00
Philip Rosedale
7c8ece6a5b Merge pull request #2919 from AndrewMeadows/inertia 
turn on gravity when there is a voxel floor to stand on
 2014-05-23 16:36:57 -07:00
Andrzej Kapolka
0baf757c0d Basic support for shadows on models. 2014-05-23 16:35:51 -07:00
Stephen Birarda
1e9589c19e fix an implicit cast to float 2014-05-23 16:18:21 -07:00
Stephen Birarda
1b00cda068 don't use powf for credit conversions 2014-05-23 16:12:34 -07:00
Andrew Meadows
8d660c76cc merge upstream/master into andrew/inertia 2014-05-23 16:00:55 -07:00
Andrew Meadows
d425b5b322 Enable local gravity when there is a floor nearby. 2014-05-23 15:59:27 -07:00
Brad Hefta-Gaub
50e812a82b Merge pull request #2913 from talentraspel/19680 
locking against crash
 2014-05-23 15:08:20 -07:00
Brad Hefta-Gaub
43bdc8c156 Merge pull request #2912 from Atlante45/point_and_glow 
Point and glow
 2014-05-23 12:31:41 -07:00
Atlante45
28536eaef2 CR 2014-05-23 11:53:34 -07:00
Stojce Slavkovski
b3b8e2d775 Merge branch 'master' of https://github.com/worklist/hifi into 19705 2014-05-23 20:50:10 +02:00
Stojce Slavkovski
be9aac08ee add disabled state to Share button on click 2014-05-23 20:49:48 +02:00
ZappoMan
7036233a47 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-23 11:47:47 -07:00
Atlante45
f0f62ced6b Don't create a glower if no glow 2014-05-23 11:41:42 -07:00
Brad Hefta-Gaub
10b0471641 Merge pull request #2906 from Barnold1953/master 
Write thread safety for Overlays QMaps
 2014-05-23 11:34:02 -07:00
Atlante45
7b9f6f8505 Merge branch 'master' of https://github.com/highfidelity/hifi into point_and_glow 2014-05-23 11:32:52 -07:00
Kai Ludwig
7fb9e3a7e6 spaces instead of tabs. 2014-05-23 20:25:20 +02:00
Kai Ludwig
107c142532 _voxelFades needs locking. 2014-05-23 20:21:00 +02:00
ZappoMan
ee523ff373 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-23 11:17:59 -07:00
barnold1953
6817c9682e Added a new lock specific to deleting, and improved safety 2014-05-23 11:17:55 -07:00
Atlante45
df68082705 Added local glow to models 2014-05-23 11:02:07 -07:00
ZappoMan
39ed7f7b65 renaming of AABox to AACube, introduction of actual AABox 2014-05-23 10:45:04 -07:00
barnold1953
9553271fa1 Added some missing locks to make Overlays thread safe for reading as well. 2014-05-23 10:44:40 -07:00
Philip Rosedale
22548b9956 Merge pull request #2909 from PhilipRosedale/master 
add visual indicator of thrust direction
 2014-05-23 09:58:55 -07:00
Philip Rosedale
6998dfae3c add visual indicator of thrust direction 2014-05-23 09:57:47 -07:00
Andrew Meadows
b875144e2d Don't repeat check for non-zero collision groups 2014-05-23 09:55:45 -07:00
AndrewMeadows
3a638cc447 Merge pull request #2905 from ey6es/animenu 
Added animation controls for start/stop frames, loop/hold flags, "start automatically," roles (with script commands to start/stop by role).
 2014-05-23 09:52:54 -07:00
AndrewMeadows
18046c9e9a Merge pull request #2907 from PhilipRosedale/master 
Velocity damped hand positions
 2014-05-23 09:50:39 -07:00
Andrzej Kapolka
4d6e8a2c9e Or rather, replaceMatchingPriorities. 2014-05-23 09:42:36 -07:00
Andrzej Kapolka
09ba25bde5 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-23 09:40:35 -07:00
Leonardo Murillo
f7f4c48b9b Revert "Initialise lisencing manager after we have enabled Visage." 
This reverts commit 061f182fab.
 2014-05-23 08:40:41 -06:00
Philip Rosedale
2681312b54 Velocity damped hand positions 2014-05-23 00:09:15 -07:00
barnold1953
e33cdedeef Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-22 17:56:01 -07:00
barnold1953
3a45104793 Made overlays thread safe for write operations, which solved a script 
crash.
 2014-05-22 17:55:25 -07:00
Andrew Meadows
08b525ef91 prevent walking avatar from bouncing on floor 2014-05-22 17:54:32 -07:00
Andrzej Kapolka
a32dfdb7bb We should let people "start" even if the animation is already playing (to 
start again from the beginning).  Fixed an issue with competing priorities.
 2014-05-22 17:05:28 -07:00
Andrzej Kapolka
2a50b5451f Script commands to start/stop animations by role. 2014-05-22 16:41:51 -07:00
Andrzej Kapolka
8458477b9f Fixed a compile warning, provide means to start/stop animations. 2014-05-22 16:15:34 -07:00
Stephen Birarda
164d3c5fb3 make sure balance is cleared on logout and re-launch 2014-05-22 15:06:16 -07:00
Andrzej Kapolka
083543419d More priority bits. 2014-05-22 15:00:36 -07:00
Stephen Birarda
79f09605d5 show credit balance in window title 2014-05-22 14:55:43 -07:00
Andrzej Kapolka
8717977437 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-22 14:42:23 -07:00
Andrzej Kapolka
d4af39a9f5 Working on handling animation priorities to prevent Hydra move/restore from 
interfering with scripted animations.
 2014-05-22 14:41:46 -07:00
Leonardo Murillo
60dfa08b30 Merge pull request #2902 from birarda/master 
change node auth URL to data.highfidelity.io
 2014-05-22 15:30:44 -06:00
Brad Hefta-Gaub
5964cb9c96 Merge pull request #2901 from polac/19671_proposal 
Initialise lisencing manager after we have enabled Visage.
 2014-05-22 14:28:20 -07:00
Stephen Birarda
01e8d775f2 change node auth URL to data.highfidelity.io 2014-05-22 14:24:19 -07:00
barnold1953
a48c6b82e2 Fixed my mistake by unlocking the lock. 2014-05-22 14:17:26 -07:00
barnold1953
f069b70563 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-22 12:46:39 -07:00
barnold1953
5013c8c2fa Fixed script editor crash when script calls Script.stop(). Also made the 
processEraseMessage wait until it can lock to ensure particles are
deleted.
 2014-05-22 12:45:36 -07:00
Andrzej Kapolka
03abad4f20 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-22 11:59:49 -07:00
Andrew Meadows
b0c3655076 Fix for bad bounding shape for multi-root models. 2014-05-22 11:40:36 -07:00
Atlante45
ea1359c10f Clean up log 2014-05-22 11:11:22 -07:00
barnold1953
4036f929c9 Stopped access violation when erasing particles. 2014-05-22 10:31:30 -07:00
Mohammed Nafees
c4b17963e2 Remove unnecessory header file inclusion in Menu.cpp 2014-05-22 16:55:24 +05:30
Mohammed Nafees
ad49b5c2e1 Show OS notification when user is not logged in 2014-05-22 16:53:07 +05:30
Andrzej Kapolka
e81e6f3cb2 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 18:00:57 -07:00
barnold1953
dad2788b8c Moved 'I am looking at' ball to be immediately above name text, and reduced opacity 2014-05-21 17:45:17 -07:00
Ryan Huffman
c428e68962 Update script window to load script when pressing enter 2014-05-21 17:03:07 -07:00
Ryan Huffman
b108ea3140 Update script list to only label local files 2014-05-21 16:57:13 -07:00
Ryan Huffman
2eeb3f5f2f Update loadScript to optionally activate main window 2014-05-21 16:56:51 -07:00
barnold1953
5b366fe714 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
 2014-05-21 16:01:28 -07:00
Andrzej Kapolka
2eee9a32ac Removed debugging line. 2014-05-21 15:39:12 -07:00
barnold1953
97c0a2fc98 Made mirror view remain constant no matter what the avatar scale is set to. 2014-05-21 15:32:23 -07:00
Andrzej Kapolka
de7c05cb2d More animation controls. 2014-05-21 15:30:50 -07:00
Ryan Huffman
4115e0fab2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Application.cpp
	interface/ui/preferencesDialog.ui
 2014-05-21 13:42:37 -07:00
barnold1953
21f03a4fb5 Made oculus camera modes only active when AllowOculusCameraModeChange is checked. 2014-05-21 12:43:44 -07:00
Andrzej Kapolka
709a9d75f6 Provide an option for the masked joints in the scriptable method, fix a couple 
of annoying warnings.
 2014-05-21 12:03:47 -07:00
Andrzej Kapolka
0e15c82e49 Allow setting masked joints for each animation. 2014-05-21 11:58:20 -07:00
barnold1953
b5ad295756 Fixed improper coding style in previous pull request 2014-05-21 11:24:39 -07:00
barnold1953
3bc8e0f726 Made third person work with oculus 2014-05-21 11:21:12 -07:00
Andrzej Kapolka
20a931178d Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 11:03:55 -07:00
Brad Hefta-Gaub
a88de84b1e Merge pull request #2875 from binaryking/19666 
Code Review for Job #19666
 2014-05-21 11:02:29 -07:00
Andrzej Kapolka
6797d1ad81 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 11:02:05 -07:00
Brad Hefta-Gaub
b4759e02f4 Merge pull request #2888 from Barnold1953/master 
Windows audio and mesh crash
 2014-05-21 11:01:48 -07:00
Andrzej Kapolka
ef9407b1a6 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-21 10:58:44 -07:00
Clément Brisset
653b89353d Merge pull request #2889 from ZappoMan/bugfix 
Couple of Model Bug Fixes
 2014-05-21 10:53:20 -07:00
Andrzej Kapolka
0dfd787034 Added some basic method to allow scripts to run/stop animations on the avatar. 2014-05-21 10:44:51 -07:00
barnold1953
407a98f00e Added realWorldFieldOfView to preferences. 2014-05-21 10:41:33 -07:00
Andrzej Kapolka
1022f1bec4 Added a priority setting so that we can control the order in which animations 
are applied.
 2014-05-21 09:40:49 -07:00
barnold1953
742543317c Stopped magnifying FOV when wearing Oculus. 2014-05-21 09:12:28 -07:00
Mohammed Nafees
1714f7fb27 Merge branch master from upstream 2014-05-21 11:29:19 +05:30
Andrzej Kapolka
f709ea61b5 Need to initialize this to false. 2014-05-20 17:55:48 -07:00
barnold1953
661de7c62b Fixed poor coding standard 2014-05-20 17:46:52 -07:00
barnold1953
eb5b0c4ddf Made OR work with different camera modes. 2014-05-20 17:43:46 -07:00
Andrzej Kapolka
7124b4a196 Mask joints from animation when explicitly set. 2014-05-20 17:10:53 -07:00
Brad Hefta-Gaub
a29a9dad70 Merge pull request #2882 from ey6es/master 
Restore specular lighting--but, per the OpenGL spec, shut off specular
 2014-05-20 17:01:32 -07:00
ZappoMan
2665f3af67 properly bail on version mismatch 2014-05-20 16:31:03 -07:00
ZappoMan
22a6e4679a properly discard piggy back packets that don't match expected version 2014-05-20 16:19:14 -07:00
Andrzej Kapolka
d3e5e3ccf1 A couple explanatory comments. 2014-05-20 15:41:11 -07:00
Andrzej Kapolka
dd5d3c5591 Merge branch 'master' of https://github.com/highfidelity/hifi into animenu 2014-05-20 15:23:41 -07:00
Andrzej Kapolka
49a0645677 Animation bits. 2014-05-20 15:23:15 -07:00
barnold1953
2329188939 Stopped windows crash when no audio device is detected 2014-05-20 15:15:45 -07:00
Mika Impola
061f182fab Initialise lisencing manager after we have enabled Visage. 2014-05-21 00:02:59 +03:00
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
Ryan Huffman
cfb1e5ac4e Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/ui/runningScriptsWidget.ui
 2014-05-14 17:33:47 -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
Ryan Huffman
a1d5d44bc1 Update RunningScripts to be created after Menu has been created 2014-05-14 01:45:07 -07:00
Ryan Huffman
6e80b97efe Disable hiding of running script area when none are running 2014-05-14 01:44:35 -07:00
Ryan Huffman
90d3dd3ceb Remove unused lines 2014-05-14 01:43:37 -07:00
Ryan Huffman
03f9c0c7e2 Update Running Scripts Widget to use ScriptModel 2014-05-14 01:42:24 -07:00
Ryan Huffman
35151b5dad Add ScripsModel 2014-05-14 01:18:08 -07:00
Ryan Huffman
38a5b5b8d1 Add ScriptsLocation settings value 2014-05-14 00:28:11 -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
Stojce Slavkovski
0b03421046 trivial commit - trigger build 2014-05-06 08:37:49 +02:00
Stojce Slavkovski
aedc7eda3e Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 08:27:55 +02:00
Stojce Slavkovski
14fee3b727 trivial commit - trigger build 2014-05-06 08:27:46 +02:00
Philip Rosedale
bb20762083 Merge pull request #2791 from AndrewMeadows/thermonuclear 
fix avatar motor to point in direction of camera
 2014-05-05 22:10:13 -07:00
Philip Rosedale
e3ab16997a tweaks to roll (back to no magnify) and lookAt indicator dot 2014-05-05 22:06:28 -07:00
Philip Rosedale
e1a6a824a3 remove model loader debug 2014-05-05 20:28:12 -07:00
Philip Rosedale
e0c898bba0 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-05 18:03:33 -07:00
Philip Rosedale
53baf5652e avatar look at indicator smaller grey ball 2014-05-05 18:03:25 -07:00
Andrew Meadows
e33ef1a571 fix avatar motor to point in direction of camera 2014-05-05 17:35:23 -07:00
Andrzej Kapolka
710cc3ec2a Comment fix. 2014-05-05 17:08:10 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Philip Rosedale
da0b36ed5c merge fix 2014-05-05 16:21:52 -07:00
Andrzej Kapolka
fd0a39df12 Always update attachments. 2014-05-05 16:19:33 -07:00
Philip Rosedale
691b1d6069 Added lookAt rendering bubble 2014-05-05 16:19:09 -07:00
Stojce Slavkovski
bcad49d0a9 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 01:05:13 +02:00
Stojce Slavkovski
519b36240c build fix 2014-05-06 01:05:04 +02:00