Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 12:04:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15027 commits 75 branches 59 tags 1.2 GiB
Commit graph

7603 commits

Author SHA1 Message Date
TonyPeng
94e81da557 Added local lights to avatar. Added haze to voxel. 2014-07-08 09:44:28 -07:00
Ryan Huffman
c509ae9ffd Merge branch 'master' of git://github.com/highfidelity/hifi into 19828 2014-07-07 13:49:26 -07:00
Ryan Huffman
df6bbd2944 Fix goTo* dialog bug with chat on Mac OSX 
If chat was open, when pressing enter on Mac OSX the operation would not go through and
would focus on the chat window.  There seems to be a  deeper issue, but
it was decided to go with the simple solution of making these dialog
windows not of `Sheet` type.
 2014-07-07 13:47:31 -07:00
Andrzej Kapolka
f7f9dfd26e Merge pull request #3128 from Atlante45/replace_qnetworkaccessmanager 
Downgrade of NetworkAccessManager
 2014-07-07 12:21:45 -07:00
Atlante45
a225df63f6 Removed deprecated moveToThread() 2014-07-07 11:40:03 -07:00
Andrzej Kapolka
21ba9bf410 Because attempting to compile the new voxel texture shader causes my system 
(Ubuntu LTS, Intel graphics) to hang, change it to compile lazily when
activated.
 2014-07-07 11:22:17 -07:00
samcake
f5c690cc8d Add Leapmotion support for Apple build 
- Add LEapmotion support in the CMake files
- fix a template syntax in DeviceHEader not compiling on mac
- add a missing #ifdef protection in Leapmotion
 2014-07-07 09:32:46 -07:00
samcake
d56ab21192 Clean file formating 
- Clean the classes declaration and body for
DeviceTracker
MotionTracker
ControllerScriptingInterface / InputController
Leapmotion

- final bug remaining in the LeapOfFaith..js
THe orientation assigned to the skeleton joints doesn't work even though
all looks good.
 2014-07-07 09:24:23 -07:00
samcake
abacefa723 Merge remote-tracking branch 'upstream/master' into 19734 
Conflicts:
	interface/CMakeLists.txt
	interface/src/avatar/SkeletonModel.cpp
 2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13 Merge branch 'master' of https://github.com/highfidelity/hifi into 19734 2014-07-05 18:10:59 -07:00
David Rowe
2ad2b6cd1c Resize the overlay framebuffer when the application window is resized 2014-07-03 18:23:37 -07:00
David Rowe
97ca6d70fa Fixed performance timer scope 2014-07-03 17:15:46 -07:00
David Rowe
8b04a9c8b6 Add toggle for user interface display 
- "/" toggles UI (incl. stats if displayed); menu View > User Interface
- "%" = toggle status; menu View > Stats
- Acts on normal, 3DTV, and Oculus display.
 2014-07-03 16:19:05 -07:00
barnold1953
ba997334ff Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-03 16:10:26 -07:00
barnold1953
bf2959675f First pass at laser oculus UI pointer 2014-07-03 16:09:54 -07:00
Philip Rosedale
3280691491 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-03 15:54:29 -07:00
Brad Hefta-Gaub
db5abbc363 Merge pull request #3124 from Atlante45/replace_qnetworkaccessmanager 
Fixed invokeMethod unable to find method + fixed children in different t...
 2014-07-03 14:54:11 -07:00
Clément Brisset
a7be28b547 Merge pull request #3123 from AndrewMeadows/ragdoll 
return to default pose after hydra disconnect
 2014-07-03 14:49:26 -07:00
Atlante45
8e1b8334a1 Fixed invokeMethod unable to find method + fixed children in different thread 2014-07-03 14:46:17 -07:00
Andrew Meadows
662136f01c reset timer as optimization 2014-07-03 14:13:27 -07:00
Andrew Meadows
0f7859bf83 fix return to default pose after hydra disconnect 2014-07-03 14:09:14 -07:00
Philip Rosedale
a25c08a1b7 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-03 14:08:19 -07:00
Andrew Meadows
843a4db650 rotation offset for hydra controllers 2014-07-03 13:50:27 -07:00
Clément Brisset
4798cad1e5 Merge pull request #3121 from ZappoMan/animationFrameIndex 
adds JavaScript API for getting the current animationDetails (state) for avatar animations
 2014-07-03 13:45:27 -07:00
Brad Hefta-Gaub
b8071d8050 Merge pull request #3113 from birarda/master 
initial pass at MIDI input for scripting
 2014-07-03 13:40:25 -07:00
ZappoMan
8755e2d42e CR feedback 2014-07-03 13:38:52 -07:00
Brad Hefta-Gaub
dbdce32b68 Merge pull request #3107 from wangyix/master 
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
 2014-07-03 13:32:31 -07:00
