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

49298 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
0be4db1e68 Checkboxes! 2016-12-21 12:48:26 -08:00
Zach Fox
9b65a72bb5 Popup essentially done 2016-12-21 12:48:25 -08:00
Zach Fox
5b77202c52 Popups wow! 2016-12-21 12:48:25 -08:00
Zach Fox
db2da8f06b Great cleanup 2016-12-21 12:48:25 -08:00
Zach Fox
7999e14ecf Kinda screwed things up by changing styles 2016-12-21 12:48:25 -08:00
Zach Fox
feafc16833 Frequent checkpoints are good. 2016-12-21 12:47:38 -08:00
Zach Fox
e7c2229b2c More progress 2016-12-21 12:46:23 -08:00
Zach Fox
deb40f67df Steady progress 2016-12-21 12:46:23 -08:00
Zach Fox
46c787512e Working 2016-12-21 12:46:23 -08:00
Zach Fox
5996228622 Starting off strong. 2016-12-21 12:46:23 -08:00
Anthony Thibault
52e418481e Merge pull request #9252 from ZappoMan/addViewFrustumToAvatarMixer 
cleanup avatar data code to include better documentation
 2016-12-21 12:30:23 -08:00
Brad Hefta-Gaub
a14d106d3b Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-21 11:52:30 -08:00
Brad Hefta-Gaub
8e7b062aa2 cleanup avatar data to include better documentation 2016-12-21 11:52:24 -08:00
Brad Hefta-Gaub
e6a20102d4 debug window enhancements 2016-12-21 11:31:34 -08:00
Andrew Meadows
0b0c3f0be4 cleanup some if-logic 2016-12-21 10:55:59 -08:00
Andrew Meadows
2209c0ebba remove debug hook for dumping stats to logs 2016-12-21 10:55:59 -08:00
Andrew Meadows
3830649990 remove debugging and profiling 2016-12-21 10:55:59 -08:00
Andrew Meadows
b937eff582 more faster math copying JointData 2016-12-21 10:55:59 -08:00
Andrew Meadows
3f687887b9 faster math when unpacking JointData rotations 2016-12-21 10:55:59 -08:00
Andrew Meadows
8ab6974233 optimizations for processing avatar joint data 2016-12-21 10:55:59 -08:00
Brad Hefta-Gaub
08cfd8a40e Merge pull request #9208 from ZappoMan/addViewFrustumToAvatarMixer 
Optimize avatar-mixer bandwidth for out of view avatars
 2016-12-21 10:22:56 -08:00
samcake
909f24c3e1 Merge pull request #9245 from AndrewMeadows/avatars-per-second 
measure avatar processing stats in Chrome trace framework
 2016-12-21 09:13:41 -08:00
Brad Hefta-Gaub
be62df2001 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-21 08:59:29 -08:00
David Kelly
173e04ae7b Merge pull request #9244 from davidkelly/dk/noFingerprintWhenLoggedIn 
Only send machine fingerprint when not logged in
 2016-12-21 08:45:34 -08:00
Brad Hefta-Gaub
2ba4fee44b CR feedback 2016-12-21 08:26:20 -08:00
Brad Hefta-Gaub
5e65e3991c CR feedback 2016-12-20 21:03:10 -08:00
Chris Collins
9ee1c64573 Merge pull request #9246 from birarda/touch-equip 
add Oculus Touch friendly grab and equip
 2016-12-20 17:12:34 -08:00
David Kelly
08b6770315 Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn 2016-12-20 17:07:51 -08:00
Howard Stearns
51c0ab0aed Merge pull request #9248 from howard-stearns/fixIdentityPacketInAC 
Fix idententity packet in AC
 2016-12-20 17:02:27 -08:00
David Kelly
50554e934e Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn 2016-12-20 16:30:10 -08:00
howard-stearns
a6e353d75f read lock, not write 2016-12-20 16:25:23 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2016-12-20 16:25:12 -08:00
Brad Hefta-Gaub
14445c37fe Merge pull request #9231 from PhilipRosedale/ambisonic 
Entity script for ambisonic sound emitter
 2016-12-20 16:16:37 -08:00
Andrew Meadows
e43efa74de use sampled counter 2016-12-20 16:16:31 -08:00
howard-stearns
3f4faec15f Fix idententity packet in AC 2016-12-20 16:14:59 -08:00
Philip Rosedale
4bade4400f fixed typo per review 2016-12-20 16:02:26 -08:00
Andrew Meadows
fa18d548f7 use proper category for NumAvatarsPerSec trace 2016-12-20 15:28:25 -08:00
Brad Hefta-Gaub
0be49c6a84 Merge pull request #9238 from ZappoMan/removeLogSpam 
Logging improvements
 2016-12-20 15:03:55 -08:00
Stephen Birarda
ebd347fc15 only respect release of secondary for hold once pressed 2016-12-20 14:46:55 -08:00
Andrew Meadows
4d711d869c cleanup 2016-12-20 14:45:11 -08:00
Brad Hefta-Gaub
c2320d317c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 2016-12-20 14:34:57 -08:00
Stephen Birarda
4fcccb5455 check for release of equip in this.nearGrabbing 2016-12-20 14:32:47 -08:00
Stephen Birarda
c3d736dd16 return after release, duh 2016-12-20 14:30:08 -08:00
David Kelly
4a25b727d8 Add comment back, with interest 2016-12-20 14:26:45 -08:00
Stephen Birarda
8cd13eaedf always unequip on secondary release 2016-12-20 14:25:26 -08:00
Stephen Birarda
0a024616cc add special equip for oculus style grab 2016-12-20 14:21:23 -08:00
Brad Hefta-Gaub
0448023a0f better handle null senders, trim lines after 2000 2016-12-20 14:14:28 -08:00
Philip Rosedale
13e03b35cc removed initial delay for seek beams 2016-12-20 14:11:52 -08:00
Philip Rosedale
250d071788 grip squeezes fingers too 2016-12-20 14:11:45 -08:00
Philip Rosedale
938734d3fc Grip controllers can grab objects, slight delay on search beam 2016-12-20 14:11:33 -08:00