Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-18 22:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49261 commits 25 branches 28 tags 1.2 GiB
Commit graph

49261 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
1cb330057e fix a crash and a memory leak in vhacd-util 2016-12-23 13:05:57 -08:00
Chris Collins
9bacab07e6 Merge pull request #9254 from PhilipRosedale/ambisonicRotation 
Ambisonic rotation
 2016-12-23 09:25:48 -08:00
Andrew Meadows
648de9da8d Merge pull request #9264 from ChristophHaag/master 
fix GL 4.5 when glTextureSubImage2DEXT unavailable
 2016-12-23 08:36:11 -08:00
Zach Fox
aff05a56e7 Merge pull request #9265 from zfox23/HalveBubbleVolume 
Halve the space bubble audio volume
 2016-12-22 16:41:44 -08:00
Zach Fox
f2bdbe051c Halve the volume 2016-12-22 16:35:12 -08:00
Christoph Haag
966cbb768d fix GL 4.5 when glTextureSubImage2DEXT unavailable 
For example mesa
 2016-12-23 01:26:54 +01:00
samcake
eb5b92ae5d Merge pull request #9263 from AndrewMeadows/benji-003 
less noisy measure of avatar processing performance metric
 2016-12-22 16:17:36 -08:00
Andrew Meadows
fc4763be03 use PROFILE_COUNTER not SAMPLE_PROFILE_COUNTER 2016-12-22 15:55:17 -08:00
samcake
b5e964f6ec Merge pull request #9260 from jherico/chrome_tracing 
Working on test/trace script interface
 2016-12-22 15:23:26 -08:00
Brad Davis
be6b098e1b Implement test scene loading 2016-12-22 13:12:59 -08:00
Brad Davis
e58623bcc0 Working on test/trace script interface 2016-12-22 11:46:40 -08:00
David Kelly
e67d6e347d Merge pull request #9253 from zfox23/PAL_QML_Updates 
PAL Visual Style Updates
 2016-12-22 10:21:27 -08:00
Brad Hefta-Gaub
c6be02dc40 Merge pull request #9251 from ZappoMan/removeLogSpam 
debug window enhancements
 2016-12-21 14:26:42 -08:00
Zach Fox
7c51d47ae4 Better separator 2016-12-21 14:11:14 -08:00
Philip Rosedale
b02d14fcc2 set right thing initially 2016-12-21 13:17:08 -08:00
Philip Rosedale
632bf997f3 debug off 2016-12-21 13:15:44 -08:00
Philip Rosedale
cf3a260646 added ability to rotate entity and sound direction 2016-12-21 13:13:59 -08:00
Zach Fox
1eea3ed27d No more semicolons; tons of improvements 2016-12-21 12:48:26 -08:00
Zach Fox
630fb8696f Lots of progress today 2016-12-21 12:48:26 -08:00
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
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