Stephen Birarda
15619b5a98 don't require RtMidi if it isn't present 2014-07-03 13:30:14 -07:00
wangyix
94c0c15c76 fixed more small bugs with AudioRingBuffer constructor 2014-07-03 12:06:18 -07:00
ZappoMan
a53d007c33 add support for getting current animation details for running avatar animations 2014-07-03 11:59:18 -07:00
Stephen Birarda
6038c33fe6 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 11:12:19 -07:00
wangyix
507518f16d removed numFramesCapacity from being exposed everywhere 2014-07-03 11:11:56 -07:00
Atlante45
6b88724578 Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-03 10:30:39 -07:00
Atlante45
20cdc0e3ca Fix wrong slot names in ModelBrowser 2014-07-03 10:30:21 -07:00
Andrew Meadows
8c8a29f477 merge upstream/master into andrew/ragdoll 2014-07-03 09:27:52 -07:00
Stephen Birarda
f1e2ba1267 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 09:25:03 -07:00
Andrew Meadows
55dd2a4835 re-enable gravity effect on arm IK 2014-07-03 09:10:23 -07:00
Andrew Meadows
356a29c2fb add AngularConstraint::softClamp() for hands 2014-07-03 08:40:34 -07:00
Brad Hefta-Gaub
67910a5ba2 Merge pull request #3115 from Barnold1953/OculusSDK 
3DTV UI overlay + Oculus fixes
 2014-07-02 21:45:34 -07:00
Brad Hefta-Gaub
1b29b7c120 Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback 
Removed json callback
 2014-07-02 21:45:19 -07:00
Brad Hefta-Gaub
da87ac4105 Merge pull request #3112 from Atlante45/replace_qnetworkaccessmanager 
Replace QNetworkAccessManager by Wrapper
 2014-07-02 21:41:08 -07:00
Atlante45
69533c25c2 Fix script not being loaded at startup 2014-07-02 17:54:21 -07:00
Philip Rosedale
257dc56168 Merge pull request #3111 from noirsoft/master 
Implementing improved perlin noise
 2014-07-02 17:20:10 -07:00
barnold1953
b6a626c928 Removed comment 2014-07-02 17:18:12 -07:00
barnold1953
edcf4d04f8 Fixed bug when switching from normal view to oculus 2014-07-02 17:05:06 -07:00
barnold1953
ee30a446e9 Fixed 3rd person camera for non oculus 2014-07-02 16:45:05 -07:00
barnold1953
a859094d4a Clickable 3D UI in 3DTV 2014-07-02 16:40:02 -07:00
Atlante45
106e5b578b Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-02 16:06:41 -07:00
Atlante45
45db5e2c40 Removed Xcode warnings 2014-07-02 15:57:11 -07:00
Clément Brisset
1f92d57230 Merge pull request #3103 from AlericInglewood/19827 
Code Review for Job #19827
 2014-07-02 15:53:57 -07:00
Clément Brisset
ae6b4def32 Merge pull request #3108 from huffman/19800 
Code Review for Job #19800
 2014-07-02 15:46:56 -07:00
Philip Rosedale
1a3becc123 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-02 15:26:19 -07:00
Philip Rosedale
ec1f909210 Merge pull request #3109 from AndrewMeadows/ragdoll 
stable arm IK without constraints
 2014-07-02 15:26:10 -07:00
Stephen Birarda
73312ecc5f add the PitchWheel constant to the MIDIManager class 2014-07-02 15:07:49 -07:00
Atlante45
1ac38c9884 Switched call to setCache to invokeMethod 2014-07-02 14:31:19 -07:00
Atlante45
6e02561d96 Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-02 14:08:57 -07:00
Chris Oates
c79c5df295 Fixing up #define / #if pair so that permutation table change can be turned of by setting #defined variable to 0 instead of having to comment it out. 2014-07-02 13:50:47 -07:00
Chris Oates
2d9a42c07a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 13:12:37 -07:00
Chris Oates
e903b1659a Implemented Improved Perlin Noise in existing "textured voxels" option. 
TextureCache.cpp: modified so that permutation texture contains known permutation of 0..255 rather than random set of values. Does not noticeably affect visuals.
perlin_modulate.frag: implementation of improved noise, per 2002 SIGGRAPH paper, including "turbulence" summation.
 2014-07-02 13:09:16 -07:00
Andrew Meadows
9f5f79b2e3 merge andrew/ragdoll into andrew/bispinor 
improved IK merged into AngularConstraint work

Conflicts:
	interface/src/renderer/JointState.cpp
	interface/src/renderer/JointState.h
 2014-07-02 11:37:17 -07:00
Atlante45
598c1cb516 Switched Sound to NetworkAccessManager 2014-07-02 11:27:55 -07:00
Andrew Meadows
f5debdb930 merge upstream/master into andrew/bispinor 2014-07-02 11:23:42 -07:00
Atlante45
14a2bbb454 Switched SnapshotShareDialog to NetworkAccessManager 2014-07-02 11:22:29 -07:00
Andrew Meadows
b018c1c4a5 Add copy ctor for JointState 
create AngularConstraint for joints that need them (but not used yet)
 2014-07-02 11:22:07 -07:00
Atlante45
9bcd4e7ac8 Switched ScriptEditorWidget to NetworkAccessManager 2014-07-02 11:21:54 -07:00
Atlante45
602015be66 Switched ScriptModel to NetworkAccessManager 2014-07-02 11:21:26 -07:00
Ryan Huffman
70121357be Update JSONCallbackParameters to take params in constructor 2014-07-02 11:12:06 -07:00
Atlante45
da0021cc8e Switch ModelsBrowser to NetworkAccessManager 2014-07-02 10:53:30 -07:00
Atlante45
f6221abb71 Switch ModelUploader to NetworkAccessManager 2014-07-02 10:52:08 -07:00
Andrew Meadows
8b3af0b9cb merge upstream/master into andrew/say-no-to-warnings 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	libraries/audio/src/AudioRingBuffer.cpp
 2014-07-02 10:37:30 -07:00
