Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 11:53:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12308 commits 71 branches 56 tags 1.2 GiB
Commit graph

12308 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
9884d74f60 Merge pull request #2728 from Atlante45/fix_audio_jitter 
Fix audio jitter
 2014-04-24 18:25:16 -07:00
Atlante45
cf7fe2306b Fix audio jitter 2014-04-24 18:10:51 -07:00
Philip Rosedale
c66805e2fb Merge pull request #2727 from Atlante45/fix_error_from_remove_gettimeofday 
Fix error introduced with gettimeofday removing + spelling mistake
 2014-04-24 17:40:47 -07:00
Atlante45
01637e8037 Fix error introduced with gettimeofday removing + spelling mistake 2014-04-24 17:37:48 -07:00
Clément Brisset
fd8ec9b5c2 Merge pull request #2723 from huffman/19554-2 
19554 - Chat Updates
 2014-04-24 16:44:22 -07:00
Ryan Huffman
d88897ccc7 Add error box when going to user/location that doesn't exist 2014-04-24 15:55:34 -07:00
Stephen Birarda
482c2078ed Merge pull request #2725 from murillodigital/master 
Changes to XML structure for multiple platform versioning
 2014-04-24 15:24:53 -07:00
Leonardo Murillo
a21991c5c2 Fixing xml parsing 2014-04-24 16:22:34 -06:00
Leonardo Murillo
f4c98a8fa4 Fixing xml parsing 2014-04-24 16:21:49 -06:00
Ryan Huffman
5d71c97195 Merge remote-tracking branch 'origin/19554-2' into 19554-2 2014-04-24 14:56:11 -07:00
Ryan Huffman
b69fa73dfa Unsplit a line in FramelessDialog 2014-04-24 14:54:57 -07:00
Ryan Huffman
7b09812028 Remove insertFromMimeData override in ChatMessageArea 2014-04-24 14:54:26 -07:00
Ryan Huffman
ccad0aed9e Move ChatInputArea code in header to .cpp 2014-04-24 14:54:01 -07:00
Leonardo Murillo
27002a9406 Casting to QUrl 2014-04-24 15:10:37 -06:00
Leonardo Murillo
ad0f0118bc fixes for new versioning: 2014-04-24 15:01:37 -06:00
Philip Rosedale
04f3e01a1b Merge pull request #2720 from ey6es/master 
Added option to render joint constraints, changed safeEulerAngles so that z (rather than y) is in [-pi/2, pi/2], added ability to set end effector rotation in IK, added option to avoid aligning forearms with wrists.
 2014-04-24 09:54:48 -07:00
Ryan Huffman
1a5dbf3da6 Merge branch '19554-2' of github.com:huffman/hifi into 19554-2 2014-04-23 16:17:16 -07:00
Ryan Huffman
b0e1eab7ed Fix chat input textbox to use native scrollbar 
The border around the textedit was causing QT to use a non-native
scrollbar.  Moving the box into a frame that contains the border styling
fixes this.
 2014-04-23 16:15:51 -07:00
Andrzej Kapolka
4f8c1f9c65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 16:09:23 -07:00
Clément Brisset
d441e6a453 Merge pull request #2717 from AndrewMeadows/inertia 
avatar bounding capsule collision against voxels
 2014-04-23 16:06:14 -07:00
Ryan Huffman
0cba95e7ad Reorder property initialization in FramelessDialog 2014-04-23 15:37:49 -07:00
Ryan Huffman
1774f6c9bd Add threshold to auto scroll 2014-04-23 15:37:28 -07:00
Ryan Huffman
d56a4e169e Add ChatInputArea 2014-04-23 15:24:21 -07:00
Andrew Meadows
c5f1a8abd6 formatting 2014-04-23 13:37:13 -07:00
Andrew Meadows
fe42f66cc9 change x.f to be x.0f as per the coding standard 2014-04-23 13:27:43 -07:00
Ryan Huffman
95357a7c35 Update chat input area to use a 14pt font 2014-04-23 12:30:40 -07:00
Andrzej Kapolka
2bac802407 One more unused variable. 2014-04-23 12:30:39 -07:00
Andrzej Kapolka
c8c3cf3664 Remove unused propagate option for applyRotationDelta. 2014-04-23 12:29:01 -07:00
Ryan Huffman
5fd585aab1 Fix error with cursor format getting reset when sending chat message 2014-04-23 12:26:59 -07:00
Andrzej Kapolka
d38d3db224 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 12:25:43 -07:00
Andrzej Kapolka
141250d51c Don't constrain elbow when rotating forearm with wrist. 2014-04-23 12:22:24 -07:00
AndrewMeadows
620c3119b4 Merge pull request #2714 from Atlante45/removed_gettimeofday 
Removed gettimeofday
 2014-04-23 12:22:18 -07:00
Andrzej Kapolka
0386dec2a6 Provide option to align wrists with forearms. 2014-04-23 12:09:54 -07:00
Ryan Huffman
951d5004e1 Add ChatInputArea with custom paste 2014-04-23 11:57:43 -07:00
Andrzej Kapolka
09bb51261a Got that backwards. 2014-04-23 11:55:16 -07:00
Andrzej Kapolka
523498ee5b Revert to using weight that doesn't depend on number of free joints. 2014-04-23 11:52:22 -07:00
Andrzej Kapolka
511fc8367f More work on IK. 2014-04-23 11:34:34 -07:00
Atlante45
f68d2d16a8 Inserted a char by mistake 2014-04-23 11:05:16 -07:00
Atlante45
ceb5208102 CR 2014-04-23 11:00:44 -07:00
Ryan Huffman
c65d5f08ca Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-23 10:54:51 -07:00
Ryan Huffman
9bea70ac54 Revert "Add emoticons to chat" 
This reverts commit 3c9b6264a8.
 2014-04-23 10:49:22 -07:00
Andrzej Kapolka
f7bc1ae62c Working on integrating rotation into IK. 2014-04-23 10:47:24 -07:00
Atlante45
ae566c55f6 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-23 10:38:29 -07:00
Andrew Meadows
f46a5dc966 fix #2718 for warning about unused variable 2014-04-23 10:13:05 -07:00
Andrzej Kapolka
c471a55f1f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 09:40:51 -07:00
Andrew Meadows
a7771bc142 repair header comments for AABox.* 2014-04-23 09:05:11 -07:00
Andrew Meadows
bfe1ee377b remove warning about signed/unsigned comparison 
Also change n.f to be n.0f as per coding standard
 2014-04-23 08:56:53 -07:00
Andrew Meadows
da5ac3d664 remove warning about signed/unsigned comparison 2014-04-23 08:47:25 -07:00
Andrew Meadows
67d0920f81 merge upstream/master into andrew/inertia 2014-04-23 08:40:48 -07:00
Andrew Meadows
7464ca0879 non-rounded collision solution in comments 2014-04-23 08:38:58 -07:00