Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 13:23:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49471 commits 25 branches 0 tags 1.1 GiB
Commit graph

18589 commits

Author SHA1 Message Date
Brad Davis
31f39d7eef Allow scripts to inject tracing events 2017-01-10 14:06:39 -08:00
Brad Davis
1dd2747ef9 Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking. 2017-01-10 10:44:04 -08:00
Chris Collins
30d5f70e11 Merge pull request #9278 from jherico/cpu_opt_scene 
More low level optimizations
 2017-01-09 10:10:40 -08:00
Brad Hefta-Gaub
1a7b5ab520 Merge pull request #9326 from jherico/oculus_budget_stats 
Adding tracking of Oculus renders, submits, and frames that are over budget
 2017-01-06 18:18:16 -08:00
Howard Stearns
b432ffa78d Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction 
Fix the PAL & Space Bubble interaction
 2017-01-06 16:47:43 -08:00
Zach Fox
dec41f67cc Fix bugs and generally fix behavior 2017-01-06 13:58:23 -08:00
Howard Stearns
36c99a604b Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal 
Edit button to select in pal
 2017-01-06 13:17:29 -08:00
Brad Davis
15b9e750f9 Adding tracking of Oculus renders, submits, and frames that are over budget 2017-01-06 10:51:26 -08:00
howard-stearns
2f5f53c8e4 cr 2017-01-06 10:28:09 -08:00
Atlante45
428a7f3bf8 Log Dialog doesn't float on top 2017-01-05 17:49:39 -08:00
Zach Fox
495925a017 This behavior was harder to change than expected... 2017-01-05 16:58:32 -08:00
howard-stearns
f5c4535115 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 16:29:34 -08:00
Howard Stearns
3f54428744 Merge pull request #9313 from howard-stearns/pal 
People Action List
 2017-01-05 15:49:56 -08:00
howard-stearns
ef02c84759 further simplification of letterbox, and use for selection failures 2017-01-05 14:46:32 -08:00
howard-stearns
0cdeac8736 abstract out letterbox message 2017-01-05 14:32:31 -08:00
howard-stearns
0670a4689f Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 13:57:44 -08:00
Howard Stearns
bbf7d16537 process consistent select message 2017-01-05 13:45:03 -08:00
Howard Stearns
28326ff47a Merge pull request #9306 from zfox23/PALVisualUpdates 
Fix PAL scrollbar; add helper popup to ADMIN tab
 2017-01-05 13:29:21 -08:00
howard-stearns
47aa1e4f8e add pal to defaultScripts 2017-01-05 12:23:17 -08:00
Zach Fox
b5713656be Minor language changes on Admin help text 2017-01-05 09:27:12 -08:00
Brad Hefta-Gaub
368f48f0a7 Merge pull request #9247 from huffman/feat/tutorial-touch-grip 
Add support for new Touch grip mappings to tutorial
 2017-01-04 17:58:05 -08:00
Clément Brisset
e34ecac843 Merge pull request #9299 from Atlante45/settings 
Fix settings hitch
 2017-01-04 17:19:44 -08:00
howard-stearns
9709bedca7 checkpoint 2017-01-04 16:55:58 -08:00
Zach Fox
0c77ff2556 Fix silly quotation bug 2017-01-04 16:28:23 -08:00
Zach Fox
083bf95917 Fix PAL scrollbar; add helper popup to ADMIN tab 2017-01-04 16:25:13 -08:00
Brad Hefta-Gaub
f9ca41e89c Merge pull request #9302 from jherico/expose_dropped_count 
Expose dropped frames count to stats UI
 2017-01-04 16:12:35 -08:00
Howard Stearns
3d8da683db Merge pull request #9290 from zfox23/PersonalMute 
Personal mute; Quasi-ignore; Reversible PAL actions
 2017-01-04 14:37:09 -08:00
Zach Fox
675159be45 Last commit to fix final bugs 2017-01-04 14:33:02 -08:00
Zach Fox
ac41e8abc4 Bugfix re: population; remove user image for now 2017-01-04 14:06:51 -08:00
Zach Fox
c695878025 Clear local ignored list upon domain change 2017-01-04 13:31:16 -08:00
Brad Davis
3f2fdd1915 Expose dropped frames count to stats UI 2017-01-04 13:20:58 -08:00
Zach Fox
dde5f69ac9 More CR & simplifications 2017-01-04 12:41:30 -08:00
Atlante45
56a25dfdee Check setting value changed 2017-01-04 11:56:24 -08:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Zach Fox
899dd21328 Lots of CR feedback 2017-01-03 15:43:30 -08:00
Zach Pomerantz
26cfc83e20 Merge branch 'master' into graphics/fetch-cull-sort 2017-01-03 14:04:39 -05:00
Zach Fox
4a21eaa33f Cleanup before PR 2016-12-30 15:18:01 -08:00
Zach Fox
951db2e2da Bugs fixed! 2016-12-30 15:12:17 -08:00
Zach Fox
ea40582afb Remaining bug: Hover when sort 2016-12-30 12:55:46 -08:00
Zach Fox
f26b7c0134 Checkpoint 2016-12-30 09:51:43 -08:00
Brad Hefta-Gaub
84eca0159e Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval 
Conflicts:
	tests/networking/src/ResourceTests.cpp
 2016-12-29 16:42:52 -08:00
Brad Hefta-Gaub
0c22fcb5c4 better handling of timers 2016-12-29 16:41:14 -08:00
Zach Pomerantz
0e9da87549 FetchSortCull->FetchCullSort 2016-12-29 19:27:37 -05:00
Zach Fox
3bd68f5e3e Checkpoint for removing userData 2016-12-29 16:09:31 -08:00
Zach Fox
be4050aa78 One bug down! 2016-12-29 15:43:42 -08:00
Zach Fox
f96508e197 Gotta fix these bugs... 2016-12-29 14:19:40 -08:00
Zach Fox
10b5b957f2 Ahh...It's beautiful and simple now. 2016-12-29 13:09:40 -08:00
Zach Fox
24eac77115 I'm about to refactor this. 2016-12-29 11:57:51 -08:00
Zach Fox
bb2b48d424 Getting very close. 2016-12-29 11:35:20 -08:00
Brad Hefta-Gaub
a72f60152b audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate 2016-12-29 08:53:37 -08:00