Atlante45
6489151578 Switch ImageOverlay to NetworkAccessManager 2014-07-02 10:28:26 -07:00
Stephen Birarda
55d8b763c5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-02 09:42:32 -07:00
Andrew Meadows
6e5d77f0fc merge upstream/master into andrew/ragdoll 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2014-07-02 09:41:13 -07:00
Andrew Meadows
49d54dd6f0 Add Model::inverseKinematics() for stable hand IK 
(removed constraint enforcement which was causing problems,
will add that back later)
 2014-07-02 09:33:51 -07:00
barnold1953
67ecde7d31 Made tree editor voxel world stationary and not crash 2014-07-01 21:39:19 -07:00
Ryan Huffman
f0c013960d Remove unnecessary qDebug 2014-07-01 20:05:30 -07:00
Ryan Huffman
ccc638d8c1 Merge branch 'master' of git://github.com/highfidelity/hifi into 19800 2014-07-01 20:03:54 -07:00
Ryan Huffman
83349e0e53 Rename UserLocationsWindow to UserLocationsDialog 2014-07-01 20:03:05 -07:00
Ryan Huffman
aa08577c73 Fix long line 2014-07-01 17:59:59 -07:00
Ryan Huffman
a9e352981a Fix cleanup of resources for UserLocations* 2014-07-01 17:59:49 -07:00
Atlante45
ab15a1487e Switched BillboardOverlay to NetworkAccessManaqer 2014-07-01 17:44:38 -07:00
Atlante45
c5a997a567 Switched Application to NetworkAccessManager 2014-07-01 17:43:25 -07:00
samcake
35977fbb0f After HIFI visit 
Trying to improve the orientation coming from the leap

Shwo and tell to team of the current LeapMotion integration
 2014-07-01 17:35:06 -07:00
wangyix
a5943e3608 made AudioRingBuffer frames capacity variable 2014-07-01 16:24:31 -07:00
Brad Hefta-Gaub
d8a5f59511 Merge pull request #3104 from Atlante45/model_and_billboard_overlays 
Model and billboard overlays
 2014-07-01 15:52:25 -07:00
Atlante45
d63ad86db0 Removed unnecessary function 2014-07-01 15:37:52 -07:00
Ryan Huffman
e7e7bef506 Add error string on rename failure 2014-07-01 15:37:10 -07:00
Ryan Huffman
9953fd6d2b Update MyLocations to not send rename request if unchanged 2014-07-01 15:29:13 -07:00
Atlante45
12ebfd92d1 Memory leak 2014-07-01 15:12:31 -07:00
Atlante45
19be406b1a Added billboards overlays 2014-07-01 15:09:30 -07:00
wangyix
3730be9804 nacked edit packets are not resent if NACKs are disabled in menu 2014-07-01 14:03:26 -07:00
Atlante45
e9826250cb CR 2014-07-01 12:57:39 -07:00
Philip Rosedale
227dab937c Merge branch 'master' of https://github.com/worklist/hifi 2014-07-01 12:48:02 -07:00
Atlante45
958367f579 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 
Conflicts:
	interface/src/devices/OculusManager.cpp
 2014-07-01 12:45:42 -07:00
Atlante45
547431d52e Coding Standard -- static_cast 2014-07-01 12:43:28 -07:00
Atlante45
09cf01e097 ModelOverlay functionnal + bounding box 2014-07-01 12:42:56 -07:00
barnold1953
1a1050cb06 Added back _raiseMirror usage for mirror mode. 2014-07-01 12:31:48 -07:00
wangyix
fd051310da prune missing set before constructing nack packets; 
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
 2014-07-01 12:01:51 -07:00
Stephen Birarda
f389e3a6da resolve conflicts on merge with upstream master 2014-07-01 11:02:25 -07:00
Stephen Birarda
de463642c0 add the ModWheel property to the MIDIManager 2014-07-01 11:00:17 -07:00
Brad Hefta-Gaub
df51d26625 Merge pull request #3094 from wangyix/seqNumberStats 
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
 2014-07-01 10:54:35 -07:00
wangyix
99fd1c7106 changed numSamplesNeedToStartPlayback calculation in Audio.cpp 2014-07-01 10:44:07 -07:00
Brad Hefta-Gaub
a88c92ea17 Merge pull request #3099 from Barnold1953/OculusSDK 
Oculus SDK Upgrade
 2014-07-01 10:43:39 -07:00
barnold1953
80bfb0766b Fixed warnings 2014-07-01 10:28:40 -07:00
Stephen Birarda
5ba4a4dbb5 initial pass of MIDI implementation that bubbles events to JS 2014-07-01 09:53:18 -07:00
samcake
a8b875d32e Merge remote-tracking branch 'origin/LeapMotion' into 19734 2014-07-01 03:20:26 -07:00
samcake
3ce455aba4 Support for LeapMotion and worklist 19734 
-  Introduce the DeviceTracker class  to abstract all the possible
devices
- Introduce the MotionTracker ( a DeviceTracker ) that contains a
transform tree of joints
- Add Leapmotion class as a MotionTracker and the support for the
Leapmotion sdk in external
- Add InputController as the abstraction of a MotionTracker/Joint for
Javascript
 2014-07-01 03:15:26 -07:00
samcake
fe03743163 Revert "Revert "Add LeapMotion SDK support"" 
This reverts commit 8ce145085b3783782fafd051becbb0e339d5dfa1.
 2014-07-01 03:15:23 -07:00
