Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 16:33:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
49250 commits 75 branches 59 tags 1.2 GiB
Commit graph

18513 commits

Author SHA1 Message Date
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
Zach Fox
7c51d47ae4 Better separator 2016-12-21 14:11:14 -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
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
Brad Hefta-Gaub
5e65e3991c CR feedback 2016-12-20 21:03:10 -08:00
David Kelly
50554e934e Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn 2016-12-20 16:30:10 -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
Andrew Meadows
e43efa74de use sampled counter 2016-12-20 16:16:31 -08:00
Andrew Meadows
fa18d548f7 use proper category for NumAvatarsPerSec trace 2016-12-20 15:28:25 -08:00
Andrew Meadows
4d711d869c cleanup 2016-12-20 14:45:11 -08:00
Andrew Meadows
991a61b722 fix data collection for AvatarsPerSec 2016-12-20 14:01:03 -08:00
Andrew Meadows
1788d19260 remove some debug code 2016-12-20 14:00:25 -08:00
David Kelly
7750e86c13 Only send machine fingerprint when not logged in 
While at it, no longer grabbing it at all when starting up, as that
was just a dev thing.  Should consider not sending MAC address too, but
we may revisit that later.
 2016-12-20 13:47:58 -08:00
Andrew Meadows
03114fa610 add AvatarsPerSec trace stats 2016-12-20 11:45:21 -08:00
Brad Hefta-Gaub
9b11c7cc9c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/networking/src/NodeList.cpp
 2016-12-20 10:46:57 -08:00
Brad Hefta-Gaub
2079b1ff7e cleanup comments 2016-12-20 10:45:36 -08:00
Howard Stearns
9aad93465d Merge pull request #9227 from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -08:00
Brad Hefta-Gaub
6a7fa63327 classify ScriptEngine errors better, and send them as signal to JS 2016-12-20 09:00:01 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
0c9ff87feb add support for an HMD script debug log window 2016-12-19 19:34:14 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
Brad Hefta-Gaub
df954cab10 remove some log spam, recatargorize script logs to allow fine grain filtering 2016-12-19 16:15:10 -08:00
Howard Stearns
891aba31a1 Merge pull request #9233 from samcake/ambient 
Introducing a fix for the overlayered model drawn in front
 2016-12-19 15:56:32 -08:00
howard-stearns
60cb7acb50 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 15:28:07 -08:00
samcake
c435afb728 Introducing a fix for the overlayered model drawn in front 2016-12-19 13:17:56 -08:00
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
aa837d8858 It's working! Untested on human avatars. 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
howard-stearns
9d9345cb65 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 09:19:14 -08:00
Brad Davis
ee3c8e6efd Merge pull request #9225 from jherico/chrome_tracing 
Additional work on tracing
 2016-12-16 17:53:55 -08:00
Brad Davis
2d73588361 Fix stat tracker missing in agents 2016-12-16 17:34:00 -08:00