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
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
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
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
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
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
James B. Pollack
ea831238e6
Merge pull request #6504 from imgntn/bubblemaster
...
Update master reset scripts for Toybox to have parity with bubble wand
2015-11-30 17:36:40 -08:00
James B. Pollack
8b7cfde02a
Merge pull request #6505 from imgntn/boww
...
Fix release hand message for bow
2015-11-30 17:02:08 -08:00
James B. Pollack
7c12379ada
fix release hand message
2015-11-30 17:00:40 -08:00
Howard Stearns
6f50d91208
Merge pull request #6461 from hyperlogic/tony/remove-joint-states
...
Refactor of Rig and MyAvatar animation JavaScript interface
2015-11-30 16:28:15 -08:00
Anthony J. Thibault
31cecdc174
Menu: removed Enable Avatar Threading option.
...
To re-enable, you can set ENABLE_AVATAR_UPDATE_THREADING to true on line 2552 of Application.cpp.
Also, removed other unused strings.
2015-11-30 15:45:23 -08:00
Clément Brisset
e168966b87
Merge pull request #6409 from birarda/injector-hybrid
...
more efficient threading of networked AudioInjector objects
2015-11-30 15:36:41 -08:00
Anthony J. Thibault
f922f61c3d
AvatarUpdate: fix for very large dt
...
This was affecting threaded avatar update when enabled.
2015-11-30 15:21:04 -08:00
ericrius1
706a67b9a1
lowered restitution to 0 to avoid too many collision sounds playing
2015-11-30 15:10:32 -08:00
Anthony J. Thibault
e2d9e37eb8
Fix for head offset for models with no eyes
...
This was causing in correct body poses while wearing an HMD.
2015-11-30 14:08:21 -08:00
James B. Pollack
9b90c19781
cleanup
2015-11-30 13:24:33 -08:00
Anthony Thibault
7af6dd9390
Merge pull request #6501 from hyperlogic/tony/cmake-fixes
...
cmake: Fix quazip configure on linux/mac
2015-11-30 13:19:55 -08:00
James B. Pollack
171ae02b03
update to parity with createWand.js
2015-11-30 13:12:39 -08:00
ericrius1
b7884f487c
rats
2015-11-30 11:44:34 -08:00
ericrius1
22efcb1854
Added sounds to pistol
2015-11-30 11:42:34 -08:00
Anthony J. Thibault
11bfed4185
Merge branch 'master' into tony/remove-joint-states
2015-11-30 11:21:44 -08:00
James B. Pollack
85b8266537
Merge pull request #6494 from ctrlaltdavid/20744
...
Fix menu shortcuts created in JavaScript not working
2015-11-30 11:20:10 -08:00
Anthony J. Thibault
79b06c3c8a
cmake: Fix quazip configure on linux/mac if QT_CMAKE_PREFIX_PATH is undefined.
2015-11-30 11:14:35 -08:00
Eric Levin
d27e6d70c1
Merge pull request #6171 from imgntn/bow
...
Add Bow & Arrow
2015-11-30 11:12:57 -08:00
Stephen Birarda
c76704dc17
Merge pull request #6484 from zzmp/patch-3
...
Update BUILD_OSX for CMake env vars.
2015-11-30 10:20:30 -08:00
Seth Alves
0043bef29a
Merge pull request #6499 from AndrewMeadows/fewer-warnings
...
Remove warning about unused AudioConstants::AUDIO_FRAME_NAME
2015-11-30 10:17:48 -08:00
Andrew Meadows
49a6f63663
remove whitespace and fix warning (unused var)
2015-11-30 10:00:05 -08:00
Andrew Meadows
b74c229d02
Merge pull request #6495 from ctrlaltdavid/fix-webwindowclass-crash
...
Fix crash in WebWindowClass in debug build setTitle on open WebWindow
2015-11-30 09:25:12 -08:00
David Rowe
ce100dbbc5
Fix crash in WebWindowClass in debug build setTitle on open WebWindow
2015-11-30 15:10:51 +13:00
James Pollack
44f69a2a18
Merge branch 'master' into bow
2015-11-29 11:37:25 -08:00
David Rowe
866037ec7c
Fix menu shortcut keys set by JavaScript not working
2015-11-30 08:33:38 +13:00