Ryan Huffman
50b13c99a7 Update UserLocationsWindow derive from QDialog 2014-06-30 22:44:10 -07:00
Ryan Huffman
bfde24fe12 Update MyLocations sort order 2014-06-30 22:37:32 -07:00
Ryan Huffman
a566f90820 Update User Location update/delete to not work simultaneously 2014-06-30 22:37:13 -07:00
Ryan Huffman
15d60df420 Update User Locations window to update name when it changes on update 2014-06-30 22:25:00 -07:00
Ryan Huffman
51e42221be Update menu to toggle User Locations Menu 2014-06-30 22:24:27 -07:00
Atlante45
2015861e13 Fixed spelling mistake 2014-06-30 20:10:53 -07:00
Atlante45
7c797449ab Comments + connectedDevice 2014-06-30 19:02:43 -07:00
Andrew Meadows
9ca1bfdfe5 add AngularConstraint.* with some unit tests 
more unit tests to follow
 2014-06-30 18:05:22 -07:00
Andrzej Kapolka
0075bb89c4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-30 18:02:56 -07:00
wangyix
f51a77ce45 reset the incoming audio seq stats in Application::nodeKilled when audiomixer is killed 2014-06-30 18:00:29 -07:00
Atlante45
1a2fd4483b Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 2014-06-30 17:54:34 -07:00
Atlante45
d102795314 Added application version to logger 2014-06-30 17:18:49 -07:00
barnold1953
1cd2066e79 Added option to disable glow effect for 10fps boost for oculus 2014-06-30 17:13:47 -07:00
Atlante45
f33ad8a100 Adding logger calls 2014-06-30 17:10:17 -07:00
wangyix
7a6b20fd84 added downstream audio stats to stats overlay 2014-06-30 17:01:22 -07:00
barnold1953
2727328729 Removed unneeded menu option 2014-06-30 16:46:25 -07:00
barnold1953
de0e65eb03 Restored glow effect 2014-06-30 16:26:50 -07:00
Clément Brisset
1fd830f53c Merge pull request #3098 from ctrlaltdavid/19803 
Code Review for Job #19803
 2014-06-30 16:15:51 -07:00
wangyix
f2dfa6b978 fixed warnings 2014-06-30 16:10:58 -07:00
barnold1953
e51eb34f05 Fixed build errors when libovr is not present 2014-06-30 15:14:21 -07:00
Atlante45
e9dffc0681 Removed testing code 2014-06-30 14:31:39 -07:00
Atlante45
ff8694d5c5 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 2014-06-30 14:30:17 -07:00
Atlante45
0d18debd1b Moved UserActivityLogger to networking 2014-06-30 14:27:07 -07:00
wangyix
c789f3c6b9 merge with upstream 2014-06-30 14:13:34 -07:00
Andrzej Kapolka
110f90df0e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-30 12:42:02 -07:00
wangyix
d2f86278b2 modified AudioStreamStats to per-stream with seq stats 
added AudioStreamStats info to interface overlay stats
 2014-06-30 12:31:58 -07:00
Ryan Huffman
123773a8e3 Add default background color and initialize property 2014-06-30 12:20:05 -07:00
Ryan Huffman
cda88bf4af Add backgroundColor to TextOverlay 2014-06-30 12:06:32 -07:00
barnold1953
ef57970510 Comments and code cleanup 2014-06-30 11:50:42 -07:00
barnold1953
6e954e7f53 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-06-30 11:44:49 -07:00
barnold1953
ffab329af4 Made camera line up with eyes in mirror mode 2014-06-30 11:39:33 -07:00
barnold1953
d109ef6fe1 Proper mirror and third person mode in Oculus 2014-06-30 11:33:22 -07:00
wangyix
de3c1ebf0f changed class name to AudioStreamStats, reverted ScriptEngine packing back to QDataStream 2014-06-30 09:42:22 -07:00
Andrew Meadows
57c17eb972 remove unecessary clearRagdollConstraintsAndPoints() 2014-06-30 09:18:31 -07:00
Andrew Meadows
f33728b615 guarantee that ragdoll is clear before initialized 2014-06-30 09:13:42 -07:00
David Rowe
ce874305be Add checkbox that automatically reloads externally changed files 2014-06-29 21:50:16 -07:00
David Rowe
c454c790fa Check script file for external changes when editor regains focus 
Prompt user whether to reload.
 2014-06-29 21:31:28 -07:00
David Rowe
3df43dc653 Catch any on-the-fly modifications made while script is restarting 2014-06-29 20:13:27 -07:00
David Rowe
742007892f Rework old fix for Script Editor Script.stop() crash 2014-06-29 19:57:26 -07:00
David Rowe
48fb156e28 Fix Script Editor run-on-the-fly crashing 
Wait for script engine to stop before restarting.
 2014-06-29 19:47:00 -07:00
David Rowe
9449ad7192 Add missing script engine hash key code changes 
The script engine hash key changed starting at commit [62f85d] on 11 Jun.
 2014-06-29 19:40:53 -07:00
Aleric Inglewood
37f0635024 Fix a (possible) crash in QObject::disconnect 
This is https://worklist.net/19827
 2014-06-30 02:07:26 +02:00
Philip Rosedale
93602328d9 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-28 11:22:22 -07:00
Andrzej Kapolka
4f9cf82335 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-27 17:53:50 -07:00
wangyix
c3f571745c removed more debug stuff 2014-06-27 17:42:22 -07:00
Clément Brisset
9eba4b01f0 Merge pull request #3092 from ctrlaltdavid/19789 
Code Review for Job #19789
 2014-06-27 17:28:48 -07:00
