Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 22:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

32492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
29285028c3 fix for sixense not present on OS X 2015-09-01 15:18:59 -06:00
Stephen Birarda
f24a267d83 fix hasher for HifiSockAddr on ubuntu 2015-09-01 15:16:02 -06:00
Andrew Meadows
4a7a384c65 avoid bad joints when computing bounding capsule 2015-09-01 14:12:14 -07:00
Seth Alves
7194700c0b pull from upstream 2015-09-01 13:39:33 -07:00
Stephen Birarda
33f6933544 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-01 14:36:16 -06:00
Seth Alves
e32b9191f5 bump AvatarData protocol version 2015-09-01 13:35:58 -07:00
Stephen Birarda
6e7db4e816 Merge pull request #51 from huffman/tiemstamp-on-receive-packet-from-packetlist 
Move lastHeardMicroStamp to be updated when filtering packets
 2015-09-01 14:35:07 -06:00
Clément Brisset
a1db4c37a7 Merge pull request #42 from birarda/control-pair-probe 
send a control packet as bandwidth probe
 2015-09-01 22:33:51 +02:00
Seth Alves
6f80c484b4 cleanups 2015-09-01 13:33:19 -07:00
Ryan Huffman
639dbea25b Move lastHeardMicroStamp to be updated when filtering packets 2015-09-01 13:32:24 -07:00
Seth Alves
76923583ee Interface only sends joint data to avatar-mixer if they have changed enough since the last send 2015-09-01 13:31:34 -07:00
Clément Brisset
5a8a95f367 Merge pull request #48 from huffman/win-fixes 
More Windows build fixes
 2015-09-01 21:41:56 +02:00
Clément Brisset
7c15b88d98 Merge pull request #50 from huffman/mac-fixes 
Replace NO_ERROR with NoError
 2015-09-01 21:40:51 +02:00
Ryan Huffman
70c937d37f Replace NO_ERROR with NoError 2015-09-01 12:31:30 -07:00
Ryan Huffman
b73d307210 Move std::placeholders::_1 to where they are used 2015-09-01 12:24:38 -07:00
Ryan Huffman
fb8e822fa8 Fix lines longer than 120 columns 2015-09-01 12:14:58 -07:00
Ryan Huffman
d166e6d8c3 Move UUID.cpp/h to libraries/shared 2015-09-01 12:00:43 -07:00
Ryan Huffman
cb5a49e6e4 Add missing headers needed to build on Windows 2015-09-01 11:59:45 -07:00
Ryan Huffman
019d234ffd Replace std::bind for methods that use std::unique_ptr with a lambda 2015-09-01 11:58:33 -07:00
Ryan Huffman
a7cae75efc Merge pull request #47 from Atlante45/protocol 
Win build fixes
 2015-09-01 11:56:23 -07:00
Seth Alves
3d7aa6f4d6 Merge pull request #5676 from AndrewMeadows/dubnium 
remove a few warnings from linux build
 2015-09-01 11:45:06 -07:00
Seth Alves
5c0cdfe049 Merge pull request #5651 from AndrewMeadows/copernicium 
fix hand IK rotation for all models
 2015-09-01 11:21:13 -07:00
Andrew Meadows
fe2d03fd37 merge 
Conflicts:
	libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp
	libraries/shared/src/GLMHelpers.cpp
 2015-09-01 11:17:08 -07:00
Seth Alves
930c5cefc9 fix setSphere to create a world-space sphere rather than a voxel-space one 2015-09-01 11:10:21 -07:00
Stephen Birarda
56d6d95df9 only process cp tail if in the right spot 2015-09-01 12:09:58 -06:00
Seth Alves
ca1602e443 if avatar is already standing on a terrain-polyvox, try creating a new one where they are facing 2015-09-01 11:09:46 -07:00
Andrew Meadows
7410baedf0 merge highfidelity/master into andrew/copernicium 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
	libraries/animation/src/Rig.cpp
	libraries/animation/src/Rig.h
 2015-09-01 11:08:01 -07:00
Anthony J. Thibault
2401e6cc4b Merge branch 'master' into ajt/new-anim-system 2015-09-01 10:58:38 -07:00
David Rowe
2b17eafef4 Only render display names in front of camera 2015-09-01 10:24:50 -07:00
Clément Brisset
0733ba54c7 Win build fixes 2015-09-01 18:23:44 +01:00
Stephen Birarda
6c9021c288 only send second packet of pair when required 2015-09-01 11:10:19 -06:00
Stephen Birarda
2a8250ced5 Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe 2015-09-01 11:10:06 -06:00
Seth Alves
320338a13f Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-01 10:07:02 -07:00
Seth Alves
7b6d267c06 Merge pull request #5675 from AndrewMeadows/darmstadtium 
remove PhysicsEntity class
 2015-09-01 10:06:01 -07:00
Clément Brisset
1e8ab09cd4 Merge pull request #46 from huffman/win-fixes 
Windows build fixes
 2015-09-01 18:52:55 +02:00
Andrew Meadows
47c18fa18a reduced gravity effect in IK 2015-09-01 09:51:14 -07:00
Andrew Meadows
0e5b357362 revert unintended change to "gravity" term in IK 2015-09-01 09:51:14 -07:00
Andrew Meadows
bdcc68ce36 fix bug: allow IK to iterate more than once 
also changed name of parentTransform to be rootTransform
for more correctness
 2015-09-01 09:51:14 -07:00
Andrew Meadows
fba7478c52 remove menu items for legacy IK options 2015-09-01 09:51:14 -07:00
Andrew Meadows
617e210fc6 fix for vive controller to place hand for IK 2015-09-01 09:51:14 -07:00
Andrew Meadows
bb63267e30 fix hand IK rotations or all models 2015-09-01 09:45:14 -07:00
Andrew Meadows
802b3a88c3 more corret cmake file for sixense 2015-09-01 09:45:14 -07:00
Ryan Huffman
899b94eab3 Add cstdint include to Asset* files 2015-09-01 09:41:19 -07:00
Ryan Huffman
db92e3155c Update AssetServerError enum to be camelcase 2015-09-01 09:39:30 -07:00
Seth Alves
05957cdb6b Merge branch 'darmstadtium' of github.com:AndrewMeadows/hifi into polyvox-again 2015-09-01 09:23:27 -07:00
Stephen Birarda
be78d7f3aa fix headers for move of UUID to shared 2015-09-01 10:20:06 -06:00
Stephen Birarda
4824b38465 move UUID back to shared 2015-09-01 10:17:07 -06:00
Seth Alves
0dfe6e8054 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-01 09:13:43 -07:00
Seth Alves
4cbfe96b70 allow a sphere set/clear to affect more than one polyvox at a time 2015-08-31 18:16:32 -07:00
Seth Alves
7369ca19e9 allow setting cuboid voxel spaces. clean up some locking 2015-08-31 18:01:15 -07:00