Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-09 18:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41080 commits 25 branches 0 tags 1.1 GiB
Commit graph

41080 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
1c1158b761 Add Windows manifest to interface.exe 2016-03-31 14:20:19 -07:00
Ryan Huffman
fdbd58765c Remove printSupported from printSystemInformation 2016-03-29 16:06:55 -07:00
Ryan Huffman
3c9f26a7f2 Add CPUID::getAllFeatures 2016-03-28 10:48:51 -07:00
Ryan Huffman
b155a0534b Fix brace placement in CPUID 2016-03-25 16:23:48 -07:00
Ryan Huffman
f2a28efcd2 Fix CPUID::CPU_Rep being defined on non-Win 2016-03-25 16:02:52 -07:00
Ryan Huffman
8d7670a4e8 Move system information logging to SharedUtil 2016-03-25 16:00:04 -07:00
Ryan Huffman
9efef21527 Fix indentation 2016-03-25 15:38:25 -07:00
Ryan Huffman
c4a87925e2 Add system information to log file 2016-03-25 15:34:53 -07:00
Brad Hefta-Gaub
dbfea6ec82 Merge pull request #7439 from jherico/deadlock_qml 
Fix potential deadlock in QML
 2016-03-23 14:16:37 -07:00
Brad Hefta-Gaub
61651b21db Merge pull request #7443 from Atlante45/readme 
Update readme
 2016-03-23 14:16:07 -07:00
Atlante45
fdd7bb9f58 Update readme 2016-03-23 13:19:34 -07:00
Brad Davis
84dc15aff6 Fix potential deadlock in QML 2016-03-23 12:59:17 -07:00
Brad Hefta-Gaub
8c290ea6b9 Merge pull request #7390 from Atlante45/feat/udp-flood-protection 
Server side bandwidth dial
 2016-03-23 11:47:41 -07:00
Brad Hefta-Gaub
08b87b9b98 Merge pull request #7434 from zzmp/clean/incomplete-fbo 
Clean up QML Render Thread
 2016-03-23 10:43:21 -07:00
Brad Hefta-Gaub
2e6c360708 Merge pull request #7427 from huffman/fix-scriptengine-threading 
Add protection around ScriptEngine::runInThread being called twice
 2016-03-23 10:27:16 -07:00
Chris Collins
29ac80d3fe Merge pull request #7430 from ZappoMan/blenderDestructorCrash 
make Blender keep a shared pointer to the model it's blending
 2016-03-23 09:00:01 -07:00
Brad Hefta-Gaub
03a12ecf5a Merge pull request #7433 from zzmp/fix/long-qml-instantiation 
Avoid triggering deadlock on long local qml component instantion
 2016-03-23 08:30:50 -07:00
Brad Hefta-Gaub
fc920c321b Merge pull request #7436 from jherico/alloc_watch 
Add a tracker and logging of memory allocated by the GPU library
 2016-03-23 08:28:31 -07:00
Brad Davis
252a49eea4 Add a tracker and logging of memory allocated by the GPU library 2016-03-22 22:35:46 -07:00
Brad Davis
2fdb92e8cd Move oglplus dependency from sourceforge to s3 2016-03-22 22:19:10 -07:00
Zach Pomerantz
40b21933a5 Clean QML Surface render log 2016-03-22 18:42:54 -07:00
Zach Pomerantz
fe1d8b24b4 Lock the QML Surface resizing better 2016-03-22 18:42:46 -07:00
Zach Pomerantz
b41c106f3c Only set the context once per QML surface 2016-03-22 18:40:58 -07:00
Zach Pomerantz
745438148a Reset deadlock watch before qml load 2016-03-22 17:17:36 -07:00
Zach Pomerantz
9c11474dd7 Expose qApp->updateHeartbeat 2016-03-22 17:17:36 -07:00
Brad Hefta-Gaub
9f0084dbb1 make Blender keep a shared pointer to the model it's blending 2016-03-22 16:01:31 -07:00
Brad Davis
3e71316589 Merge pull request #7426 from ZappoMan/avatarIdentityFix 
fix to default avatar model
 2016-03-22 13:46:52 -07:00