wangyix
4587828a3a removed debug prints 2014-06-27 16:48:21 -07:00
wangyix
9ceac2c631 fixed Audio.cpp jitter buffer size clamp bug 2014-06-27 16:34:30 -07:00
wangyix
0ae58bd7f9 added senderUUID arg to seq stats 2014-06-27 15:39:11 -07:00
Clément Brisset
ae8997ec0d Merge pull request #3091 from AlericInglewood/master 
Compiler warning fixes.
 2014-06-27 15:36:13 -07:00
Aleric Inglewood
1bc2f214a5 Compiler warning fixes. 
This fixes all warnings that I got while compiling with g++ 4.7.2:

 In file included from interface/src/Application.h:53:0,
                  from interface/src/Menu.cpp:36:
 interface/src/Menu.h: In constructor ‘Menu::Menu()’:
 interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder]
 interface/src/Menu.h:289:27: warning:   ‘QPointer<LoginDialog> Menu::_loginDialog’ [-Wreorder]
 interface/src/Menu.cpp:82:1: warning:   when initialized here [-Wreorder]

 libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’:
 libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’:
 libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'.
 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'.

 interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’:
 interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default]
 interface/src/avatar/Avatar.cpp:574:18: warning:   matches this ‘link’ under ISO standard rules [enabled by default]
 interface/src/avatar/Avatar.cpp:577:22: warning:   matches this ‘link’ under old rules [enabled by default]

 interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’:
 interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0:
 interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’:
 interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder]
 interface/src/ui/RunningScriptsWidget.h:60:27: warning:   ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder]
 interface/src/ui/RunningScriptsWidget.cpp:27:1: warning:   when initialized here [-Wreorder]
 2014-06-27 22:18:38 +02:00
