Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 03:05:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41480 commits 25 branches 0 tags 1.1 GiB
Commit graph

41480 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
574642a6e4 Merge pull request #7440 from zzmp/feat/resource-finished 
Add finished signal to Resource loading
 2016-03-23 17:17:53 -07:00
Anthony J. Thibault
73725106f0 OpenGLDisplayPlugin: For non-threaded present use fetchAndReleasewithGpuWait 2016-03-23 17:13:29 -07:00
Anthony J. Thibault
cec6e7dd8d Application: reduced idle PROFILE_RANGE spam 2016-03-23 17:12:48 -07:00
Anthony J. Thibault
8bb387dc74 Revert GLEscrow changes 2016-03-23 17:11:16 -07:00
Brad Hefta-Gaub
fdd0b48ae1 reduce log spam 2016-03-23 17:06:03 -07:00
howard-stearns
dbdf79f96f Restore whitespace so there aren't superfluous diffs. 2016-03-23 17:01:50 -07:00
howard-stearns
c435ca212a Report previous session time. 2016-03-23 16:59:17 -07:00
James B. Pollack
7934eee368 Merge pull request #13 from ericrius1/homereset 
Water effect for water can created on hold and deleted on release now
 2016-03-23 16:50:53 -07:00
ericrius1
22629bf6c4 water effect created on hold 2016-03-23 16:46:38 -07:00
ericrius1
7bbb8167d0 fixed rotation plant 2016-03-23 16:41:57 -07:00
Menithal
12ecd592ab Added Refresh Buttons to entityProperties 
Pressing buttons next to the url bar will now allow for content to have an
automatic unix timestamp to be applied / updated to the end of the url.
Applies for all url entity Properties
 2016-03-24 01:14:48 +02:00
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
James B. Pollack
6f0d3201de poster 2016-03-23 16:10:33 -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
James B. Pollack
536027d96b posters 2016-03-23 15:53:52 -07:00
samcake
7d99183474 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-23 15:47:00 -07:00
James B. Pollack
3acd37dc90 faxing berlin 2016-03-23 15:34:09 -07:00
James B. Pollack
057c31c384 enable reset 2016-03-23 15:32:40 -07:00
James B. Pollack
95d246e483 Merge pull request #12 from ericrius1/homereset 
Clock works with arbitrary rotations
 2016-03-23 15:24:45 -07:00
ericrius1
c4f36dc02e reverted pistol changes 2016-03-23 15:22:56 -07:00
ericrius1
dd5e972a5c adeed blocks 2016-03-23 15:18:21 -07:00
ericrius1
42196ea5c4 homereset 2016-03-23 15:09:14 -07:00
James B. Pollack
5a508d6f23 tanksss 2016-03-23 15:05:36 -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
James B. Pollack
d75db853c2 add posters and such 2016-03-23 13:56:39 -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
ericrius1
1809c2971e clock works with arbitrary rotations 2016-03-23 11:28:31 -07:00
ericrius1
cf9ef1078d rotation working for second hand 2016-03-23 11:17:49 -07:00
ericrius1
6758c5f210 in progress 2016-03-23 10:53:35 -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
James B. Pollack
f7b1129152 dont set at begin for tank 2016-03-23 10:38:23 -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
ericrius1
2b8027042c clock face 2016-03-23 10:14:25 -07:00
James B. Pollack
a52926c4af Merge branch 'homereset' of github.com:imgntn/hifi into homereset 2016-03-23 10:11:49 -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