Brad Hefta-Gaub
d372ca47ad Merge pull request #7428 from zzmp/fix/clear-qml-gl 
Clear GL error before initializing qml to avoid mystery crash
 2016-03-22 13:39:45 -07:00
Zach Pomerantz
e28a876629 Compare gl to GL_NO_ERROR, not GLEW_OK 2016-03-22 13:25:43 -07:00
Zach Pomerantz
471ac80135 Revert most of "Rm extra GL logging" 2016-03-22 13:24:29 -07:00
Brad Hefta-Gaub
361aa3e683 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarIdentityFix 2016-03-22 12:31:19 -07:00
Zach Pomerantz
362e288be8 Rm mystery GL error before qml fbo 2016-03-22 12:05:24 -07:00
Zach Pomerantz
23e3b7e4e3 Rm extra GL logging 2016-03-22 12:04:58 -07:00
Zach Pomerantz
64ced6ee04 Add comment explaining bare glGetError 2016-03-22 12:04:24 -07:00
Brad Hefta-Gaub
bc0ea0e893 Merge pull request #7425 from sethalves/refix-convexHullContains 
be more defensive in FBXGeometry::convexHullContains
 2016-03-22 12:03:11 -07:00
Brad Hefta-Gaub
691ee87c73 fix to default avatar model 2016-03-22 11:32:38 -07:00
Ryan Huffman
1a2f74f43a Add protection around ScriptEngine::runInThread being called twice 2016-03-22 11:26:10 -07:00
Seth Alves
47fb85eaeb be more defensive in FBXGeometry::convexHullContains 2016-03-22 11:24:12 -07:00
Philip Rosedale
f57332e4be Merge pull request #7421 from ZappoMan/fixBlenderCrashRedux 
one more crack at fixing the blender
 2016-03-22 09:51:21 -07:00
Andrew Meadows
114cb27c4f Merge pull request #7422 from jherico/tabs 
Fix occasional crash on creating overlay tool windows
 2016-03-22 09:49:22 -07:00
Brad Davis
a30df07d53 PR feeback, precendence 2016-03-22 09:15:29 -07:00
Brad Davis
28f25489f8 Fix occasional crash on creating overlay tool windows 2016-03-21 19:17:31 -07:00
Brad Hefta-Gaub
513138ca98 one more crack at fixing the blender 2016-03-21 18:28:26 -07:00
Philip Rosedale
6b3a4eb327 Merge pull request #7419 from hyperlogic/tony/no-locks-no-problem 
Prevent deadlocks in AvatarUpdate
 2016-03-21 17:54:27 -07:00
Seth Alves
eee4abfd95 Merge pull request #7420 from birarda/octree-leak 
fix a memory leak in OctreePacketProcessor packet piggybacking
 2016-03-21 17:52:04 -07:00
Stephen Birarda
20c923db32 remove leaking unused method from NLPacketList 2016-03-21 17:26:49 -07:00
Clément Brisset
59b043d803 Merge pull request #7418 from birarda/ds-uuid-cookie 
fix a crash in DS and remove storage of cookie UUIDs to disk
 2016-03-21 17:17:01 -07:00
Philip Rosedale
c8816f8e76 Merge pull request #7389 from Menithal/on-grab-fix 
Grab.js: Update Position on Mouse Grab Start
 2016-03-21 17:10:00 -07:00
Chris Collins
277f49ef64 Merge pull request #7410 from hyperlogic/tony/limit-accumulate-time-loops 
AnimUtil: prevent accumulateTime from looping forever
 2016-03-21 16:39:37 -07:00
Stephen Birarda
6b28523cb5 don't release the OPP processed packet 2016-03-21 16:29:18 -07:00