Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 00:50:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
49545 commits 71 branches 59 tags 1.2 GiB
Commit graph

18607 commits

Author SHA1 Message Date
Zach Fox
a9226e303c Pull out visual changess & move them to other PR 2017-01-13 13:00:23 -08:00
Zach Fox
b0b6aeac6c Ken's feedback 2017-01-13 13:00:03 -08:00
Zach Fox
b9cddc31a9 Checkpoint before implementing Ken's suggestions 2017-01-13 13:00:03 -08:00
Zach Fox
503468e49b Style changes 2017-01-13 12:59:23 -08:00
Zach Fox
dcff873cd4 Modify slider function 2017-01-13 12:57:35 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Seth Alves
f9a36d68ad Merge pull request #9363 from ctrlaltdavid/21127 
Make Clara.io downloads convert textures to PNG
 2017-01-13 10:14:43 -08:00
Zach Fox
71f0e02210 Merge pull request #9373 from zfox23/PAL_ScrollbarRefinement 
PAL: Scrollbar refinement & visual updates
 2017-01-12 20:41:18 -08:00
Brad Davis
659badd8bf Change minimum threadpool size 1 2017-01-12 14:43:31 -08:00
samcake
ca53235d54 Merge pull request #9358 from AndrewMeadows/model-cleanup 
minor cleanup for Model rendering code
 2017-01-12 14:30:16 -08:00
samcake
b9e8f7ee14 Merge pull request #9359 from jherico/cached_qml_surfaces 
Eagerly cache QML surfaces for Web3D overlays
 2017-01-12 14:28:35 -08:00
Zach Fox
b7e95a3486 Updates from Alan 2017-01-12 14:14:28 -08:00
Zach Fox
8e1a70891d Checkpoint after cherry-picking from existing PR 2017-01-12 10:59:28 -08:00
Brad Davis
2de83d42bc Add process and system CPU usage to traces 2017-01-12 09:19:08 -08:00
David Rowe
8cd7e1b377 Improve user messages 2017-01-12 15:48:25 +13:00
David Rowe
b41f8c754d Add updateable message box to JavaScript API 2017-01-12 15:46:53 +13:00
Andrew Meadows
b3e336de3d remove cruft: unused function arguments 2017-01-11 15:02:18 -08:00
Brad Davis
f235a52a6d Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet 2017-01-11 14:21:29 -08:00
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