Andrzej Kapolka
61c2ea40ae Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-27 12:34:50 -07:00
barnold1953
508fed9146 Add ability for FBO to have a different res than glWidget 2014-06-27 11:44:05 -07:00
Stephen Birarda
657bf6b3d5 repairs so OAuth flow doesn't get stuck after an error 2014-06-27 11:41:35 -07:00
wangyix
ff438a2434 added seq stats for Agent, 
fixed  AudioInjector to do << (quint16)0 instead of
skipRawData(sizeof(quint16) to correctly allocate space for seq number;
added debug prints;
 2014-06-27 11:23:50 -07:00
Philip Rosedale
fd1e6b1b06 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-27 10:53:23 -07:00
barnold1953
1af2996cf2 Properly use body orientation for Oculus camera 2014-06-27 09:53:31 -07:00
Stephen Birarda
bb44d8b478 fix place lookup for new APIs 2014-06-27 09:36:47 -07:00
Philip Rosedale
f072c04b4c hair is a separate class 2014-06-27 09:30:51 -07:00
Andrzej Kapolka
7c046cb100 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-26 19:12:30 -07:00
Andrzej Kapolka
f16098daef Use the refactored endpoint/client classes in the actual client/server. 2014-06-26 19:11:54 -07:00
barnold1953
67c5281205 Fixed CMake for oculus. Gave Oculus its own camera for minimum latency. 2014-06-26 17:10:53 -07:00
wangyix
cb48825561 added seq number to all Audio types, untested 2014-06-26 16:52:23 -07:00
Andrzej Kapolka
4b2d122f3d Working on factoring out the common metavoxel endpoint/client code. 2014-06-26 16:12:11 -07:00
Ryan Huffman
33e11be3e0 Add user locations to menu 2014-06-26 16:06:49 -07:00
Ryan Huffman
cde36dc70d Add user locations 2014-06-26 16:06:28 -07:00
Atlante45
8d00a8d535 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 
Conflicts:
	libraries/networking/src/LimitedNodeList.cpp
 2014-06-26 14:56:15 -07:00
Atlante45
9d393bbe8c Added some functions to UserActivityLogger + made logAction public 2014-06-26 14:55:11 -07:00
barnold1953
ea2d75addc Code cleanup 2014-06-26 13:05:10 -07:00
barnold1953
07f7cc42ad Made spacebar reconnect the oculus. Code cleanup. 2014-06-26 12:58:23 -07:00
wangyix
97139b0bd0 Merge branch 'master' into seqNumberStats 2014-06-26 11:47:00 -07:00
wangyix
ad05c53823 moved audiomixer jbuffer stats to expanded section 2014-06-26 11:33:54 -07:00
barnold1953
6fcfde1100 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-06-26 11:27:47 -07:00
barnold1953
634e0f38e8 Accurate Oculus frame timing 2014-06-26 11:27:17 -07:00
Mohammed Nafees
6be4633a97 Merge remote-tracking branch 'upstream/master' into 19801 2014-06-26 23:48:11 +05:30
Clément Brisset
463ac9cc74 Merge pull request #3078 from PhilipRosedale/master 
Improved toy ball, JS calls for palm position, concertCamera.js
 2014-06-26 11:03:48 -07:00
Clément Brisset
cd53b727d0 Merge pull request #3080 from AndrewMeadows/bug-fix 
fix for avatar models with multiple roots
 2014-06-26 10:54:03 -07:00
barnold1953
adb6c445a2 Fixed camera FoV, code cleanup 2014-06-26 10:13:15 -07:00
barnold1953
61b20b2be0 Working 3.2 Oculus SDK 2014-06-26 09:56:19 -07:00
AndrewMeadows
dba9d33f86 Merge pull request #3075 from huffman/19644 
Code Review for Job #19644
 2014-06-26 09:39:20 -07:00
Andrew Meadows
0d18f2fbab fix for avatar models with multiple roots 2014-06-26 09:12:44 -07:00
Philip Rosedale
c72e41dcd2 added Oculus angular velocity, moved sit icon up 2014-06-25 22:27:54 -07:00
Andrew Meadows
c12c869cdf add "visible" transforms to JointState 
also stubbery for using them in Model and SkeletonModel
 2014-06-25 18:06:56 -07:00
wangyix
fe2eaa8e4a forgot to increment seqnum in Audio.cpp 2014-06-25 18:02:38 -07:00
wangyix
37ce693153 added seqnum stats to AudioMixerClientData; added seqnums to Audio.cpp 2014-06-25 18:01:34 -07:00
wangyix
2ec04fb756 replaced old seqnum tracking code with SequenceNumberStats 2014-06-25 17:20:57 -07:00
Philip Rosedale
93b131d520 Fix build warning from wrong init order 2014-06-25 15:41:47 -07:00
Philip Rosedale
58d460da09 option to turn on/off string hair 2014-06-25 15:14:17 -07:00
Andrzej Kapolka
6480c678d2 Disable strict aliasing for safe type punning, fix potentially uninitialized 
variable warning.
 2014-06-25 13:46:13 -07:00
David Rowe
9fb64386aa Fix stopping scripts in the script editor 2014-06-25 11:44:58 -07:00
wangyix
591bfa14b9 added PacketTypeAudioStreamStats for j-buffer stats 
...instead of packing that info into audio packets.
 2014-06-25 11:38:56 -07:00
Andrew Meadows
1b24a111fe JointState::_rotationInParentFrame is now private 2014-06-25 09:56:18 -07:00
wangyix
1257e0595a moved jbufferstats class to PositionalAudioRingBuffers 2014-06-25 09:52:02 -07:00
Andrew Meadows
d78580adc4 remove warning about uninitialized variables 2014-06-25 09:38:12 -07:00
Andrew Meadows
81209c38ca fix warning about out of order initialization 2014-06-25 09:09:44 -07:00
Andrew Meadows
d3d8e4dc2d fix warnings about signed/unsigned comparisons 2014-06-25 09:07:10 -07:00
Philip Rosedale
40dee3b39e Added JS calls for left/right estimated palm position on skeleton model, improved toy ball to use them 2014-06-25 05:24:22 -07:00
Philip Rosedale
88c01266ab more hair tweaks, don’t render in 1P, improved toy ball 2014-06-25 03:29:08 -07:00
Philip Rosedale
95a66a06af Merge branch 'master' of https://github.com/worklist/hifi 2014-06-25 02:57:54 -07:00
Ryan Huffman
3bec59fd33 Fix unindented line 2014-06-24 20:38:46 -07:00
Philip Rosedale
60c33c18c3 Expose mode shift period to JS, remove default value 2014-06-24 20:32:41 -07:00
Ryan Huffman
5ece424a45 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/ui/runningScriptsWidget.ui
 2014-06-24 20:27:44 -07:00
Clément Brisset
b6a8949b4c Merge pull request #3069 from binaryking/19765 
Code Review for Job #19765
 2014-06-24 17:49:42 -07:00
wangyix
52f00769d4 merged with upstream 2014-06-24 17:22:30 -07:00
wangyix
e1d28dfe73 removed debug code 2014-06-24 17:14:20 -07:00
Stephen Birarda
5f4baaffa5 revert credit balance rounding 2014-06-24 16:25:41 -07:00
Philip Rosedale
81e7f8e0a5 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-24 16:21:35 -07:00
Philip Rosedale
9eb91e2b44 tweaking params 2014-06-24 16:15:16 -07:00
Brad Hefta-Gaub
6d77d438ab Merge pull request #3057 from AndrewMeadows/ragdoll 
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
 2014-06-24 15:47:18 -07:00
Mohammed Nafees
d5d2107b97 Merge remote-tracking branch 'upstream/master' into 19765 2014-06-25 01:50:29 +05:30
Mohammed Nafees
7271f85041 Change font size values from pt to px in Chat Window. 2014-06-25 01:49:17 +05:30
Ryan Huffman
173be2c89d Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-24 12:01:04 -07:00
Ryan Huffman
f249020d6d Clean up redundant if statement 2014-06-24 11:50:54 -07:00
Ryan Huffman
89f43acb7f Add a tooltip with the full path to running scripts 2014-06-24 11:47:14 -07:00
Ryan Huffman
652543cdca Update _scriptEngineHash to work with duplicate running scripts 2014-06-24 11:46:35 -07:00
wangyix
c2b22c0aa2 Merge remote-tracking branch 'upstream/master' 2014-06-24 09:34:07 -07:00
Philip Rosedale
556578b8dc first pass - hair as vertlet strands 2014-06-24 09:30:11 -07:00
wangyix
53e3f5a3b0 merged with upstream 2014-06-24 09:13:05 -07:00
David Rowe
c40c5d78c8 Fix default audio devices on Windows 
Windows 8 provides the full friendly device name, not just the first 31 characters.
 2014-06-24 08:50:39 -07:00
wangyix
a4f5ce2215 added stats for audiomixer jitter buffers lengths in Application 2014-06-23 17:48:57 -07:00
barnold1953
e0a33f129c Updated oculus initialization 2014-06-23 15:55:54 -07:00
Brad Hefta-Gaub
19195f9119 Merge pull request #3056 from birarda/master 
fix rounding of credit balance in application title
 2014-06-23 14:48:37 -07:00
Andrew Meadows
415dfd98aa remove one line of cuft 2014-06-23 13:40:50 -07:00
Stephen Birarda
ed5c05a61b fix rounding of credit balance in application title 2014-06-23 13:25:32 -07:00
Andrew Meadows
b5aca45ab6 smaller timescale for slaving shapes to skeleton 2014-06-23 12:59:38 -07:00
Brad Hefta-Gaub
18cd794542 Merge pull request #3055 from wangyix/master 
Audio jitter buffer resizes depending on max inter-frame time gaps of incoming audio packets
 2014-06-23 12:45:04 -07:00
Andrew Meadows
7f4ffb363b merge upstream/master into andrew/ragdoll 2014-06-23 12:33:21 -07:00
Andrew Meadows
add556719c fixed perf stats on phys simulation 2014-06-23 12:31:36 -07:00
Andrew Meadows
9713e3d513 remove some unused var warnings in Release build 2014-06-23 12:30:53 -07:00
Brad Hefta-Gaub
29a8307825 Merge pull request #3050 from ctrlaltdavid/fix_fullscreen_shortcut 
Fix fullscreen toggle shortcut
 2014-06-23 11:42:20 -07:00
Andrew Meadows
8ad2a679c4 move code to SkeletonModel::stepRagdollForward() 2014-06-23 11:16:18 -07:00
Andrew Meadows
9a2197a23c draw skeleton shapes at at correct positions 2014-06-23 10:55:34 -07:00
wangyix
e5d7d471e3 removed debug code 2014-06-23 10:55:30 -07:00
Andrew Meadows
5e4d757e4e merge upstream/master into andrew/ragdoll 2014-06-23 10:43:40 -07:00
Andrew Meadows
8986be5f1c remove old collideAgaintsOurself() code 2014-06-23 10:36:31 -07:00
Andrew Meadows
eba03ddb8a re-enable some basic avatar collisions 2014-06-23 10:05:51 -07:00
Andrew Meadows
8b24e9cd67 Update SkeletonModel::_boundingShape position 2014-06-23 09:39:14 -07:00
Andrew Meadows
b2ea8c0bf9 Compute more correct masses for ragdoll parts 
also pin root ragdoll shape at the local-frame origin
for stability
 2014-06-23 08:37:11 -07:00
Mohammed Nafees
803ea28f99 Do not close the Models Browser if double clicked on the loading message 2014-06-21 23:01:22 +05:30
Mohammed Nafees
1b186c3b92 Remove unnecessary lines of code. 2014-06-21 17:57:11 +05:30
Mohammed Nafees
1368c72725 Keep the filter line edit of the Models Browser disabled until the models list has been populated. This fixes interface from crashing in case the user types in the line edit and the list is not populated. 2014-06-21 17:55:19 +05:30
Ryan Huffman
108fa36d24 Disable the ability to load a script multiple times 
It won't show up correctly in running scripts, and can cause it to end up running
in the background unnoticed.

Also added an error message for when a script doesn't load.
 2014-06-20 16:32:42 -07:00
Andrew Meadows
c17b8fdb60 collisions update shapes 
VerletShapes keep pointers to VerletPoints (rather than to glm::vec3's)
VerletShapes compute lagrangian coefficients
VerletShapes send their movement accumulations to their VerletPoints
 2014-06-20 16:31:39 -07:00
Ryan Huffman
0e6abe3359 Update inactive chat window opacity to 0.8 2014-06-20 16:31:22 -07:00
wangyix
a5457eb86b fixed bug in Audio.cpp where numSilentSamples was written to wrong place in packet 
added more debug stuff, other minor changes and fixes
 2014-06-20 14:43:18 -07:00
David Rowe
633746ab16 Different fullscreen shortcuts for Mac and Windows 
Revert to the original Mac OSX key combination and provide alternative for Windows.
 2014-06-20 13:30:04 -07:00
Ryan Huffman
0c87f0aabc Update chat window behavior 
Lower opacity when inactive
Move focus to main window when pressing escape, instead of hiding
 2014-06-19 19:45:43 -07:00
Andrew Meadows
4a0ce7a9ae support disabling collisions btw adjacent joints 2014-06-19 17:39:50 -07:00
Andrew Meadows
f0c2417206 Split PhysicsSimulation::stepForward() into parts 2014-06-19 15:50:16 -07:00
Andrew Meadows
716ae3e479 add MyAvatar's skeleton to its PhysicsSimulation 2014-06-19 12:32:17 -07:00
Andrew Meadows
fbafcb6fd8 Fix distance constraint lengths 2014-06-19 11:46:09 -07:00
Mohammed Nafees
a69c6f8e29 Change pt to px to solve the Windows font size issue 2014-06-19 23:58:31 +05:30
David Rowe
2dbf8d7daf Fix fullscreen toggle shortcut 
Remove the "Meta" modifier so that the shortcut works on Windows.
 2014-06-19 11:08:21 -07:00
Andrew Meadows
2453e9c36a build ragdoll constraints again 2014-06-19 10:31:55 -07:00
Andrew Meadows
5e74ee8c05 VerletPoint has position, lastPosition, and mass 2014-06-19 09:54:32 -07:00
Andrew Meadows
10ee307752 merge upstream/master into andrew/ragdoll 2014-06-19 08:35:29 -07:00
Andrew Meadows
a8c2003fe6 namechange SimulationEngine --> PhysicsSimulation 2014-06-19 08:34:12 -07:00
David Rowe
afab5f1cbf Fix startup crash where Hydra controllers are not properly plugged in 
Crash occurs if the left controller is plugged in but right one isn't.
 2014-06-18 20:52:17 -07:00
Andrew Meadows
c98631f820 merge upstream/master into andrew/ragdoll 2014-06-18 17:23:24 -07:00
Andrew Meadows
d4b5550cda Skeleton now creates VerletShape 2014-06-18 17:22:39 -07:00
Brad Hefta-Gaub
f2b2784fa9 Merge pull request #3045 from wangyix/edit_nack_pull 
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
 2014-06-18 15:02:40 -07:00
wangyix
29723d0ef3 changed octree data nacks to repeatedly nack missing seq nums 2014-06-18 13:36:54 -07:00
Clément Brisset
7597191081 Merge pull request #3042 from ZappoMan/editModelFeatures 
add support for changing the model URL of a model
 2014-06-18 11:52:01 -07:00
Brad Hefta-Gaub
c49ff59725 Merge pull request #3037 from wangyix/edit_nack_pull 
Edit nack pull
 2014-06-18 11:43:25 -07:00
ZappoMan
26075d9d26 add support for changing the model URL of a model 2014-06-18 11:29:56 -07:00
Andrew Meadows
9e839f0980 Shape::getCenter() -> Shape::getTranslation() 2014-06-18 08:55:48 -07:00
Ryan Huffman
7a08ac76d2 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/src/Menu.cpp
	interface/ui/preferencesDialog.ui
 2014-06-17 20:27:16 -07:00
Ryan Huffman
0877f9f159 Fix issues with running scripts window on Windows 
Replace running scripts table with a new widget that uses a proper
layout that doesn't rely on hard-coded sizing.  Custom painted lines
were replaced with a horizontal QFrame line.
 2014-06-17 20:19:49 -07:00
Brad Hefta-Gaub
dead474e6b Merge pull request #3034 from Barnold1953/OculusOverlay 
New Oculus Magnification Windows
 2014-06-17 17:29:09 -07:00
Brad Hefta-Gaub
cee6f1be6a Merge pull request #3031 from stojce/19755 
Code Review for Job #19755
 2014-06-17 17:28:55 -07:00
barnold1953
64725dd21b Unneeded comment 2014-06-17 17:15:43 -07:00
barnold1953
fa32ad5b11 De-janked code by removing magic numbers 2014-06-17 17:14:26 -07:00
Andrew Meadows
b9d4545aef merge upstream/master into andrew/ragdoll 
Conflicts:
	libraries/shared/src/Shape.h
	libraries/shared/src/ShapeCollider.h
 2014-06-17 17:03:16 -07:00
barnold1953
9f66eeb37f Added a const variable for readability 2014-06-17 16:48:06 -07:00
barnold1953
7cbb19551a Switched time query method and fixed horrifying bug 2014-06-17 16:38:19 -07:00
Brad Hefta-Gaub
df27de3c73 Merge pull request #3036 from huffman/19788 
Code Review for Job #19788
 2014-06-17 16:28:03 -07:00
Andrew Meadows
ecbf5043d7 code out of Model into base and derived classes 
PhysicalEntity (base class) gets some shape management stuff
SkeletonModel (derived class) gets some boundary shape and
joint-shape stuff
 2014-06-17 16:22:18 -07:00
barnold1953
6c74650552 Attempt to fix build errors 2014-06-17 15:40:11 -07:00
Stojce Slavkovski
591ab448a1 remove unused variable 2014-06-17 23:54:55 +02:00
Stojce Slavkovski
9824072300 remove unused parameter in AccountScriptingInterface::updateBalance 2014-06-17 23:51:02 +02:00
Stojce Slavkovski
8b5e3486a3 Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-17 23:22:03 +02:00
barnold1953
bee84a064c Dont render red border for mouse magnifier 2014-06-17 12:41:53 -07:00
barnold1953
2eda35ff1d Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2014-06-17 12:25:09 -07:00
barnold1953
e775d645a7 Fixed NAN error with magnification windows 2014-06-17 12:19:15 -07:00
Andrew Meadows
b37b9fb097 remove warnings about unused variables 2014-06-17 11:59:26 -07:00
barnold1953
7bb8e4d571 Animated magnification opening and closing 2014-06-17 11:20:02 -07:00
wangyix
6e71523346 added OctreeEditPacketSender::nodeKilled(), no locks yet 
also added nodeKilled() calls to the 3 editsenders in
Application::nodeKilled()
 2014-06-17 10:58:44 -07:00
barnold1953
dc663dedf8 Fixed compiler warnings 2014-06-17 10:45:59 -07:00
barnold1953
3052996a9e Pressing trigger and bumper at same time toggles UI 2014-06-17 10:37:15 -07:00
Ryan Huffman
5843425db9 Fix scripts being loaded on start even if they don't exist 
Application::loadScript should not store a reference to a script until
it has been successfully loaded.  Previously if a script didn't exist it
would be "loaded" and show up in the running scripts window, but
wouldn't have been successfully loaded, and wouldn't be running anything
at all.
 2014-06-17 09:18:58 -07:00
Brad Hefta-Gaub
5b62733a36 Merge pull request #3025 from talentraspel/19753 
replaced usleep for windows
 2014-06-16 17:40:01 -07:00
barnold1953
b0e89c5810 Made magnification use only button 3 2014-06-16 17:34:18 -07:00