Zach Pomerantz
|
7f05e4453b
|
Fetch model geometries through cache
|
2016-03-24 11:35:40 -07:00 |
|
Zach Pomerantz
|
fc8b34f8c7
|
Move tex alpha detection to cv method
|
2016-03-24 09:48:33 -07:00 |
|
Brad Hefta-Gaub
|
16c5971a7f
|
Merge pull request #7455 from ctrlaltdavid/20860
Miscellaneous improvements to Attachments dialog
|
2016-03-24 09:21:36 -07:00 |
|
Philip Rosedale
|
f8f0e48af9
|
Merge pull request #7453 from Atlante45/fix/atp-req-limit
Make ATP respect request limit
|
2016-03-24 09:20:30 -07:00 |
|
Seth Alves
|
1aadebb4e7
|
Merge pull request #7445 from AndrewMeadows/shape-management
fix memory leak in ShapeManager
|
2016-03-24 08:45:49 -07:00 |
|
Philip Rosedale
|
0e2d9d8aaa
|
Merge pull request #7432 from samcake/orange
Fix some Model loading issues with the translucent textures
|
2016-03-24 08:41:35 -07:00 |
|
Andrew Meadows
|
21c770f37b
|
Merge pull request #7441 from zzmp/clean/resource-reinsert
Restrict Resource reinsertion
|
2016-03-24 08:41:12 -07:00 |
|
Andrew Meadows
|
c8655b8524
|
Merge pull request #7438 from PhilipRosedale/airship
Sample script: Airship
|
2016-03-24 08:40:36 -07:00 |
|
David Rowe
|
51728d14a7
|
Miscellaneous improvements to Attachments dialog
|
2016-03-24 21:17:36 +13:00 |
|
Philip Rosedale
|
8e572ed635
|
Merge pull request #7423 from thoys/20859
CR for Job #20859 - Fix particle color selection
|
2016-03-24 00:20:59 -07:00 |
|
Philip Rosedale
|
61205e0e37
|
Merge pull request #7450 from ZappoMan/reduceLogSpam
reduce log spam
|
2016-03-24 00:19:09 -07:00 |
|
Philip Rosedale
|
366810a20c
|
Merge pull request #7447 from ZappoMan/fixNonAnimatedMotorProteins
fix animated motor proteins
|
2016-03-24 00:11:26 -07:00 |
|
PhilipRosedale
|
8c4ecc64d9
|
fix entity script location
|
2016-03-23 22:49:18 -07:00 |
|
Brad Hefta-Gaub
|
2b0670718f
|
Merge pull request #7449 from howard-stearns/report-previous-session-data
Report previous session data
|
2016-03-23 20:58:51 -07:00 |
|
Brad Hefta-Gaub
|
3505c14552
|
Merge pull request #7444 from birarda/uncover-qml
Attachments Dialog QML updates (from contractor)
|
2016-03-23 20:45:50 -07:00 |
|
Brad Hefta-Gaub
|
cdd5126589
|
Merge pull request #7451 from hyperlogic/tony/increased-deadlock-timer
DeadlockWatchdogThread: bumped up age from 10 to 15 seconds.
|
2016-03-23 20:39:12 -07:00 |
|
Atlante45
|
69c516caaf
|
Have ATP respect request limit
|
2016-03-23 19:09:28 -07:00 |
|
Anthony J. Thibault
|
0ef5c45815
|
DeadlockWatchdogThread: bumped up age from 10 to 15 seconds.
This will, hopefully, prevent false positives from people loading content on slow PCs.
|
2016-03-23 17:59:54 -07:00 |
|
PhilipRosedale
|
7b326c9d7b
|
fixes per review
|
2016-03-23 17:56:02 -07:00 |
|
Brad Hefta-Gaub
|
62a56ecbfa
|
fix typos
|
2016-03-23 17:45:22 -07:00 |
|
Howard Stearns
|
a393f36978
|
Forgot important comment.
|
2016-03-23 17:31:21 -07:00 |
|
Howard Stearns
|
c09c1438f8
|
ivar init order.
|
2016-03-23 17:28:54 -07:00 |
|
Philip Rosedale
|
e1f3665185
|
Merge pull request #7435 from hyperlogic/tony/all-jitter-must-die
MyAvatar: fix jitter in hands when moving
|
2016-03-23 17:28:47 -07:00 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|