samcake
99dcfef5a8
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-11 10:47:38 -07:00
samcake
e40a795a27
Trying to clean up for pr
2016-05-10 19:25:22 -07:00
Brad Hefta-Gaub
757eea16a6
Merge pull request #7809 from howard-stearns/hand-controller-pointer
...
Hand controller pointer
2016-05-10 16:37:26 -07:00
Brad Hefta-Gaub
af6be7f5f3
Merge pull request #7845 from jherico/script_debug
...
Enable script debugging
2016-05-10 15:56:38 -07:00
Brad Hefta-Gaub
350743454b
Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1
...
use smart pointers for entity simulations
2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub
963dda1b48
Merge pull request #7855 from hyperlogic/tony/updated-idle-animations
...
Updated default idle and turn animations.
2016-05-10 11:35:21 -07:00
Clément Brisset
c3ce463b6c
Merge pull request #7854 from zzmp/refactor/delayLoad
...
Clean up resource cache's encapsulation of asynchronous loading
2016-05-10 10:47:23 -07:00
Brad Hefta-Gaub
d7eee98acc
Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum
...
resurrection of threadsafe ViewFrustum
2016-05-10 09:06:38 -07:00
Seth Alves
b761ecf44f
merge from upstream
2016-05-10 08:18:45 -07:00
Brad Hefta-Gaub
466b535e4e
Merge pull request #7852 from ZappoMan/fixUpdateDialogFormatting
...
fix the update dialog to not show blank lines for missing version numbers
2016-05-10 08:18:38 -07:00
Brad Hefta-Gaub
20b7e5f0a9
Merge pull request #7851 from Atlante45/remove-deadlock-status
...
Remove Deadlock status
2016-05-10 07:53:50 -07:00
Anthony J. Thibault
0f1ff87f78
Updated default idle and turn animations.
...
* idle is less masculine and works better on prescilla & art3mis avatars.
* idle to walk transition is updated to work with this new idle.
* turn in place animations are improved.
* fly animation is more symmetric.
2016-05-09 18:43:30 -07:00
Zach Pomerantz
9ac783a88d
Black box asynch resource retrieval
2016-05-09 18:03:19 -07:00
Brad Davis
40316498a4
Enable script debugging
2016-05-09 17:02:40 -07:00
Brad Hefta-Gaub
7bb21d3700
fix the update dialog to not show blank lines for missing version numbers
2016-05-09 16:19:03 -07:00
Atlante45
5c196f3df5
Remove Deadlock status
2016-05-09 15:53:45 -07:00
Andrew Meadows
59c6a6dfea
Merge pull request #7825 from sethalves/linux-qol
...
Linux qol
2016-05-09 15:34:10 -07:00
Andrew Meadows
ffc3123467
Merge pull request #7658 from sethalves/grab-fixes
...
Grab fixes
2016-05-09 15:30:37 -07:00
Brad Hefta-Gaub
2c0204b0d6
Merge pull request #7821 from Atlante45/fix/collision-sound
...
Fix avatar/entity collision sound
2016-05-09 14:24:19 -07:00
howard-stearns
11ae685f04
Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer
2016-05-09 11:50:07 -07:00
Chris Collins
4f22e0ad5a
Merge pull request #7828 from sethalves/show-other-sim-owner
...
show with debug icons when someone else is the simulation owner
2016-05-09 10:49:30 -07:00
howard-stearns
3f3233da66
Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer
2016-05-09 09:26:28 -07:00
Seth Alves
f8f86a0d45
only _exit if not DEBUG
2016-05-07 11:05:38 -07:00
Seth Alves
4b1274cb0f
Merge branch 'master' of github.com:highfidelity/hifi into linux-qol
2016-05-07 11:04:50 -07:00
Seth Alves
a0771f8ee5
use smart pointers for entity simulations
2016-05-07 09:14:33 -07:00
Clément Brisset
b234d94d25
Merge pull request #7832 from birarda/session-location
...
repairs to user heartbeats
2016-05-06 15:15:52 -07:00
Chris Collins
8eb61e9470
Merge pull request #7820 from imgntn/usersJS
...
Add users.js to default, start visible to friends only
2016-05-06 16:07:23 -06:00
Stephen Birarda
fb09efc0c9
send location updates immediately on mode change and startup
2016-05-06 12:01:03 -07:00
Stephen Birarda
258c5308db
don't require an active domain connection for location update
2016-05-06 11:57:25 -07:00
Stephen Birarda
ed1ddc2a8b
remove code to update/store wallet balance
2016-05-06 11:54:49 -07:00
Stephen Birarda
7dd8515bd8
send a simple heartbeat if location has not changed
2016-05-06 11:50:40 -07:00
Seth Alves
71738d4841
Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes
2016-05-06 09:59:17 -07:00
Andrew Meadows
778820edb4
fix broken dupe method implementation
2016-05-06 09:07:03 -07:00
Andrew Meadows
635e2e78e3
minor cleanup
2016-05-05 18:43:08 -07:00
Seth Alves
073d845bb5
show with debug icons when someone else is the simulation owner
2016-05-05 18:33:01 -07:00
Andrew Meadows
7d6424bdcc
Head::render() was cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
71b2d647e8
add locks and explicitly copy ViewFrustums
2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660
getViewFrustum() provides const pointer
2016-05-05 18:28:27 -07:00
Stephen Birarda
a5d09e268d
fix sessionID pull and re-sent for HB
2016-05-05 15:56:16 -07:00
Seth Alves
b5a3baf322
Merge branch 'master' of github.com:highfidelity/hifi into linux-qol
2016-05-05 15:55:37 -07:00
Stephen Birarda
839c7fb8c2
provide session ID for metaverse heartbeat once received
2016-05-05 15:45:11 -07:00
Stephen Birarda
0ea46cb415
send fallback socket, don't send HB if send usage disabled
2016-05-05 15:35:37 -07:00
Atlante45
bc6544a3c5
Fix MyAvatar's velocity change
2016-05-05 14:55:28 -07:00
Atlante45
07adef9465
Fix entities collision sounds
2016-05-05 14:55:28 -07:00
Atlante45
96ee33e80e
Fix avatars collision sounds
2016-05-05 14:55:28 -07:00
James B. Pollack
67b1015f4a
re add users to default, default to visible friends only
2016-05-05 14:54:04 -07:00
Zach Pomerantz
3619821b82
Improve timing tests with averages
2016-05-04 13:23:10 -07:00
Zach Pomerantz
0f6162d683
Use appropriate units for timing tests
2016-05-04 13:23:10 -07:00
Seth Alves
44beca1687
try having all spring derived actions agree on a target
2016-05-04 11:29:17 -07:00
