Commit graph

42849 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
66235acac2 Merge pull request #7725 from howard-stearns/quit-consistently
Quit consistently
2016-04-20 19:17:52 -07:00
Brad Hefta-Gaub
5244274ae4 fix warning 2016-04-20 19:06:31 -07:00
Brad Hefta-Gaub
248ac8d760 fix warning 2016-04-20 19:04:39 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
samcake
2bc8191fa6 one more comment from review 2016-04-20 18:04:11 -07:00
David Rowe
9c9bca546c Add button that opens scripts directory window 2016-04-21 11:52:03 +12:00
Brad Hefta-Gaub
d3384cf51e Merge pull request #7722 from zzmp/fix/load-lock
Fix deadlock on shutdown from blocking texture/model loads
2016-04-20 16:43:33 -07:00
Atlante45
492bc75d68 Reduce max packet size to 1492 2016-04-20 15:58:01 -07:00
samcake
f2f092e9c8 Cleanup thanks to review 2016-04-20 15:42:30 -07:00
Ryan Huffman
f90e1aaa23 Remove #line from starsGrid.slf
Fails to compile with certain drivers.
2016-04-20 15:04:10 -07:00
howard-stearns
0544bcaacd Simpler cross-platform solution, with comments. 2016-04-20 15:02:41 -07:00
Zach Pomerantz
2c7cf3ea83 Fix RateScriptingInterface headers 2016-04-20 14:32:25 -07:00
David Rowe
6e8b535e80 Merge branch 'master' into 20872 2016-04-21 09:19:00 +12:00
Zach Pomerantz
ad225b3aed Fix RatesScriptingInterface ctor 2016-04-20 13:58:06 -07:00
Zach Pomerantz
477d6f40e4 Avoid use of atomic copy ctor in RateCounter 2016-04-20 13:39:57 -07:00
Zach Pomerantz
1fe12e7029 Mv Rates to RatesScriptingInterface.h 2016-04-20 13:26:23 -07:00
Zach Pomerantz
d28b12ec3c Guard OBJ at operators 2016-04-20 13:04:45 -07:00
Zach Pomerantz
948af75f8a Transfer loaded resources with smart ptrs to avoid shutdown deadlock 2016-04-20 13:00:35 -07:00
Zach Pomerantz
2cc48a6ca6 Add url to resource retry debug 2016-04-20 12:20:05 -07:00
howard-stearns
77d6e0e3e9 Remove include. 2016-04-20 10:34:10 -07:00
howard-stearns
b221232117 Windows-only version, without changing assignment-client/domain-server
classes.
2016-04-20 10:31:26 -07:00