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

8591 commits

This branch
This branch
All branches
Author SHA1 Message Date
stojce
2b2ebea80b Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-21 00:59:05 +01:00
Philip Rosedale
19793a9a4a Merge pull request #1595 from ey6es/master 
Fix hand jerkiness when flying (by always keeping the hand positions relative to the body orientation/position).
 2014-01-20 14:50:20 -08:00
Andrzej Kapolka
b98ceec21c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-20 13:45:49 -08:00
Andrzej Kapolka
804ce83fa6 Get the base position/orientation directly from the avatar to prevent 
jerkiness when flying with the Hydra.  Also, restore arm lengths when the
Hydra becomes inactive.
 2014-01-20 13:44:41 -08:00
Andrzej Kapolka
81ab68a529 Store hand position relative to body orientation/position. 2014-01-20 12:44:09 -08:00
stojce
35a8dfdab5 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-20 21:44:03 +01:00
stojce
c785ecf5ed fixed file deselection 2014-01-20 21:43:43 +01:00
Andrzej Kapolka
af74a73423 Merge pull request #1594 from ey6es/master 
Compile fixes (perhaps just for my version of Qt/GCC).
 2014-01-20 11:42:38 -08:00
Andrzej Kapolka
520f7a78a8 Compile fixes (perhaps just for my version of Qt/GCC). 2014-01-20 11:41:04 -08:00
stojce
62e9459c12 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-20 18:32:57 +01:00
ZappoMan
a4e3f06502 Merge pull request #1592 from ZappoMan/master 
fix windows build
 2014-01-20 09:30:29 -08:00
Brad Hefta-Gaub
0c55447809 fix windows build 2014-01-20 09:26:49 -08:00
ZappoMan
17abbc4715 Merge pull request #1586 from PhilipRosedale/master 
Clap script and better bird sounds
 2014-01-20 09:06:28 -08:00
ZappoMan
3945bef0e9 Merge pull request #1579 from birarda/master 
replace civetweb with a QTcpSocket subclass
 2014-01-20 09:05:41 -08:00
Stephen Birarda
7381848acb add back linking of Winmm for DomainServer on WIN32 2014-01-20 08:56:43 -08:00
stojce
f01c2fb935 deselect selected file; close dialog after import 2014-01-19 23:20:47 +01:00
stojce
daffadbac4 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-19 13:59:20 +01:00
Stephen Birarda
fbf4cc59ee Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-17 17:26:08 -08:00
Philip Rosedale
2fe666aa63 Merge pull request #1583 from birarda/nodelist-container 
NodeList container repairs
 2014-01-17 17:23:16 -08:00
Stephen Birarda
cffe9624a6 Merge pull request #1572 from ZappoMan/bugfixes 
Fix issue #1519 and adds feature #1520
 2014-01-17 17:21:30 -08:00
Philip Rosedale
34db251c05 Merge pull request #1591 from ey6es/master 
Remove unused variables, change orbit pitch behavior.
 2014-01-17 17:12:12 -08:00
Andrzej Kapolka
341f60da76 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-17 17:10:46 -08:00
Philip Rosedale
4547f07739 added fountain script 2014-01-17 17:10:15 -08:00
Andrzej Kapolka
470b83a55b Got the sign backwards. 2014-01-17 17:04:22 -08:00
Andrzej Kapolka
765f98fadc Remove unused variables, change orbit pitch behavior (closes #1582). 2014-01-17 17:00:03 -08:00
Philip Rosedale
08c49bb68f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-17 16:54:48 -08:00
Stephen Birarda
659ba3c784 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-17 16:52:16 -08:00
Philip Rosedale
317af4c927 Merge pull request #1585 from AndrewMeadows/paddle-fixes 
Paddle fixes
 2014-01-17 16:50:10 -08:00
Philip Rosedale
5abf612990 new sounds for voxelBird, clap scripts 2014-01-17 16:43:43 -08:00
Andrew Meadows
0921999c3b Removing menu option for where to hold the ball -- we always hold from the finger tip (approximately). 2014-01-17 16:37:44 -08:00
Andrew Meadows
6c6a59b252 Hand now holds a ball a bit forward, which prevents the body from colliding with the ball on throw. 2014-01-17 16:36:50 -08:00
Andrew Meadows
3750aa902a Cleanup of "soft hand paddle" collision hackery. Still a hack, but more commented and readable. 2014-01-17 16:31:06 -08:00
Andrew Meadows
aac1764243 Re-enabling particle-avatar collisions. 2014-01-17 16:30:07 -08:00
Stephen Birarda
594165782a repair badly scoped usage of QMutexLocker 2014-01-17 16:20:22 -08:00
Stephen Birarda
99cd6c8ce8 remove two unused variable warnings 2014-01-17 16:04:04 -08:00
Stephen Birarda
fad7bde0e1 add mutex locking to NodeHash 2014-01-17 16:02:57 -08:00
Stephen Birarda
9007a15381 comment out the JurisdictionListener's connection for now 2014-01-17 15:27:44 -08:00
Stephen Birarda
b24eca199a use new signal slot syntax in JurisdictionListener 2014-01-17 15:23:58 -08:00
Stephen Birarda
816b324236 switch to explicit lock and unlock in removeSilentNodes 2014-01-17 15:17:10 -08:00
Stephen Birarda
3355b71d6b switch back to returning iterator from killNodeAtHashIterator 2014-01-17 15:13:56 -08:00
Stephen Birarda
4d0aa615d6 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-17 14:30:30 -08:00
Stephen Birarda
6670ff6ee5 fix linking of webserver for octree-server 2014-01-17 14:27:24 -08:00
Stephen Birarda
5fdf310a45 hook OctreeServer up to embedded-webserver 2014-01-17 14:21:15 -08:00
ZappoMan
bb41fe6ddb Merge pull request #1573 from stojce/19484 
Code Review for Job #19484
 2014-01-17 13:25:59 -08:00
ZappoMan
d8ce38a0aa Merge pull request #1576 from Atlante45/master 
Fixed mouseVoxel getting resized all the time when flying over smaller voxels
 2014-01-17 13:24:40 -08:00
Stephen Birarda
ffb628edfb remove the DomainServer singleton instance from DS 2014-01-17 12:18:41 -08:00
Stephen Birarda
1900d3a13b remove the old civetweb upload handler 2014-01-17 12:16:56 -08:00
Stephen Birarda
0f8cbb9aec add back script upload ability hooked to HttpManager 2014-01-17 12:16:19 -08:00
stojce
99feb36d19 Merge branch 'master' of https://github.com/worklist/hifi into 19484 2014-01-17 20:57:23 +01:00
stojce
01b9bd61ad Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-17 20:56:40 +01:00