Brad Hefta-Gaub
1e51a90204
add edit times and entity ids to the viewer stats
2015-12-02 14:43:00 -08:00
Brad Hefta-Gaub
08ba535c38
add some basic send tracking
2015-12-02 13:43:05 -08:00
Howard Stearns
38182bfd9d
Merge pull request #6523 from hyperlogic/tony/avatar-reset-improvements
...
MyAvatar::reset() improvements
2015-12-02 11:40:46 -08:00
Brad Hefta-Gaub
33b859df33
Merge pull request #6416 from kencooke/audio-reverb
...
New reverb
2015-12-02 11:22:12 -08:00
Brad Hefta-Gaub
ba0ce5f3b3
Merge pull request #6480 from samcake/controllers
...
Playback: Trying to get the Agent to Master connection more reliable
2015-12-02 11:08:15 -08:00
Ken Cooke
fbd7549430
Better reverb script defaults
2015-12-02 11:05:06 -08:00
samcake
0ae7060316
the correct includes
2015-12-02 10:23:31 -08:00
Anthony J. Thibault
0b05a341a8
MyAvatar::reset() improvements
...
Body should not orient under the HMD body without changing the HMD view point.
It's more predictable and less likely to make you sick.
It also should reset the height of the character to cancel out squatting, if the HMD position is low.
2015-12-02 10:18:02 -08:00
Brad Hefta-Gaub
112cdaf028
Merge pull request #6512 from AndrewMeadows/remove-debug-cruft
...
remove debug option for disabling physics updates
2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub
75a57c3cb8
Merge pull request #6500 from Atlante45/octree_crash
...
Octree crash fix
2015-12-02 09:59:56 -08:00
samcake
62c59c2d28
Merge pull request #6522 from ZappoMan/recording
...
fix PlayRecordingOnAC.js to use new API
2015-12-02 09:58:06 -08:00
samcake
586ed51436
rename AgentPoolCOntroller.js
2015-12-02 09:56:16 -08:00
Brad Hefta-Gaub
b6398a7930
fix PlayRecordingOnAC.js to use new API
2015-12-02 09:51:52 -08:00
samcake
c7b9d7d26e
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-12-02 09:49:03 -08:00
Atlante45
c3e2d920ee
Move timing at the top
2015-12-02 09:45:51 -08:00
Ken Cooke
f005afd7c0
Fix stdint.h includes
2015-12-02 09:33:47 -08:00
Brad Hefta-Gaub
82d6718d8b
Merge pull request #6510 from birarda/es-deadlock
...
fix infinite loop on shutdown in OctreeInboundPacketProcessor
2015-12-02 08:16:28 -08:00
Brad Hefta-Gaub
fd05bd23a0
Merge pull request #6521 from jherico/homer
...
Fixing avatar orientation in recordings
2015-12-01 22:09:45 -08:00
Brad Davis
9b6ec34f09
Fixing avatar orientation in recordings
2015-12-01 20:51:07 -08:00
Atlante45
0bc914bf19
Don't grab subTree outside lock
2015-12-01 19:33:44 -08:00
Philip Rosedale
e316f8dbb1
Merge pull request #6520 from imgntn/badpistol
...
Make pistol shoot differently and not alter controller mappings
2015-12-01 18:42:28 -08:00
James B. Pollack
e67f372bcf
make pistol shoot differently and not alter controller mappings
2015-12-01 18:24:13 -08:00
samcake
86af28dbab
Fighting for one hour with the ready message being misunderstood by master
2015-12-01 18:18:18 -08:00
Anthony J. Thibault
99065f10fa
Avatar Warning fixes on linux
2015-12-01 18:12:01 -08:00
James B. Pollack
1eca1540c6
Merge pull request #6519 from ericrius1/toyboxSounds
...
added collision sounds to flashlight, spraycan, and bow
2015-12-01 17:08:19 -08:00
James B. Pollack
560efe35f0
Merge pull request #6518 from ericrius1/disableGrabWithPistol
...
Disable grab while attachment version of pistol script is running
2015-12-01 17:07:36 -08:00
Eric Levin
34234da2d1
fixed spacing
2015-12-01 17:05:51 -08:00
ericrius1
40fb45c6d3
fixed accidental newline in handgrab
2015-12-01 17:04:10 -08:00
ericrius1
0fd1bdaec5
fixed accidental newline in handgrab
2015-12-01 17:03:11 -08:00
ericrius1
e4199439af
added collision sounds to some toys
2015-12-01 17:00:43 -08:00
ericrius1
386afa272c
disable grab while attachment version of pistol script is running
2015-12-01 16:50:09 -08:00
Eric Levin
948479b0e8
Merge pull request #6517 from imgntn/disable2hands
...
Support disabling both hands in handControllerGrab.js
2015-12-01 16:25:23 -08:00
James B. Pollack
aca0fa7beb
support disabling both hands
2015-12-01 16:03:19 -08:00
James B. Pollack
52d6fdac1a
Merge pull request #6487 from ctrlaltdavid/20740
...
Get the Leap Motion working again
2015-12-01 15:40:48 -08:00
Seth Alves
e0eae23dd3
Merge pull request #6515 from imgntn/personal_lasers
...
Personal lasers in handControllerGrab.js
2015-12-01 13:29:05 -08:00
James B. Pollack
780f93cfdb
Merge pull request #6516 from imgntn/toytweaks
...
Reduce pistol volume
2015-12-01 13:16:39 -08:00
James B. Pollack
fb8316ff12
reduce pistol vol
2015-12-01 13:15:08 -08:00
James B. Pollack
3c8e31cd42
Merge pull request #6509 from ericrius1/toyboxFixes
...
Toybox Tweaking
2015-12-01 13:07:10 -08:00
James B. Pollack
b787e71587
Update doll.js
2015-12-01 13:06:30 -08:00
James B. Pollack
31d2f6463f
cleanup
2015-12-01 13:03:51 -08:00
James B. Pollack
25422084b9
make it so that only you can see your beams until youre grabbing something
2015-12-01 13:02:40 -08:00
Anthony Thibault
dde971cb4f
Merge pull request #6514 from howard-stearns/update-ScriptableAvatar
...
Update ScriptableAvatar
2015-12-01 12:44:04 -08:00
samcake
b6530b8b30
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-12-01 12:37:13 -08:00
samcake
ff3ae85245
Separating the ui to get the url from the actual loading to maybe avoid playbackMaster.js crash?
2015-12-01 12:36:49 -08:00
Howard Stearns
455927204e
Merge pull request #6511 from hyperlogic/tony/avatar-sim-rate-display-fix
...
Avatar Sim Rate Display fix
2015-12-01 12:09:07 -08:00
Howard Stearns
8f7f3eed6e
ScriptAvatar now gets the .fbx joints:
...
Because the joint mappings in the .fst can be wrong when the .fst isn't updated for quick changes in the .fbx.
Because models now really need the preRotation, which is only in the avatar .fbx.
2015-12-01 11:52:42 -08:00
Howard Stearns
ef32853d46
When AvatarData parses the .fst, store the (merged) .fbx filename.
...
(Interface gets the .fbx by a separate path, but agents don't have that chance.)
2015-12-01 11:51:22 -08:00
Howard Stearns
6e15ae9d7d
Update robot agent script to randomly select among all HiFi avatars, identified by name, and with a random turn from front.
2015-12-01 11:49:17 -08:00
Philip Rosedale
8e40889068
Merge pull request #6508 from sethalves/fix-observers-dont-see-equip-motion
...
possible fix for observers not seeing a held entity moving
2015-12-01 11:41:08 -08:00
James B. Pollack
de100e5264
Merge pull request #6401 from ericrius1/rats
...
Created exterminatorGame, which allows users to spawn a pistol and shoot rats
2015-12-01 11:39:05 -08:00
