Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 18:10:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31455 commits 25 branches 28 tags 1.2 GiB
Commit graph

31455 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
992bd5c9d2 fix sixense and vive rotation readings for palms 2015-09-02 11:37:36 -07:00
Andrew Meadows
eb78b39bea fix typo that broke build and remove warning 2015-09-02 11:31:05 -07:00
ericrius1
1e6198cf59 update dhydra grab to grab near and far objects, and removed grabbing logic from toybox.js 2015-09-02 11:29:37 -07:00
Anthony J. Thibault
1ae22268ac Added comment to AnimStateMachine header. 2015-09-02 11:04:52 -07:00
Seth Alves
3e11852845 Merge pull request #5685 from howard-stearns/standing-hmd-animations 
Standing hmd animations
 2015-09-02 10:57:45 -07:00
Seth Alves
849477ac12 Merge branch 'standing-hmd-animations' of github.com:howard-stearns/hifi into test-5685 2015-09-02 10:52:30 -07:00
Anthony J. Thibault
4a749a0403 Updated MyAvatar to use animGraph from gist instead of local host. 2015-09-02 10:41:04 -07:00
Anthony J. Thibault
d13a188dde Compile fixes and added test case to verify onDone and onLoop triggers 2015-09-02 10:31:45 -07:00
Anthony J. Thibault
d151474446 Merge branch 'master' into ajt/new-anim-system 2015-09-02 10:00:36 -07:00
Seth Alves
16ee5199e8 change how polyvox neighbors are notified of updates 2015-09-02 09:30:32 -07:00
Seth Alves
f54d924f4a make sure intersected entity is in the list of possible polyvoxes to adjust 2015-09-02 09:29:51 -07:00
Raffi Bedikian
9318661bc3 Add algorithm comments to FXAA shader 2015-09-01 23:54:48 -07:00
Seth Alves
3963035599 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-01 21:08:23 -07:00
Andrew Meadows
b7d892cfcd Merge pull request #5691 from ctrlaltdavid/display-names-in-front 
Only render display names if in front of camera
 2015-09-01 19:59:06 -07:00
Andrew Meadows
dd2f94bc88 Merge pull request #5696 from birarda/sixense-fix 
fix for sixense compile when not present
 2015-09-01 19:56:03 -07:00
Anthony J. Thibault
7b4cb8655c First pass integration of new anim system into rig. 2015-09-01 17:57:01 -07:00
Seth Alves
8608e4f2b0 small bug-fixes 2015-09-01 16:51:55 -07:00
Seth Alves
9256917f15 rebake mesh when a neighbor changes 2015-09-01 16:21:12 -07:00
Stephen Birarda
e5a10e3174 resolve conflicts on merge with upstream/master 2015-09-01 17:07:32 -06:00
Howard Stearns
0f227577b7 Merge pull request #5692 from sethalves/joint-bandwidth 
WARNING: protocol change - reduce joint-data bandwidth
 2015-09-01 15:58:16 -07:00
Brad Davis
4e0bcf5395 Merge pull request #5699 from highfidelity/revert-5678-addressbar 
Revert "Address bar now closes when you click outside of it"
 2015-09-01 15:36:49 -07:00
Leonardo Murillo
232fd72e53 Revert "Address bar now closes when you click outside of it" 2015-09-01 16:32:29 -06:00
Seth Alves
4ab8ac29b9 make terrain a doubly linked list 2015-09-01 15:23:47 -07:00
Seth Alves
264d39aa9b have knitted polyvoxes keep track of low-axis neighbors as well as high 2015-09-01 14:49:17 -07:00
Ryan Downe Karpf
710f7c002e Merge pull request #5678 from SeijiEmery/addressbar 
Address bar now closes when you click outside of it
 2015-09-01 14:42:19 -07:00
Ryan Downe Karpf
f0d69b1cdd Merge pull request #5665 from ctrlaltdavid/20664 
Add search radius field to entities list
 2015-09-01 14:39:53 -07:00
Stephen Birarda
231ea3b240 fix namespacing for sequence number hasher 2015-09-01 15:35:50 -06:00
Stephen Birarda
9a4d666b0c no consts if HAVE_SIXENSE not set 2015-09-01 15:33:54 -06:00
Stephen Birarda
2ce225d76c fix for sixense not present on OS X 2015-09-01 15:33:46 -06:00
Andrew Meadows
a7d57d7c60 cleanup whitespace 2015-09-01 14:31:47 -07:00
Stephen Birarda
d29449b43a no consts if HAVE_SIXENSE not set 2015-09-01 15:19:56 -06:00
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