Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 22:44:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14579 commits 76 branches 59 tags 1.2 GiB
Commit graph

14579 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Atlante45
36fb530594 Switched DomainServer to NetworkAccessManager 2014-07-02 10:26:38 -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
Brad Hefta-Gaub
2df851dcfc Merge pull request #3106 from ctrlaltdavid/19823 
Code Review for Job #19823
 2014-07-02 09:06:01 -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
7c3292a41b Switched AccountManager to NetworkAccessManager 2014-07-01 17:47:31 -07:00
Atlante45
30644c750d Switched AvatarData to NetworkAccessManager 2014-07-01 17:46:23 -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
Atlante45
d6a2cea756 Switched AudioMixer to NetworkAccessManager 2014-07-01 17:39:45 -07:00
Atlante45
231557a12c Switched Agent to NetworkAccessManager 2014-07-01 17:35:34 -07:00
wangyix
ab503583dd switched order of args in PositionalAudioRingBuffer 2014-07-01 17:33:38 -07:00
Atlante45
29976d7861 Created base for wrapper singleton class NetworkAccessManager 2014-07-01 17:17:34 -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
Brad Hefta-Gaub
5d789ec108 Merge pull request #3101 from Atlante45/add_interface_to_log_user_activity 
Add interface to log user activity
 2014-07-01 13:42:09 -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
af30dc2722 Updated oculus readme.txt for windows users 2014-07-01 12:33:54 -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
David Rowe
bc1660cdeb Configure multi-processor building on Windows 2014-07-01 09:57:23 -07:00
Stephen Birarda
5ba4a4dbb5 initial pass of MIDI implementation that bubbles events to JS 2014-07-01 09:53:18 -07:00
Andrew Meadows
5934ee5b22 added tests for ConeRollerConstraint 2014-07-01 09:35:47 -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