Zach Pomerantz
f803ecd2e7
Merge pull request #7633 from Atlante45/fix/shared-resource
...
Fix raw pointers in shared resource cache items
2016-04-14 17:52:04 -07:00
Atlante45
4ed8573f74
CR
2016-04-14 17:28:24 -07:00
Zach Pomerantz
2e4e1dd590
Fix leaking Font
2016-04-14 17:00:23 -07:00
Zach Pomerantz
32e9c49cf0
Fix cache tallies for uncached resources
2016-04-14 17:00:20 -07:00
Zach Pomerantz
bb02af793c
Name exposed cache objects
2016-04-14 17:00:18 -07:00
Anthony J. Thibault
253e4cbb73
validate arguments to MyAvatar.addAnimationStateHandler()
...
Also validate arguments to MyAvatar.removeAnimationStateHandler() and the return result from the user provided callback function.
2016-04-14 16:25:17 -07:00
Brad Hefta-Gaub
91334d6a39
Merge pull request #7664 from ZappoMan/reduceJointProperties
...
only export joint values if they've been explicitly set by scripts
2016-04-14 15:30:04 -07:00
Andrew Meadows
a263091c94
fix entity-server crash for out of bounds
2016-04-14 15:23:14 -07:00
Seth Alves
f114888c1c
Merge pull request #7665 from birarda/ice-server-redundancy
...
allow domain-server to cycle through ice-servers when failing
2016-04-14 14:36:29 -07:00
Stephen Birarda
bc0b3b38b3
remove narrowing conversion for ICE_SERVER_DEFAULT_PORT
2016-04-14 12:25:47 -07:00
Brad Hefta-Gaub
ea4da05cba
Merge pull request #7643 from AndrewMeadows/faster-bullet
...
faster Bullet kinematics
2016-04-14 12:16:54 -07:00
Andrew Meadows
4d7efbc43f
faster isNaN() and friends
2016-04-14 11:18:10 -07:00
Andrew Meadows
bb59860cfe
update Aabb's of static objects when they move
2016-04-14 11:18:10 -07:00
Andrew Meadows
dcf28937cf
cleanup cached Physics::sessionUUID
2016-04-14 11:18:10 -07:00
Zach Pomerantz
e80898f095
Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache
2016-04-14 10:12:16 -07:00
Brad Hefta-Gaub
7b5075cce5
Merge pull request #7645 from sethalves/dont-run-bullet-too-soon
...
add a heuristic for deciding when it's safe to enable bullet
2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
285ebe8ec5
Merge pull request #7655 from sethalves/dont-spam-about-expired-actions
...
don't flood log with messages about expired actions
2016-04-14 09:32:56 -07:00
Brad Hefta-Gaub
37dcfdad8a
Merge pull request #7652 from huffman/feat/crash-menu
...
Move crash menu items to submenu and add new crash types
2016-04-14 09:32:36 -07:00
Brad Hefta-Gaub
dd4589269d
Merge pull request #7661 from zzmp/fix/track-resources
...
Track resources as they fall out of cache
2016-04-14 09:29:58 -07:00
Seth Alves
ba0549dddd
Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon
2016-04-14 09:18:58 -07:00
samcake
c6414208e8
Use the dumber version of the stereo technique and fix a warning
2016-04-14 03:25:32 -07:00
samcake
6c3e011b89
Expose cleanely the 3 different techniques
2016-04-14 02:43:28 -07:00
Brad Hefta-Gaub
b48503a82d
only export joint values if they've been explicitly set by scripts
2016-04-13 19:52:50 -07:00
samcake
41d4d3b2d7
Providing a cleaner way to try different paths and exploring a simpler way
2016-04-13 19:21:17 -07:00
Zach Pomerantz
774eb1c45a
Make shared Debug header
2016-04-13 15:48:26 -07:00
Zach Pomerantz
7a15339631
Use AnimationCache for models
2016-04-13 15:44:47 -07:00
Zach Pomerantz
e20acb1d42
Track resources as they fall out of cache
2016-04-13 15:44:14 -07:00
Ryan Huffman
47c2a1722b
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu
2016-04-13 14:40:46 -07:00
Brad Hefta-Gaub
07f734f4dd
Merge pull request #7640 from jherico/vive_timewarp
...
Vive timewarp
2016-04-13 14:39:59 -07:00
Howard Stearns
f24c2c7714
Merge pull request #7657 from ZappoMan/avatarLicenseSupport
...
add support for avatar licenses in FST files
2016-04-13 14:01:37 -07:00
Brad Hefta-Gaub
0af47fd3d5
Merge pull request #7617 from jherico/vr_menu
...
VR menu fixes
2016-04-13 13:53:36 -07:00
Ryan Huffman
9ee81a73c7
Fix clang warning in CrashHelpers::newFault
2016-04-13 13:41:45 -07:00
Atlante45
785eda44cd
CR
2016-04-13 13:29:00 -07:00
Brad Hefta-Gaub
4b3b917af6
add support for avatar licenses in FST files
2016-04-13 12:26:09 -07:00
Ryan Huffman
e563de9ef8
Fix 'array is too large' warning
2016-04-13 11:28:54 -07:00
Ryan Huffman
6cbd31fa51
Cleanup unnecessary scoping in pureVirtualCall
2016-04-13 11:28:37 -07:00
samcake
7653fa2c37
Fixing the resize of framebuffer to avoid reassigning the render buffer every frame
2016-04-13 10:56:29 -07:00
Ryan Huffman
7fbaa77c0b
Fix missing brace in namespace
2016-04-13 10:24:39 -07:00
samcake
f6dc7eb746
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-04-13 10:08:33 -07:00
samcake
e4d3e848f6
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-13 10:05:06 -07:00
samcake
bba2517669
Merge branch 'red' of https://github.com/samcake/hifi into red
2016-04-13 10:04:25 -07:00
Seth Alves
3288bff963
don't flood log with messages about expired actions. also, try to remove such actions
2016-04-13 09:47:07 -07:00
Ryan Huffman
91da4229ac
Fix unused variable warning in CrashHelpers.h
2016-04-13 09:42:20 -07:00
Seth Alves
d6673fb3c0
Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon
2016-04-13 09:01:43 -07:00
samcake
e9a0365454
Removing an include not needed
2016-04-13 00:16:04 -07:00
Brad Hefta-Gaub
0f8842f582
Merge pull request #7637 from zzmp/fix/tex-transfer-free
...
Cleanly shutdown the texture transfer thread on quit
2016-04-12 19:28:51 -07:00
Seth Alves
298fe1e188
Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon
2016-04-12 19:21:03 -07:00
Stephen Birarda
8832a9d9ed
add ICEServerHeartbeatACK packet type
2016-04-12 17:59:07 -07:00
Brad Davis
1a02220886
Fixing wobble
2016-04-12 17:50:59 -07:00
samcake
0477f89b1b
Justing exposing the timer correctly
2016-04-12 17:05:23 -07:00
Brad Davis
3325c58ceb
Vive timewarp implementation
2016-04-12 16:44:15 -07:00
Ryan Huffman
0c1277ae7a
Add CrashHelpers.h and add to separate submenu
2016-04-12 16:44:11 -07:00
samcake
49af41afca
Merging with master
2016-04-12 16:14:24 -07:00
Atlante45
0f62d5c997
clear ATP assets on domain change
2016-04-12 15:30:53 -07:00
Atlante45
7c652aa3ca
Add lock on ResourceCache data structs
2016-04-12 15:30:39 -07:00
samcake
ff1df0d45e
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-12 15:29:58 -07:00
samcake
ab9f41f5eb
Trying something a bit more radical for timing
2016-04-12 15:29:31 -07:00
Anthony J. Thibault
a1bbb63ec4
Rig: save and restore user animations across resets
2016-04-12 14:51:17 -07:00
Brad Hefta-Gaub
88ca5520be
Merge pull request #7647 from jherico/rate_counter
...
Fixing rate counter
2016-04-12 14:48:05 -07:00
Brad Davis
9f2eabe6ce
Fixing rate counter
2016-04-12 14:11:56 -07:00
Atlante45
364f935b89
Allow cleanup of the old request
2016-04-12 13:51:11 -07:00
Atlante45
c8aeecdabd
Don't fire onGeoMappLoading twice
2016-04-12 13:51:11 -07:00
Atlante45
05895f628a
Revert to using a Resource
2016-04-12 13:51:11 -07:00
Atlante45
5cc90ce8f0
Make sure resource req are cleaned up with there parents
2016-04-12 13:51:11 -07:00
Atlante45
e45939d18f
Make sure ResourceCacheSharedItems deals with strong refs
2016-04-12 13:51:11 -07:00
Atlante45
5eb4f63573
Use ResourceManager in anim loader
2016-04-12 13:51:11 -07:00
Atlante45
afdfef1482
Make sure we don't use raw resource ptr
2016-04-12 13:51:11 -07:00
Seth Alves
2b63c2a8ba
Merge pull request #7641 from hyperlogic/tony/macos-cpuid-fix
...
Rename CPUID to CPUIdent to fix XCode 7.2 builds
2016-04-12 12:48:15 -07:00
Seth Alves
460fdc0761
Merge pull request #7536 from samcake/orange
...
First pass at using compressed format when uploading textures
2016-04-12 11:59:10 -07:00
Brad Davis
dfc1d896cd
Fix shutdown crash
2016-04-12 11:49:55 -07:00
Seth Alves
e4c91e5064
add a heuristic for deciding when it's safe to enable bullet
2016-04-12 11:46:00 -07:00
Brad Davis
4b02e8437c
Fix menu items created by plugins
2016-04-12 11:15:06 -07:00
Anthony J. Thibault
32ccc1d68e
Windows build fixes
2016-04-12 10:53:04 -07:00
Chris Collins
0faab41057
Merge pull request #7624 from birarda/new-home-set
...
allow ATP scripts to be used by scripted Agent
2016-04-12 09:42:14 -07:00
samcake
70ac8ac8a5
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-12 08:56:15 -07:00
Brad Hefta-Gaub
3f05ded932
Merge pull request #7611 from zzmp/guard/amd
...
Disable gradient QML items on AMD
2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub
ad8d7b2ffa
Merge pull request #7620 from sethalves/make-fixupMissingParents-more-thread-safe
...
guard access to _missingParent vector with a lock
2016-04-12 08:32:38 -07:00
Brad Hefta-Gaub
9a687bea44
Merge pull request #7628 from jherico/save_scripts
...
Save the set of running scripts when they change, as well as at shutdown
2016-04-12 08:32:10 -07:00
Brad Hefta-Gaub
c5840f217a
Merge pull request #7630 from jherico/fps_fix
...
Fix FPS counter
2016-04-12 08:31:58 -07:00
samcake
042a419669
Adding counters, not sure they are really useful or that this is the best way to do this...
2016-04-12 02:44:10 -07:00
samcake
816a35099a
Adding tcpu timer on some jobs
2016-04-11 18:34:52 -07:00
samcake
90fd9d77a5
Merging with Master
2016-04-11 18:34:14 -07:00
Zach Pomerantz
c72a5f3605
Exit cleanly in debug with GL logger
2016-04-11 16:32:55 -07:00
Zach Pomerantz
666bf8d42b
Reset GL tex canvas while still running
2016-04-11 14:04:34 -07:00
Zach Pomerantz
ab72d8d8fb
Init QML GL from share context
2016-04-11 13:47:45 -07:00
Zach Pomerantz
52958ffc70
Move gl info queries to GLHelpers
2016-04-11 13:28:18 -07:00
Zach Pomerantz
1b7256d344
Clean shutdown for Texture Transfer thread
2016-04-11 12:59:53 -07:00
samcake
8a233ec9a1
the stereo rendering is working correctly, will now look for more performances
2016-04-11 12:32:59 -07:00
Anthony J. Thibault
470aac3acf
Rename CPUID to CPUIdent to fix XCode 7.2 builds
2016-04-11 11:54:17 -07:00
samcake
f23f3a8c2d
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-11 10:10:58 -07:00
Seth Alves
1d63f6d354
Merge branch 'master' of github.com:highfidelity/hifi into make-fixupMissingParents-more-thread-safe
2016-04-11 09:58:08 -07:00
Brad Hefta-Gaub
b758acb7d8
Merge pull request #7610 from zzmp/fix/standard-qt-gl
...
Codify qt qml version in one header
2016-04-11 09:45:21 -07:00
Brad Hefta-Gaub
47ff5c090d
Merge pull request #7623 from ZappoMan/fixAnimationFrameExport
...
fix export of animation properties
2016-04-11 09:37:47 -07:00
Brad Hefta-Gaub
a204b9d923
Merge pull request #7627 from jherico/qml_key_interaction
...
Suppress key release events for presses that were absorbed by QML
2016-04-11 09:31:46 -07:00
samcake
1138af9765
FIrst real stereo version
2016-04-11 01:19:46 -07:00
Brad Davis
df8ad57185
Fix FPS counter
2016-04-11 00:25:16 -07:00
Brad Hefta-Gaub
cc418c615f
Merge pull request #7631 from sethalves/parent-equipping-and-platform-hack
...
treat children of avatars and children of entities differently until velocity handling is fixed
2016-04-10 14:55:03 -07:00
Seth Alves
43f735dd21
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
2016-04-09 22:18:43 -07:00
Brad Davis
5a5583d3a5
PR comments
2016-04-09 21:43:50 -07:00
Seth Alves
2aa3e5d418
re-enabled EntityItem::simulateKinematicMotion for things with parents
2016-04-09 09:06:18 -07:00
Seth Alves
3890a71433
treat children of avatars and children of entities differently until this is fixed
2016-04-09 08:37:41 -07:00
samcake
8964c2427d
adding support for the 2 versions of the shaders nad solving the mapping of uniforms that arise with it
2016-04-08 18:47:21 -07:00
Brad Davis
7827c0f6f6
Suppress key release events for presses that were absorbed by QML
2016-04-08 17:09:11 -07:00
Brad Hefta-Gaub
f1f8fd8a24
fix export of animation properties
2016-04-08 14:40:06 -07:00
Stephen Birarda
1df0dce971
use ResourceRequest in Agent to handle ATP scripts
2016-04-08 14:38:26 -07:00
Seth Alves
95f446183f
use for loop rather than iterator
2016-04-08 13:32:33 -07:00
Brad Davis
8e1e11a6f8
Merge pull request #7615 from zzmp/fix/amd-particles
...
Add explicit layout to textured particle shader
2016-04-08 13:19:41 -07:00
Seth Alves
6088612ce0
guard access to _missingParent vector with a lock to allow safe access from multiple threads
2016-04-08 13:16:30 -07:00
Brad Hefta-Gaub
7ba08dd137
Merge pull request #7613 from hyperlogic/tony/model-entity-render-fix
...
Reading animation properties without an entityTree lock is considered harmful
2016-04-08 10:37:17 -07:00
samcake
ef70d41cf4
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-04-08 09:41:35 -07:00
samcake
2f8d30e7ce
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-08 09:34:55 -07:00
samcake
4374bd26ae
Disabling COmpression
2016-04-08 01:37:27 -07:00
samcake
be178e9e09
fixing warnings
2016-04-07 23:44:28 -07:00
samcake
04e71df3bc
fixing a stupid code and a warning
2016-04-07 23:05:50 -07:00
samcake
76dd740578
Cleaning up to test before merge, not solved the stuttering happening when using compressed textures. cleaned up a bit of the TextureMap doanload callbacks
2016-04-07 20:05:05 -07:00
Zach Pomerantz
e08c9db469
Expose GL property to QML
2016-04-07 18:27:07 -07:00
Zach Pomerantz
be489e8728
Codify qt qml version in one header
2016-04-07 17:35:31 -07:00
Zach Pomerantz
4e3ab73941
layout std140 in particle shader
2016-04-07 17:27:51 -07:00
Brad Hefta-Gaub
5287c174b4
Merge pull request #7605 from jherico/route_log_errors
...
Fixing logging errors on initial load of controller routes
2016-04-07 17:13:13 -07:00
Brad Hefta-Gaub
772e7b95f6
Merge pull request #7584 from zzmp/log/dep-is-set
...
Avoid warning for expected unset PresentThread
2016-04-07 14:47:56 -07:00
Brad Hefta-Gaub
e7d75cb22e
Merge pull request #7573 from sethalves/update-collision-hulls-of-avatar-children
...
Update collision hulls of avatar children
2016-04-07 14:47:44 -07:00
Anthony J. Thibault
8f530ceaf9
Reading animation properties without an entityTree lock is considered harmful
...
In RenderableModelEntityItem::update() make a copy of the _animationProperties, which is under the entityTree lock.
In RenderableModelEntityItem::render() read from the copy of _animationProperties when not under the entityTree lock.
2016-04-07 13:42:40 -07:00
Brad Davis
4c78c0b330
Fix broken xbox controllers
2016-04-07 13:17:49 -07:00
Brad Hefta-Gaub
dc4751a95b
Merge pull request #7595 from ZappoMan/depthReticleWork
...
Fix a random case of the depth reticle hiding when it shouldn't
2016-04-07 12:06:20 -07:00
Brad Davis
d8310cc6b1
Reduce controller log spam
2016-04-07 10:41:55 -07:00
Brad Davis
85019b2b5e
Fixing logging errors on initial load of controller routes
2016-04-07 10:41:54 -07:00
Seth Alves
8158d34b20
Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children
2016-04-07 09:59:49 -07:00
Brad Hefta-Gaub
50a081db00
Merge pull request #7596 from jherico/texture_transfer_fix
...
Move the texture transfer context back to the main thread for shutdown
2016-04-07 09:31:42 -07:00
Brad Hefta-Gaub
ce1625b551
Merge pull request #7600 from sethalves/fix-entity-script-error-message
...
attempt to make the failed-to-load-entity-script error-message be more helpful
2016-04-07 09:17:04 -07:00
Brad Hefta-Gaub
94e797d752
Merge pull request #7585 from zzmp/log/failed-routes
...
Log failed routes
2016-04-07 09:16:26 -07:00
Brad Hefta-Gaub
7f164a7959
CR feedback
2016-04-07 08:42:40 -07:00
Brad Hefta-Gaub
986b4bea7c
Merge pull request #7603 from zzmp/fix/entities-thread-crash
...
Fix intermittent crash on exit
2016-04-07 08:21:51 -07:00
Brad Hefta-Gaub
384ead8e4e
Merge pull request #7599 from howard-stearns/restore-text3d-overlay
...
Restore text3d overlay
2016-04-07 08:21:28 -07:00
Brad Hefta-Gaub
cef599eaed
Merge pull request #7586 from zzmp/log/failed-menu
...
Log failed MenuUserData::forObject
2016-04-06 19:44:05 -07:00
samcake
cf983e627d
fixing the warnings
2016-04-06 19:36:52 -07:00
Brad Hefta-Gaub
cea622f6f1
Merge pull request #7571 from howard-stearns/sandbox-entity-includes
...
Sandbox entity includes
2016-04-06 19:11:25 -07:00
Brad Hefta-Gaub
4f1de77946
Merge pull request #7581 from birarda/suppress-more
...
suppress a couple more noisy messages in AudioRingBuffer
2016-04-06 19:08:23 -07:00
samcake
a6bac7ad92
Experimenting with a hidden gltexture object while beeing transfered
2016-04-06 18:30:18 -07:00
Clément Brisset
680ab1e38b
Merge pull request #7578 from zzmp/fix/delete-resource-later
...
Delete resource the Qt way
2016-04-06 17:17:47 -07:00
Brad Hefta-Gaub
40e53baa79
Merge pull request #7597 from Atlante45/fix/script-sound-hold-strong-ref
...
Fix audio injectors not working
2016-04-06 16:57:29 -07:00
Seth Alves
5375fdd0f0
don't do simple kinematic simulation on things that have parents
2016-04-06 16:42:14 -07:00
samcake
16174df0f3
POlishing the size evaluation and trying to debug the compression scheme
2016-04-06 16:33:45 -07:00
Zach Pomerantz
06e827cb5e
Guard against no script engine thread affinity
2016-04-06 15:41:13 -07:00
howard-stearns
f35c59ce5f
Guard against meaningless query and fragment parts.
2016-04-06 15:21:43 -07:00
Zach Pomerantz
4300f2e415
Delete resource the Qt way
2016-04-06 14:43:48 -07:00
Seth Alves
672b4df7c1
get rid of magic number
2016-04-06 13:36:44 -07:00
Atlante45
6d1b7f1d37
Wrap sound script object to hold a strong ref
2016-04-06 13:04:18 -07:00
Seth Alves
21c2db7cdc
attempt to make the failed-to-load-entity-script error-message be more helpful
2016-04-06 12:40:59 -07:00
howard-stearns
f60bb1faa5
Merge branch 'master' of https://github.com/highfidelity/hifi into restore-text3d-overlay
2016-04-06 12:16:19 -07:00
howard-stearns
5284af6b51
Update text3d shader post pbr.
2016-04-06 12:15:19 -07:00
Brad Davis
e194fc39f4
Move the texture transfer context back to the main thread for shutdown
2016-04-06 11:29:03 -07:00
Zach Pomerantz
1e710712cc
Check entities scripting thread before signaling it
2016-04-06 11:19:07 -07:00
Seth Alves
d09d16082e
Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children
2016-04-06 11:05:31 -07:00
Brad Hefta-Gaub
0f4e1e79fd
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
2016-04-06 11:01:00 -07:00
Brad Hefta-Gaub
8c15116190
fix auto-hide logic in depthReticle
2016-04-06 11:00:43 -07:00
samcake
e28e85a29c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-04-06 09:30:53 -07:00
Brad Hefta-Gaub
e76a04951c
Merge pull request #7582 from zzmp/fix/desktop-signal
...
Fix showDesktop SIGNAL
2016-04-06 08:29:26 -07:00
samcake
d9bc06d92d
Trying to ge5t the proper behavior for the Compression texture and textures in genral...
2016-04-05 19:13:24 -07:00
Brad Hefta-Gaub
5cf2906cd4
Merge pull request #7576 from hyperlogic/tony/show-collision-geometry-fixes
...
Model: Toggling Physics > Draw Collision Hulls works again
2016-04-05 17:50:19 -07:00
Brad Hefta-Gaub
891cc12d3f
Merge pull request #7549 from zzmp/feat/resource-vis
...
Add a visualization of cacheable resource usage
2016-04-05 15:43:27 -07:00
Zach Pomerantz
37efeb7f29
Avoid warning for expected unset PresentThread
2016-04-05 14:59:59 -07:00
Zach Pomerantz
91126037e0
Fix showDesktop SIGNAL
2016-04-05 14:59:54 -07:00
Zach Pomerantz
6bcfeccdd8
Log failed MenuUserData::forObject
2016-04-05 14:59:52 -07:00
Zach Pomerantz
062760ff3b
Log failed routes
2016-04-05 14:59:48 -07:00
Stephen Birarda
d536026ff4
suppress a couple more noisy messages in AudioRingBuffer
2016-04-05 14:44:20 -07:00
Anthony J. Thibault
1a4ae72270
Merge branch 'master' into tony/show-collision-geometry-fixes
2016-04-05 13:55:51 -07:00
samcake
710c4a1b8f
TRying to merge and expose counters for in flights transfers
2016-04-05 12:18:30 -07:00
howard-stearns
da4975e817
Merge branch 'master' of https://github.com/highfidelity/hifi into sandbox-entity-includes
2016-04-05 11:09:01 -07:00
Seth Alves
d5136f011c
Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children
2016-04-05 11:08:38 -07:00
Anthony J. Thibault
6a7a572b53
Model: Toggling Physics > Draw Collision Hulls works again
...
Collision renderItems were never getting removed when shouldShowCollisionHull became false.
2016-04-05 11:06:24 -07:00
samcake
71fa898654
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-05 09:45:45 -07:00
Brad Hefta-Gaub
08a19c0471
Merge pull request #7554 from jherico/load_stutter2
...
Addressing stuttering in the frame while loading content - Part 2
2016-04-05 09:45:31 -07:00
Brad Hefta-Gaub
3fee1abd2d
Merge pull request #7574 from zzmp/guard/octree-del
...
Hold onto octree child after creation
2016-04-05 09:45:00 -07:00
howard-stearns
21c3a8813a
Merge branch 'master' of https://github.com/highfidelity/hifi into sandbox-entity-includes
2016-04-05 09:25:40 -07:00
Brad Hefta-Gaub
ff4f693267
Merge pull request #7553 from zzmp/fix/tex-invoke-method
...
Fix ImageReader threading issues
2016-04-04 18:29:24 -07:00
samcake
dca642256f
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-04 18:25:49 -07:00
samcake
d3a87f8db2
need to merge, commiting at a broken state
2016-04-04 18:25:23 -07:00
Zach Pomerantz
ac30aed948
Hold onto octree child after creation
2016-04-04 17:52:41 -07:00
Seth Alves
294bdcb18e
has-ancestor should test self
2016-04-04 17:41:01 -07:00
Seth Alves
af05b97c1e
put back accidently deleted line. cleanups
2016-04-04 17:31:59 -07:00
Seth Alves
cecb3a6ff1
unmangle merge
2016-04-04 17:07:08 -07:00
Brad Davis
c168e2cc58
PR feedback
2016-04-04 16:53:30 -07:00
howard-stearns
22d2d2b69d
Merge branch 'master' of https://github.com/highfidelity/hifi into sandbox-entity-includes
2016-04-04 16:43:00 -07:00
howard-stearns
7b7ec5a174
Prohibit entity script file includes from outside the original entity
...
script's directory (unless its in our resources).
2016-04-04 16:41:21 -07:00
Seth Alves
d814d7b35d
merge from upstream
2016-04-04 16:32:49 -07:00
Seth Alves
69bb0ebd74
Revert "faster kinematic motion for entities"
2016-04-04 16:11:54 -07:00
Seth Alves
b8587e0711
update collision shapes of entities which are children of avatars
2016-04-04 16:06:53 -07:00
Seth Alves
c48a67b933
Merge pull request #7544 from AndrewMeadows/faster-kinematics
...
faster kinematic motion for entities
2016-04-04 15:26:32 -07:00
Zach Pomerantz
107cfcf10b
Change Resource setBytes->setSize
2016-04-04 13:59:57 -07:00
Zach Pomerantz
f34e951c3f
Make resource cache props thread-safe
2016-04-04 13:59:56 -07:00
Zach Pomerantz
aa0245b9c2
Debug when limit of checkins reached
2016-04-04 12:22:03 -07:00
samcake
f3e6c490a4
merging with master, moving the TexelFOrmat function to a cpp
2016-04-04 12:03:37 -07:00
Andrew Meadows
a08ab8e127
restore setFlag in simulateKinematicMotion()
2016-04-04 11:48:45 -07:00
samcake
8732090073
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-04 11:22:21 -07:00
Andrew Meadows
a53cb2e532
use _gravity rather than _acceleration
...
also tweaks and comments about supporting low gravity
2016-04-04 11:10:50 -07:00
Zach Pomerantz
6660f0959b
Merge pull request #7557 from hyperlogic/tony/reset-thread-priority
...
ModelCache: reset thread priority back to normal
2016-04-04 11:07:18 -07:00
Zach Pomerantz
2bd53935fc
Merge branch 'master' of github.com:highfidelity/hifi into fix/tex-invoke-method
2016-04-04 11:00:03 -07:00
Zach Pomerantz
d23d0f6432
Restore thread priority after tex parsing
2016-04-04 10:57:04 -07:00
Anthony J. Thibault
d1898eeac6
ModelCache: reset thread priority back to normal
...
Based on PR feedback on https://github.com/highfidelity/hifi/pull/7550
2016-04-04 10:31:36 -07:00
Brad Davis
d98abbc7df
First pass at threaded texture transfers
2016-04-04 10:23:01 -07:00
samcake
2dd1b14b32
Merge pull request #7551 from jherico/load_stutter
...
Working on addressing stuttering in the frame while loading content - Part 1
2016-04-04 10:04:51 -07:00
Seth Alves
278fe93f2b
Merge pull request #7546 from zzmp/fix/release-skyboxes
...
Release skybox textures when rendering stars
2016-04-04 09:23:54 -07:00
Brad Davis
667c27866e
Pushing texel format translation into header
2016-04-03 20:41:35 -07:00
Brad Davis
4f373937f9
Additional performance markers
2016-04-03 20:41:34 -07:00
Andrew Meadows
74058ac049
more correct moving test for ballistic kinematics
2016-04-03 19:15:16 -07:00
Andrew Meadows
7ea81f3937
add and fix comments
2016-04-03 19:15:01 -07:00
samcake
0ba6c89c6e
WOrk in progress, generating several versions of the shader
2016-04-03 18:25:38 -07:00
samcake
ce3199920f
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-03 15:45:31 -07:00
Brad Hefta-Gaub
ecaaa34576
Merge pull request #7547 from howard-stearns/lock-trees-on-import-export
...
Lock trees on import export
2016-04-03 14:23:54 -07:00
Brad Hefta-Gaub
4a78ad877e
Merge pull request #7550 from hyperlogic/tony/avatar-thrasher
...
Model: fixed two crash issues when changing avatars
2016-04-03 13:47:35 -07:00
Zach Pomerantz
79e5286335
Fix ImageReader threading issues
2016-04-03 12:38:18 -07:00
Zach Pomerantz
fc19b60f8a
Avoid setting null texs on uncaching models
2016-04-03 11:25:48 -07:00
Anthony Thibault
07cfa13a82
GeometryReader: We should delete the fbxGeometry if we've lost the resource.
2016-04-03 09:23:53 -07:00
Anthony Thibault
865a77ae20
Model: fixed two crash issues when changing avatars
...
* When the GeometryReader has the last ref to the GeometryResource ptr
It needs to hold on to the reference until invokeMethod is completed.
Otherwise, invokeMethod will call a method on a deleted object, leading
to memory corruption or crashes.
* When the Model URL is changed, the clusterMatrices are invalided and the
RenderItemsSets are cleared. However, there still might be renderItems in
the scene pending changes list that might refer to those RenderItems and their
clusterMatrices. We need to guard against this access to prevent reading from
memory that was previously freed.
Both of these issues were uncovered using the [avatar-thrasher](https://gist.github.com/hyperlogic/d82a61d141df43d576428501a82c5ee6 ) test script.
2016-04-02 21:48:22 -07:00
Zach Pomerantz
3c86191a59
Add resources prop to caches
2016-04-02 17:37:51 -07:00
Anthony Thibault
d899d7d696
Merge pull request #7530 from hyperlogic/tony/culling-fixes
...
Culling fixes
2016-04-01 21:29:34 -07:00
Zach Pomerantz
b70a4d043b
Expose resource cache count props
2016-04-01 19:52:42 -07:00
samcake
9aface432d
Steping into 2 version tshaders
2016-04-01 19:10:14 -07:00
Seth Alves
6025a66fa1
Merge pull request #7532 from Atlante45/feat/delayed-decrease
...
Delay congestion epochs first decrease
2016-04-01 18:07:43 -07:00
Andrew Meadows
0830c55bcf
getLocalEverything->getLocalTransformAndVelocities
2016-04-01 17:48:56 -07:00
Zach Pomerantz
3b45a57e1d
Remove resource completely when uncached
2016-04-01 17:42:36 -07:00
Zach Pomerantz
d72c695417
Sanitize ResourceCache to expose to JS/QML
...
fix sanitize
2016-04-01 17:42:36 -07:00
samcake
5baaad9b6e
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-01 17:20:05 -07:00
samcake
64fef2cfe2
Updating counters correctly
2016-04-01 17:19:41 -07:00
samcake
be38de3239
Cleaning up the TextureMap loaders and cleaning for pr
2016-04-01 17:16:22 -07:00
Brad Hefta-Gaub
c4abec4fb2
Merge pull request #7541 from jherico/fix_simple_qml_message
...
Fix passing of simple string message types from QML to scripts
2016-04-01 15:20:39 -07:00
howard-stearns
cec4175e9d
whitespace
2016-04-01 15:00:51 -07:00
howard-stearns
b5cbd7720e
Lock entity tree on export, and clipboard on import.
2016-04-01 14:56:56 -07:00
Zach Pomerantz
eb2e254aa6
Release px resources when unused
2016-04-01 14:46:52 -07:00
Zach Pomerantz
0e9b783ca3
Release skybox texs when not rendering
2016-04-01 14:46:50 -07:00
Brad Hefta-Gaub
5f710782eb
Merge pull request #7528 from howard-stearns/fbx-reader-safety
...
Fbx reader safety
2016-04-01 13:34:17 -07:00
Brad Hefta-Gaub
0f9a6bb37b
Merge pull request #7543 from sethalves/fix-scriptname-case
...
try again on local-scripts
2016-04-01 13:33:45 -07:00
Andrew Meadows
20914df330
fix warning about signed/unsigned comparison
2016-04-01 13:31:14 -07:00
Andrew Meadows
de5fe705a3
optimize Bullet broadphase using collision groups
2016-04-01 13:14:03 -07:00
Andrew Meadows
25fbf926df
CollisionWorld only updates _active_ Aabbs
...
we manually set/clear active state of static objects
that need their Aabbs updated
also fixing a bug when starting kinematic motion
2016-04-01 13:14:03 -07:00
Andrew Meadows
e1602b57fa
faster isNaN checks
2016-04-01 13:14:03 -07:00
Andrew Meadows
442b52313f
faster kinematic motion calculations
2016-04-01 13:14:03 -07:00
Andrew Meadows
3f52d237ed
adding Bullet profiler instances for better stats
2016-04-01 13:14:03 -07:00
Brad Hefta-Gaub
a3734eba00
Merge pull request #7535 from birarda/suppress-more
...
add suppression for ring buffer and sequence number messages
2016-04-01 13:04:32 -07:00
Brad Hefta-Gaub
830c7a90e1
Merge pull request #7537 from zzmp/fix/fst
...
Keep textureBaseUrl for fst models
2016-04-01 12:28:23 -07:00
Seth Alves
56b84b3106
fix display of path of selected file in running-scripts window
2016-04-01 12:05:49 -07:00
Seth Alves
35affe26e3
trying again on script loading changes
2016-04-01 11:52:47 -07:00
samcake
1ca87fa069
Refactoring a bit the texture loaders to factorize work
2016-04-01 11:44:57 -07:00
Zach Pomerantz
489a2fd0b9
Persist tex base url across caching
2016-04-01 11:32:29 -07:00
Zach Pomerantz
2daf0c4da4
Init tex base url in Geometry ctor
2016-04-01 11:32:13 -07:00
Brad Davis
ca67c7335f
Fix passing of simple string message types from QML to scripts
2016-04-01 11:04:01 -07:00
Anthony J. Thibault
75219573a4
Merge branch 'master' into tony/culling-fixes
2016-04-01 10:58:33 -07:00
Anthony Thibault
8d06cd2447
Merge pull request #7539 from huffman/fix-asset-request-cancel
...
Fix asset resource request not properly cleaning up
2016-04-01 10:58:31 -07:00
Seth Alves
0f288247a7
include script in default script location
2016-04-01 10:50:22 -07:00
Ryan Huffman
0948c8cefb
Fix format of long lines
2016-04-01 10:11:32 -07:00
