Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41306 commits 71 branches 56 tags 1.2 GiB
Commit graph

41306 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
22191a2864 When an albedo texture is replaced from script,make sure its aloha channel is checked for opacity 2016-03-23 16:12:43 -07:00
samcake
851cbb1c46 change 2016-03-23 16:07:41 -07:00
samcake
40f04f871f Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-23 16:04:26 -07:00
Anthony J. Thibault
0d37515784 Merge branch 'master' into tony/vive-rendering-work 2016-03-23 15:59:59 -07:00
samcake
1e46b0803c fixing repported issues during review 2016-03-23 15:59:57 -07:00
Brad Hefta-Gaub
3fa3b40f43 fix non-animated motor proteins 2016-03-23 15:56:31 -07:00
howard-stearns
550738776c Pass whether or not previous session crashed to the UserActivityLogger. 2016-03-23 15:56:29 -07:00
samcake
7d99183474 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-23 15:47:00 -07:00
samcake
138a996013 First draft of monitoring the memeory consumption 2016-03-23 15:46:17 -07:00
Andrew Meadows
ecfe198e35 patch btCompoundShape memory leak 2016-03-23 14:39:49 -07:00
Andrew Meadows
119ef24d5d cleanup ShapeManager API and fix bitrot in tests 2016-03-23 14:39:49 -07:00
Andrew Meadows
a52ac3cc50 remove excess whitespace 2016-03-23 14:39:49 -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
Stephen Birarda
34fb06a7bd changes to attachments dialog from contractor 2016-03-23 13:52:47 -07:00
Atlante45
fdd7bb9f58 Update readme 2016-03-23 13:19:34 -07:00
Zach Pomerantz
8b1a78bac0 Restrict Resource reinsertion 2016-03-23 13:00:29 -07:00
Zach Pomerantz
17aa2845a8 Add finished signal to Resource loading 2016-03-23 13:00:02 -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
samcake
de96e34f7e Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-23 10:00:06 -07:00
samcake
b29ef7b037 IMplementing a memory counter 2016-03-23 09:45:38 -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
PhilipRosedale
7e658896e6 update header 2016-03-22 22:39:55 -07:00
PhilipRosedale
472dd07625 airship from hack project 2016-03-22 22:39:22 -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
Anthony J. Thibault
df187499ff MyAvatar: fix jitter in hands when moving 
Store hand controller positions within the avatar in sensor space, not world space.
Before IK the sensorToWorld matrix is updated to reflect the world space motion of the
character controller during physics.  This ensures the IK hand targets move properly with the character.
 2016-03-22 19:19:52 -07:00
samcake
24b26e3097 first few elements 2016-03-22 19:18:46 -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
Anthony J. Thibault
9dd24f81d4 Fix for osx and linux 2016-03-22 18:24:48 -07:00
Anthony J. Thibault
c40b70688c Made Nsight wrapper win32 only. 2016-03-22 17:43:36 -07:00
ericrius1
8ce23e2345 simple baton test 2016-03-22 17:41:29 -07:00
ericrius1
7450a2ea3a update 2016-03-22 17:38:56 -07:00
ericrius1
e5364fd186 update 2016-03-22 17:33:18 -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
ericrius1
60bb77fd34 unload baton 2016-03-22 17:12:42 -07:00
ericrius1
107479039a update 2016-03-22 17:10:04 -07:00
ericrius1
608821b50b simple baton 2016-03-22 17:06:49 -07:00
ericrius1
ad5a111b85 simple baton 2016-03-22 17:04:47 -07:00
samcake
34633c2f19 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-22 16:51:32 -07:00
samcake
3274df9923 Fixing the missing field for blender translucent map 2016-03-22 16:18:51 -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