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

42770 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
032b8a94a4 Change registration property's label 2016-04-22 13:22:57 +12:00
David Rowe
7b9e6b52fb Merge branch 'master' into 20872 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-04-22 13:19:47 +12:00
David Rowe
a7b82e8cae Decouple ui and shared libraries 2016-04-22 12:58:47 +12:00
David Rowe
266e4c998b Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD 2016-04-22 12:29:22 +12:00
Stephen Birarda
bc706191df add_definitions from cmake for each release type 2016-04-21 17:28:11 -07:00
Stephen Birarda
5ea8b83745 use noquote so URLs are not quoted 2016-04-21 17:16:21 -07:00
Stephen Birarda
19702a9cd4 cleanup check for resource retry 2016-04-21 17:14:07 -07:00
Andrew Meadows
c35ddccba1 Merge pull request #7718 from zzmp/fix/release-motion-states 
Remove myAvatar motion states on shutdown
 2016-04-21 17:11:25 -07:00
Stephen Birarda
8cd330f431 add back on fail when server unavailable 2016-04-21 17:07:29 -07:00
Stephen Birarda
3a8c2144bf move asset retry debug to print before retry 2016-04-21 16:55:49 -07:00
Ryan Huffman
9e46b43489 Add threading related asserts to AssetClient 2016-04-21 16:39:57 -07:00
Ryan Huffman
da5bbe51d1 Fix AssetClient not properly disconnecting from callbacks 2016-04-21 16:37:21 -07:00
Brad Hefta-Gaub
72c81e2378 Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew 2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub
48fcaf9e4b Merge pull request #7734 from jherico/perf_testing 
Make the rendering testing destination customizable
 2016-04-21 16:10:20 -07:00
Brad Hefta-Gaub
0f966e934e Merge pull request #7728 from ctrlaltdavid/20887 
Add link in Running Scripts that opens scripts folder
 2016-04-21 16:01:52 -07:00
Brad Hefta-Gaub
d87d631871 Merge pull request #7708 from zzmp/feat/render-rates 
Add renderRates.js to visualize rates over time
 2016-04-21 15:59:58 -07:00
Brad Hefta-Gaub
68b0a3fa02 Merge pull request #7724 from huffman/fix/stars-grid-macro 
Remove #line from starsGrid.slf
 2016-04-21 15:59:06 -07:00
Brad Hefta-Gaub
85a8c90de7 Merge pull request #7729 from huffman/fix/osx-go-home 
Fix 'Go Home' not working on OSX
 2016-04-21 15:58:45 -07:00
Brad Hefta-Gaub
d9ae788818 more CR feedback 2016-04-21 15:55:50 -07:00
Brad Hefta-Gaub
e8af41c6ab more CR feedback 2016-04-21 15:54:51 -07:00
Brad Hefta-Gaub
2abcc454b0 CR feedback 2016-04-21 15:48:18 -07:00
Seth Alves
e2025b0d1f lock entity-tree before accessing entities 2016-04-21 15:27:15 -07:00
Seth Alves
b088191966 Merge pull request #7731 from huffman/fix/asset-request-crash 
Fix AssetRequest crash where signal was not disconnected
 2016-04-21 15:22:08 -07:00
Brad Davis
33ec73bfd8 PR comments 2016-04-21 15:11:11 -07:00
Brad Davis
ef466a64bf Add GPUIdent logic for determining video memory 2016-04-21 14:46:13 -07:00
Brad Davis
6c30194916 Support lowering the minimum mip of a texture at runtime 2016-04-21 14:46:12 -07:00
Brad Davis
b85b8db337 Better visual for texture stress test 2016-04-21 14:46:11 -07:00
Brad Davis
2689f2cc4a Add MB/KB/Byte conversion macros 2016-04-21 14:46:11 -07:00
Brad Davis
e4233f87ec Increase default renderstats window size 2016-04-21 14:46:10 -07:00
Brad Davis
5007c9bd4c Update glew version 2016-04-21 14:46:09 -07:00
Brad Davis
e9959df2df Decoupling resourcecache from nodelist 2016-04-21 14:46:09 -07:00
Howard Stearns
7aca95507e comments 2016-04-21 14:46:08 -07:00
Howard Stearns
7f748153c5 Mac code for gpu memory. 2016-04-21 14:46:08 -07:00
Brad Davis
8f91768bc0 Make the testing destination customizable 2016-04-21 13:47:55 -07:00
Atlante45
0c32f47f50 Don't call virtual method from base dtor 2016-04-21 13:25:31 -07:00
Ryan Huffman
63d98b1b5c Fix AssetRequest crash where signal was not disconnected 2016-04-21 12:12:04 -07:00
Clément Brisset
b849316f60 Merge pull request #7721 from huffman/feat/udpate-edit-model-icon 
Update 'model' icon in edit.js
 2016-04-21 10:37:14 -07:00
Zach Pomerantz
62f1e8d129 Fix checked_at in OBJReader to use ref 2016-04-21 10:02:35 -07:00
samcake
018196a070 One more review comment 2016-04-21 09:58:36 -07:00
Brad Hefta-Gaub
f9c4959578 remove some debugging, tweak formatting 2016-04-21 09:53:00 -07:00
Brad Hefta-Gaub
ddf5b0f316 some debugging 2016-04-21 10:32:22 -07:00
Stephen Birarda
aaf1fdb71c Merge pull request #7723 from zzmp/log/retry-url 
Add url to resource retry debug log
 2016-04-21 09:04:53 -07:00
Ryan Huffman
47d0b8f28f Fix 'Go Home' not working on OSX 2016-04-21 08:55:57 -07:00
Atlante45
778c19d7e4 Make sure the socket allows fragmenting 2016-04-21 08:38:08 -07:00
howard-stearns
c274df6066 uint64 2016-04-20 22:57:33 -07:00
howard-stearns
904e87313e Match the gpu adapter names gainst the vendor and renderer names used by 
the ogl we're using, so that we pick the right GPU to get info from.
 2016-04-20 22:57:32 -07:00
howard-stearns
b403dcb0d9 An experiment to see if dual-card Windows desktops can be made to answer 
the correct card.
 2016-04-20 22:57:32 -07:00
howard-stearns
cb137635db Fix stupid MSVC default indentation. 2016-04-20 22:57:31 -07:00
howard-stearns
c12772e4c6 GPU identification utilities 2016-04-20 22:57:30 -07:00
David Rowe
6c5335cfa7 Replace button with icon and text 2016-04-21 15:17:06 +12:00