Leonardo Murillo
c786789c4c
Changes for SSL and icons
2015-12-02 12:43:25 -06:00
Leonardo Murillo
f5dfc7d3e4
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-12-02 10:42:57 -06: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
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
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
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
James B. Pollack
77d66de7f3
Update masterReset.js
...
add 0 before numbers
2015-12-01 11:19:42 -08:00
James B. Pollack
0e4aaaceeb
Update hiddenEntityReset.js
...
add 0 before numbers
2015-12-01 11:19:15 -08:00
Stephen Birarda
557ab315d9
make resettable stats atomic
2015-12-01 10:51:52 -08:00
Seth Alves
7f95e1eec6
make sure observed held objects are active in bullet, disable equip spring action
2015-12-01 10:49:07 -08:00
Anthony J. Thibault
71f1be2b38
Avatar Sim Rate Display fix
...
Division by zero on first update was causing the displayed
avatar simulation rate to be incorrect.
2015-12-01 10:46:04 -08:00
Stephen Birarda
27227181f0
fix for infinite loop in OctreeeInboundPacketProcessor
2015-12-01 10:45:19 -08:00
Leonardo Murillo
ca8cd13c48
Checkpoint
2015-12-01 12:32:31 -06:00
Seth Alves
2c886658ba
Merge pull request #6507 from birarda/es-deadlock
...
don't persist the octree if it never loaded
2015-12-01 10:11:53 -08:00
ericrius1
a3f8c52aa3
temp fix for doll, moved cat
2015-12-01 10:09:29 -08:00
Stephen Birarda
7dbf29821a
don't persist the octree if it never loaded
2015-12-01 10:00:25 -08:00
Leonardo Murillo
418b9c8fea
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-12-01 11:57:38 -06:00
Seth Alves
11f18c3ada
also make sure the holder doesn't end up with a static-in-bullet held object
2015-12-01 09:52:51 -08:00
ericrius1
d80bfc0af6
more gravity for spraycan
2015-12-01 09:41:04 -08:00
James B. Pollack
1ba6bfa2e0
lazers
2015-11-30 18:58:53 -08:00
ericrius1
880aed0e6b
fixed missing brace
2015-11-30 18:29:20 -08:00
ericrius1
b67c481726
resolved merge conflicts
2015-11-30 18:19:57 -08:00
ericrius1
efa2f44c90
Merge remote-tracking branch 'highfidelity/master'
2015-11-30 18:16:39 -08:00
ericrius1
90595949f1
moved exterminator game out of dry lake
2015-11-30 18:14:57 -08:00
ericrius1
8992f6bb44
moved pistol to toybox
2015-11-30 17:57:01 -08:00
