Stephen Birarda
7dfdb3c72e
protect LNL packet sending without active socket
2015-11-17 15:04:14 -08:00
Brad Hefta-Gaub
3efbcb7062
debug the late connect case
2015-11-17 14:47:59 -08:00
Brad Hefta-Gaub
d8a3927311
debug the late connect case
2015-11-17 14:43:06 -08:00
Andrew Meadows
2b07daa976
Merge pull request #6404 from hyperlogic/tony/bugfixes-for-avatars-with-no-eyes
...
Bug fixes for avatars with no eyes
2015-11-17 14:29:20 -08:00
Brad Hefta-Gaub
85aa3b3f83
handle subscribe when messages mixer is not available
2015-11-17 14:28:51 -08:00
Stephen Birarda
7da6ec46c4
more handling of various AudioInjector states
2015-11-17 14:20:59 -08:00
Brad Hefta-Gaub
8112b3b57e
add senderUUID to the messageReceived signal
2015-11-17 14:16:22 -08:00
Brad Davis
6664d8d919
Merge pull request #6398 from ZappoMan/messaging
...
messages-mixer
2015-11-17 14:03:03 -08:00
Anthony J. Thibault
e93b5c5838
Bug fixes for avatars with no eyes
...
Changed default eye position to 1.9 meters because
the hifi_team avatars are 2.0 meters tall.
Also, prevent array access with negative indices when eye bones are missing.
ಠ_ಠ
2015-11-17 14:02:27 -08:00
Brad Hefta-Gaub
2f142eb088
add a receiver example
2015-11-17 13:33:30 -08:00
Brad Hefta-Gaub
2d3fe497e4
fix typo
2015-11-17 13:29:28 -08:00
Brad Hefta-Gaub
32bf81ef0d
move MessagesClient to agent
2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub
5b9791d800
add message received signal
2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub
e7a8df306c
fix warnings
2015-11-17 11:18:36 -08:00
Brad Hefta-Gaub
60ae1259fa
more cleanup work
2015-11-17 11:06:27 -08:00
Seth Alves
1d4e1eabcb
Merge branch 'master' of github.com:highfidelity/hifi into grab-equip
2015-11-17 11:01:22 -08:00
Brad Hefta-Gaub
034debc483
cleanup
2015-11-17 10:59:53 -08:00
Clément Brisset
198f1452cf
Merge pull request #6396 from ctrlaltdavid/20738
...
Fix particle aging
2015-11-17 10:47:41 -08:00
Brad Hefta-Gaub
f9a674bca5
implement subscribe/unsubscribe in MessagesClient
2015-11-17 10:01:31 -08:00
Seth Alves
b062d23f61
bumper is now an equip toggle
2015-11-17 09:51:52 -08:00
Brad Hefta-Gaub
6b61ec569c
more work on channels
2015-11-17 09:47:50 -08:00
Sam Gateau
5b92929833
Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client
2015-11-17 09:32:22 -08:00
ZappoMan
f712fae4d2
more hacking
2015-11-17 08:56:21 -08:00
Stephen Birarda
4fa934dccf
make sure AudioInjectorManager process is on AI thread
2015-11-16 18:54:16 -08:00
Stephen Birarda
80115d38e9
tweak the AudioInjectorManager for injector threading
2015-11-16 18:53:09 -08:00
Anthony J. Thibault
80eb247b9c
WIP checkin
...
* AnimManipulator: added absolute and relative position and translation support
* Rig: added _overrideFlags and _overridePoses for script overrides.
2015-11-16 18:49:47 -08:00
Brad Hefta-Gaub
12f206e2f0
more work on messages
2015-11-16 17:00:03 -08:00
Stephen Birarda
aa77c4894c
add an AudioInjectorManager for more efficient threading
2015-11-16 16:04:10 -08:00
Brad Hefta-Gaub
40e69f6946
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
2015-11-16 15:31:06 -08:00
Brad Hefta-Gaub
d42a1a721f
first cut at messages-mixer
2015-11-16 15:26:17 -08:00
David Rowe
b3b73e8cd1
Fix particle aging
2015-11-17 12:02:35 +13:00
Brad Davis
d099f61170
Updating audio record/playback mechanism to more closely match actual audio input
2015-11-16 14:57:24 -08:00
Brad Davis
cb26fc67fc
Move recording interface back to float/seconds
2015-11-16 14:44:22 -08:00
Howard Stearns
35f7a1cf10
Merge pull request #6391 from AndrewMeadows/sisyphus7
...
simplify MyAvatar::deriveBodyFromHMDSensor() take 2
2015-11-16 13:55:22 -08:00
Seth Alves
36af315e5d
Merge pull request #6383 from birarda/goodbye-packet
...
send a hopeful disconnect packet from ACs and Interface
2015-11-16 11:28:48 -08:00
Anthony J. Thibault
55adedcec8
Merge branch 'master' into tony/remove-joint-states
2015-11-16 11:22:44 -08:00
Stephen Birarda
584e35e4ab
have killNodeWithUUID return success to avoid double lookup
2015-11-16 10:58:11 -08:00
Stephen Birarda
52716b8f95
emit a ready signal if Sound has downloaded
2015-11-16 10:55:25 -08:00
Stephen Birarda
789290f540
Merge pull request #6370 from Atlante45/locker
...
QTryRead/WriteLocker
2015-11-16 10:22:45 -08:00
Seth Alves
b567a4846d
Merge branch 'master' of github.com:highfidelity/hifi into average-near-holds
2015-11-16 10:08:01 -08:00
Seth Alves
89ed3751ae
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-14 14:00:20 -08:00
Brad Davis
7a34d4f567
Merge pull request #6387 from samcake/controllers
...
Recording : Updating the recorder.js and a few fixes
2015-11-13 17:56:57 -08:00
samcake
89e5db11a0
More fixes
2015-11-13 17:41:41 -08:00
samcake
8c21ac144e
Fixing review comments
2015-11-13 16:45:19 -08:00
U-GAPOS\andrew
6733767d8b
use animation state to compute bodyInSensorFrame
2015-11-13 16:39:40 -08:00
Seth Alves
b0d24be58f
add a way to get a list of all actions of a certain type from an entity. hold actions average their positional targets.
2015-11-13 16:02:39 -08:00
Seth Alves
3b6b56f316
formatting
2015-11-13 14:26:43 -08:00
Seth Alves
3746920655
allow action updates from others when we are the simulation owner
2015-11-13 13:56:30 -08:00
Seth Alves
919ea5f1a0
send action updates even if we aren't the simulation owner
2015-11-13 12:37:07 -08:00
Stephen Birarda
429a4d51d5
Merge pull request #6375 from Atlante45/resize
...
Fix models resizing
2015-11-13 10:23:05 -08:00
Seth Alves
6ec5b12081
send to network when an action is deleted, also
2015-11-13 09:52:35 -08:00
Seth Alves
3f7f5a2bbd
send to network when an action is deleted, also
2015-11-13 09:49:31 -08:00
Seth Alves
5acbb74362
send to network when an action is deleted, also
2015-11-13 09:45:06 -08:00
samcake
f43738e75a
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-13 09:42:33 -08:00
Seth Alves
7979fb38cf
don't always send actiondata along with other physics related properties
2015-11-13 09:25:17 -08:00
Sam Gateau
89d120ab3d
Few fixes to make the recorder.js run
2015-11-12 22:24:11 -08:00
Seth Alves
dbaea5770a
include action data in properties suppressed by non-simulation ownership
2015-11-12 18:28:26 -08:00
Brad Hefta-Gaub
ecaa50c0ff
fix for infinite loop in erase entities special packet
2015-11-12 18:25:18 -08:00
Stephen Birarda
ea38c4cc49
don't allow domain check-ins while shutting down
2015-11-12 18:04:15 -08:00
samcake
1fd37b51a2
trying to get somewhere....
2015-11-12 17:54:35 -08:00
Stephen Birarda
6b2987eef8
handle domain server node removal in NodeList
2015-11-12 17:47:51 -08:00
Seth Alves
ed8a604e13
adjust how the decision to send action changes over the wire is made
2015-11-12 17:36:45 -08:00
Stephen Birarda
e52e9be44c
re-broadcast disconnects from domain-server
2015-11-12 17:23:39 -08:00
Seth Alves
756b382a75
adjust how the decision to send action changes over the wire is made
2015-11-12 17:12:20 -08:00
Seth Alves
6f83f32ecc
adjust how the decision to send action changes over the wire is made
2015-11-12 16:27:54 -08:00
Stephen Birarda
1c9396d66e
handle disconnect request in domain-server
2015-11-12 15:43:03 -08:00
Seth Alves
d7be1699a7
adjust how the decision to send action changes over the wire is made
2015-11-12 15:27:10 -08:00
Stephen Birarda
8bdb81d832
send disconnect packet from node when leaving domain
2015-11-12 15:03:19 -08:00
Stephen Birarda
0a64242160
cleanup string grabbing for PacketType enum
2015-11-12 14:43:25 -08:00
Seth Alves
a78b1619be
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 14:20:23 -08:00
Seth Alves
a8cd891e48
adjust how the decision to send action changes over the wire is made
2015-11-12 14:19:23 -08:00
Brad Hefta-Gaub
da651ac475
fix mac compiler error
2015-11-12 13:47:27 -08:00
Brad Hefta-Gaub
8bfb368a61
fix mac compiler error
2015-11-12 13:32:43 -08:00
Brad Hefta-Gaub
33110eda30
fix mac compiler error
2015-11-12 13:25:50 -08:00
Brad Hefta-Gaub
14a6e1fb6b
fix mac compiler error
2015-11-12 13:24:25 -08:00
Brad Hefta-Gaub
66a2b38f50
switch various status to use thread safe atomics
2015-11-12 13:09:51 -08:00
samcake
da8270d50b
Merge pull request #6377 from jherico/rec3
...
Cleaning up clip and transform
2015-11-12 11:50:10 -08:00
Brad Davis
ee1545f649
Cleaning up clip and transform
2015-11-12 11:48:47 -08:00
Stephen Birarda
288ee0e9e8
add a NodeDisconnect packet
2015-11-12 11:39:32 -08:00
Seth Alves
2e635bd936
cleanups
2015-11-12 11:14:25 -08:00
Seth Alves
a366633f84
cleanups
2015-11-12 11:03:44 -08:00
Seth Alves
93da3ed5bd
if our simulation-bid priority matches the remote one, don't bid.
2015-11-12 11:03:34 -08:00
Seth Alves
3519dd248b
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 09:53:11 -08:00
samcake
319f9fc30e
Merge pull request #6376 from ZappoMan/fixModelCrash
...
fix crash in Model::deleteGeometry when _rig is not initialized
2015-11-12 09:37:30 -08:00
James B. Pollack
39f44115be
Merge pull request #6373 from Atlante45/rotationBetween
...
Rotation between
2015-11-12 09:25:56 -08:00
Brad Hefta-Gaub
eefe26d96a
fix crash in Model::deleteGeometry when _rig is not initialized
2015-11-12 09:24:49 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
Seth Alves
83d5c9cf4a
arrange status icons in two rows of 4 each
2015-11-11 18:54:07 -08:00
Atlante45
954391ae3e
Fix models resizing
...
When models are MUCH bigger one one axis than the others
and we modify the scale only of one of those small axis,
it wouldn't propagate because the change was relatively
too small conpared to the size of the model
2015-11-11 18:33:26 -08:00
Anthony J. Thibault
e698d3c1e8
Isolate JointStates within the Rig class
...
Except for SkeletalModel::computeBounds() JointStates are now completly
encapsulated by the Rig. Now we can start using AnimPoses instead and
in parallel with the JointState implementation. Then we can assert that
they are identical, before removing JointStates.
This check in has many comments with the AJT tag.
Each one of these cases will need to be revisitied and fixed.
In particular // AJT: LEGACY will be used to enclose all code
in the Rig which manipulates the _jointState QVector.
2015-11-11 18:23:58 -08:00
Atlante45
118d05d824
Use a clearer function
2015-11-11 17:24:50 -08:00
Seth Alves
a16a477134
fix warning
2015-11-11 16:51:55 -08:00
Seth Alves
d1a9a32e91
Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug
2015-11-11 16:35:13 -08:00
Seth Alves
715a46ee82
show actions in status icons
2015-11-11 16:35:04 -08:00
Seth Alves
cffe4551dd
merge from upstream
2015-11-11 16:15:07 -08:00
Seth Alves
07f3d8eca0
more debugging prints
2015-11-11 16:03:08 -08:00
Atlante45
e4897a8de7
Use new constants
2015-11-11 15:58:27 -08:00
Atlante45
115b63a117
Simplify rotationBetween
2015-11-11 15:54:48 -08:00
Anthony J. Thibault
11440f92f4
Removed rig animations
...
* Deleted AnimationHandle class
* Removed enableAnimGraph and anableRigAnimations from Menu.
* Removed *some* references to old IK system.
But it is still used when computing collision bounding volumes
2015-11-11 15:32:57 -08:00
Brad Hefta-Gaub
4fddc86851
tweaks to click
2015-11-11 15:26:16 -08:00
Brad Hefta-Gaub
eb598bd3d3
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-11-11 15:15:34 -08:00
Brad Hefta-Gaub
2f903a9513
CR feedback and some cleanup
2015-11-11 14:21:14 -08:00
Brad Hefta-Gaub
bdfe304f7a
remove some logging
2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
040bae6014
more debugging
2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub
5576cf188e
Merge branch 'master' of https://github.com/highfidelity/hifi into moreEraseHistory
2015-11-11 12:14:03 -08:00
Brad Hefta-Gaub
866116d285
more debugging
2015-11-11 12:13:47 -08:00
Anthony J. Thibault
56e96ed24c
Merge branch 'master' into tony/script-start-stop-anim
2015-11-11 11:33:24 -08:00
Seth Alves
f07d5d9d3f
show network and physics status on boxes and spheres
2015-11-11 11:32:12 -08:00
Seth Alves
31ebe5dba1
terse logging for sim ownership
2015-11-11 08:51:10 -08:00
Ryan Huffman
26daa58c65
Merge branch 'master' of https://github.com/highfidelity/hifi into physics-continuous-collision-detection
2015-11-11 08:47:59 -08:00
Seth Alves
c2b0ccd6b3
show simulation ownership with status icons
2015-11-11 08:30:04 -08:00
Atlante45
65e9dc4be5
Fixup return types
2015-11-10 18:39:59 -08:00
Atlante45
d5c44466c4
Take Callables with rvalue ref
2015-11-10 18:27:14 -08:00
Atlante45
4d8fa58dd3
Coding standard
2015-11-10 18:23:23 -08:00
Atlante45
7cf2ad2215
Remove lockFor... and expand ReadWriteLockable
2015-11-10 18:19:12 -08:00
Atlante45
3557eacbd0
Add QTryRead/WriteLocker classes
2015-11-10 18:18:29 -08:00
Seth Alves
4cf84a4e5b
use makeEntityItemStatusGetters from more entity types
2015-11-10 17:14:09 -08:00
Seth Alves
7b4dd9a908
Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug
2015-11-10 17:06:16 -08:00
Seth Alves
39b92d2b52
terse log when ownership changes
2015-11-10 17:06:12 -08:00
Seth Alves
66387c4530
use icons to show network and physics status
2015-11-10 17:02:57 -08:00
Anthony J. Thibault
e1d0a97807
Implemented MyAvatar.prefetchAnimation() JS method
2015-11-10 16:51:48 -08:00
Brad Hefta-Gaub
fc3602d780
change context menu to RightPrimaryThumb, add filter to mouse click to not count slow clicks
2015-11-10 16:46:58 -08:00
Anthony J. Thibault
936c55a94e
New MyAvatar animation JS interface
...
JavaScript changes:
* removed MyAvatar.playAnimation
* removed MyAvatar.stopAnimation
* removed MyAVatar.getGetAnimationDetails
* removed MyAvatar.startAnimationByRole
* removed MyAvatar.stopAnimationByRole
* removed MyAVatar.getGetAnimationDetailsByRole
* removed MyAVatar.clearJointPriorities
* added MyAvatar.overrideAnimation(url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreAnimation()
* added MyAvatar.getAnimationRoles()
* added MyAvatar.overrideRoleAnimation(role, url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreRoleAnimation(role)
* added MyAvatar.prefetchAnimation(url)
* update kneel.js with new api.
* added theBird.js to test role override api.
C++ changes:
* Added getParent() and replaceChild() to AnimNode
* Added findByName() and traverse() to AnimNode
* Changed AnimStateMachine to hold nodes by childIndex instead of smart pointer.
This allows script to replace nodes dynamically via overrideRoleAnimation
2015-11-10 16:34:38 -08:00
Brad Hefta-Gaub
3316b63bf6
add a fixme comment
2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub
006a1d60c8
keep some additional erase entities history and send to viewers
2015-11-10 15:31:51 -08:00
Seth Alves
774e2ab6d6
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:13:07 -08:00
Seth Alves
97fec5b814
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:09:53 -08:00
Seth Alves
df5d161721
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:02:17 -08:00
Seth Alves
4df65e4c11
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-10 15:02:07 -08:00
Seth Alves
e067195dfe
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 14:42:40 -08:00
Seth Alves
82bd506086
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 14:32:57 -08:00
Eric Levin
a2abc11df1
Merge pull request #6351 from huffman/script-path-resolution
...
Update script engine path resolution behavior to behave consistently
2015-11-10 14:10:42 -08:00
Seth Alves
5e4f30b2bb
improve terse entity logging. change how action data sending is triggered
2015-11-10 13:58:09 -08:00
samcake
d3d5d3a19e
Removing useless code
2015-11-10 12:02:20 -08:00
Seth Alves
d043011a11
Merge branch 'render-debug-fixup' of github.com:sethalves/hifi into rework-visual-physics-debug
2015-11-10 10:16:02 -08:00
Seth Alves
8e466190e0
working toward display icons for debug/status display
2015-11-10 10:15:58 -08:00
Seth Alves
b9ca509f07
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
2015-11-10 09:50:12 -08:00
Seth Alves
d535109caf
attempt to fix render-collision hull feature
2015-11-10 09:49:31 -08:00
samcake
2cf2257783
Fix warning
2015-11-10 09:20:43 -08:00
samcake
d1df6854ac
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-10 09:16:28 -08:00
Ryan Huffman
7c5f0bb620
Update RADIUS_MOTION_THRESHOLD_MULTIPLIER
2015-11-10 08:51:22 -08:00
Brad Hefta-Gaub
0ea901fd72
fix various warnings
2015-11-10 08:34:58 -08:00
Sam Gateau
06a87012ad
Removing the setJointTranslations which is not helping...
2015-11-09 23:38:51 -08:00
Sam Gateau
b47c5dbff2
Cleaning the code to remove the old rec format and the use of separate joint Rotationns/Translations arrays
2015-11-09 23:12:04 -08:00
Anthony J. Thibault
eacc2cae0c
WIP checkpoint
2015-11-09 18:36:23 -08:00
samcake
77e21b7190
Trying to fix the animation recording and playback, but still not good
2015-11-09 18:18:30 -08:00
Brad Hefta-Gaub
021a6e689d
added some asserts to test future mistakes that would cause render item leaks
2015-11-09 17:09:17 -08:00
Anthony J. Thibault
af2b3bb9d5
MyAvatar: removed priority, hold and maskedJoints from playAnimation js call
2015-11-09 16:56:49 -08:00
Brad Hefta-Gaub
e47b049200
fix render item leak on Model::reset()
2015-11-09 16:41:40 -08:00
Ryan Huffman
7694958b20
Merge branch 'master' of https://github.com/highfidelity/hifi into physics-continuous-collision-detection
2015-11-09 15:22:26 -08:00
U-GAPOS\andrew
390310f822
swap the order of checks
2015-11-09 14:15:09 -08:00
U-GAPOS\andrew
c07b97920e
fix for avatars created with blender
2015-11-09 14:11:45 -08:00
U-GAPOS\andrew
2716a9f2b4
fix IK for feet targets
2015-11-09 13:11:03 -08:00
samcake
5bc827981d
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-09 12:32:10 -08:00
Anthony J. Thibault
a0f21228f6
AnimGraph support for start and stop animation from JavaScript
...
Follows the same model as the existing startAnimation and stopAnimation calls.
See kneel.js for an example.
2015-11-09 12:19:01 -08:00
Eric Levin
7700e67734
Merge pull request #6326 from imgntn/entity_params
...
Add Ability to Pass Parameters When Calling Methods on Entities
2015-11-09 12:17:58 -08:00
Ryan Huffman
b835711266
Update script engine path resolution behavior
...
The path resolution will now be relative to the script currently
being evaluated *on its initial evaluation.* The previous behavior
was that all paths would be resolved relative to the root script
for client scripts, and inconsistent for entity scripts depending
on the order that scripts were loaded. The entity script situation
was particularly bad because including more than 1 level deep produced
inconsistent results.
2015-11-09 12:04:17 -08:00
samcake
25d67656e9
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-09 11:35:43 -08:00
James B. Pollack
1812444614
Merge pull request #6278 from ericrius1/particleSorting
...
Added additiveBlending property to particle effect entity
2015-11-09 11:32:44 -08:00
Brad Davis
07be03dc7e
Bad merge fix, PR feedback
2015-11-09 09:30:18 -08:00
samcake
2078c753ae
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-09 09:23:59 -08:00
Brad Davis
2ecc4f8a5c
Prevent sixense manager from triggering continuous reset
2015-11-09 09:16:32 -08:00
Seth Alves
f3d26e163d
turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system
2015-11-07 07:19:27 -08:00
Clément Brisset
2c27d18922
Merge pull request #6282 from jherico/externals
...
Runtime plugins fixes
2015-11-06 19:30:40 -08:00
Brad Davis
e84f3af483
Merge pull request #6343 from Atlante45/sixense
...
Sixense cleanup
2015-11-06 17:50:12 -08:00
Atlante45
68a72b0f41
Bit of cleanup
2015-11-06 17:28:51 -08:00
samcake
cbeb56aba4
using the frameInterpolatorCOrrectly
2015-11-06 17:25:50 -08:00
Brad Davis
6122fa145d
More PR feedback
2015-11-06 17:17:26 -08:00
Atlante45
137a2c1c48
Fix file headers
2015-11-06 17:15:34 -08:00
samcake
07fb3a0532
Merge pull request #6341 from howard-stearns/for-sam
...
Make life easier for Sam.
2015-11-06 17:13:22 -08:00
Howard Stearns
314c11e8d4
Make life easier for Sam.
2015-11-06 16:59:46 -08:00
Brad Davis
37a9538f10
PR feedback, ensure destruction of shared objects
2015-11-06 16:57:31 -08:00
Brad Davis
11733c039f
Allow shared libraries to access core global objects
2015-11-06 16:57:31 -08:00
Atlante45
6323728d7a
Added perfect forwarding of arguments
2015-11-06 16:56:48 -08:00
Atlante45
d95709ee73
Added input plugins logging category
2015-11-06 16:45:23 -08:00
Atlante45
0a65bb145b
Some more code cleanup
2015-11-06 16:44:28 -08:00
samcake
7890aa6ec1
Merge pull request #6333 from jherico/rec2
...
Adding clip serialization implementation, tests
2015-11-06 16:38:39 -08:00
Atlante45
6ad20e417b
Typo
2015-11-06 16:33:36 -08:00
Atlante45
e3b54f0272
Cleanup
2015-11-06 16:33:29 -08:00
Atlante45
503e03d4a8
Remove unused using
2015-11-06 16:33:22 -08:00
Atlante45
96aa5be457
Implement all Sixense methods for OS X
2015-11-06 16:33:16 -08:00
Atlante45
298ac650d8
Isolate sixense dynamic linking for OSX
2015-11-06 16:33:07 -08:00
samcake
5fb2c3ccd1
resolve merge conflict
2015-11-06 16:27:47 -08:00
samcake
4dbca68767
Updating the legacy file format to support the joint translation and also fix the replay problem oof the joints going to the moon
2015-11-06 16:24:19 -08:00
Clément Brisset
143e92ee1b
Merge pull request #6300 from jherico/lisa
...
Breaking up InputDevices and InputPlugins, cleanup of some shared_ptr madness
2015-11-06 16:15:53 -08:00
Brad Davis
bf70ae4724
PR feedback
2015-11-06 15:59:13 -08:00
Brad Davis
7c433f47c0
Breaking up input devices and input plugins classes.
2015-11-06 15:20:00 -08:00
Andrew Meadows
e410030dd9
Merge pull request #6320 from hyperlogic/tony/blender-avatar-ik-fix
...
IK fix for avatars exported from Blender
2015-11-06 15:00:25 -08:00
Brad Davis
4513b638db
Adding clip serialization implementation, tests
2015-11-06 14:40:21 -08:00
James B. Pollack
8eea7ff67c
Merge pull request #6329 from sethalves/fix-grab-release
...
send to server upon grab release
2015-11-06 14:33:08 -08:00
samcake
a82c2d66ed
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 11:53:49 -08:00
James B. Pollack
e928c8278b
overload a single function and cleanup, add examples
2015-11-06 11:48:51 -08:00
Brad Davis
1dc392bb36
Merge pull request #6330 from Atlante45/master
...
// FIXME incredibly evil....
2015-11-06 11:43:33 -08:00
samcake
640845c944
Merge pull request #6328 from jherico/rec2
...
Add recording classes
2015-11-06 11:39:14 -08:00
Seth Alves
bc516c0b86
use render-item status getters to display physics debugging information
2015-11-06 11:32:56 -08:00
Brad Davis
0bf29a441f
Add recording classes
2015-11-06 11:14:46 -08:00
Atlante45
e630f3072e
Bit of cleanup
2015-11-06 11:14:10 -08:00
Atlante45
c53c0ec53f
Fix double delete on shutdown
2015-11-06 11:13:10 -08:00
Stephen Birarda
ed960b02ec
Merge pull request #6291 from zzmp/fix/script-engine-run-bail
...
Bail early from ScriptEngine::run if stopped
2015-11-06 10:05:02 -08:00
samcake
2f9c33dbfb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 09:35:48 -08:00
samcake
46d9a14951
Work in progress, fixing the animation playback
2015-11-06 09:35:20 -08:00
samcake
63106f6991
Merge pull request #6322 from Atlante45/record
...
Recording fixes from Clement.
2015-11-06 09:28:58 -08:00
Seth Alves
4ed8a1e5d1
changes to send an update to entity-server when AvatarActionHold releases an entity
2015-11-06 09:25:53 -08:00
Atlante45
dbe25651cf
constify audio client loop
2015-11-05 16:57:51 -08:00
James B. Pollack
3cee569bae
pass parameters to entities
2015-11-05 16:57:39 -08:00
Atlante45
6c35ae48b0
Don't allocate big samples array in tight loop
2015-11-05 16:52:38 -08:00
Atlante45
ffafd3194e
Recording audio fixes
2015-11-05 16:46:59 -08:00
James Pollack
b229b5289c
entity call params
2015-11-05 14:24:21 -08:00
James Pollack
751d51ee72
entity call params
2015-11-05 14:19:11 -08:00
Atlante45
07b3597ae3
Fix recording scripts
2015-11-05 14:01:37 -08:00
Anthony J. Thibault
20d95080f1
IK fix for avatars exported from Blender
...
This should fix the issue with the hips moving erratically when arm IK
is enabled. The main issue is that the IK system assumed that the "Hips"
joint was the root of the skeleton. For Blender avatar this is not the case
as it inserts an "Armature" node at the root instead.
2015-11-05 12:03:45 -08:00
Howard Stearns
aef8b7639d
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-05 11:58:08 -08:00
Anthony J. Thibault
50e8f49f52
SpacemouseManager Moved stub init into cpp file.
...
This should fix the windows build. For some reason
the linker was having a problem resolving this.
2015-11-05 10:56:24 -08:00
Anthony J. Thibault
2318e48fa8
AvatarRig: fix for crash when index was -1
2015-11-05 09:43:41 -08:00
Anthony J. Thibault
8d16f60b15
Removed hardcoded define HAVE_3DCONNEXIONCLIENT
...
This should be set from cmake, right?
2015-11-05 09:02:39 -08:00
Anthony J. Thibault
d9f4b0218e
Merge branch 'master' into tony/mac-fixes
2015-11-05 08:26:44 -08:00
samcake
00797b4dea
Merge pull request #6314 from jherico/homer
...
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e
Merge pull request #6286 from EdgarPironti/master
...
Spacemouse migration
2015-11-04 19:15:35 -08:00
Brad Davis
69d29bbbbb
Creating recording library
2015-11-04 16:18:55 -08:00
ericrius1
4e5b806934
particle effect entities no longer intersect with rays
2015-11-04 16:05:29 -08:00
Brad Davis
20d1035821
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 15:54:50 -08:00
Seth Alves
4ab727c47c
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-04 13:57:59 -08:00
samcake
f4cc8c4c2e
Merge pull request #6306 from jherico/barney
...
Fix ability to enable mappings parsed from JSON in JS
2015-11-04 11:47:04 -08:00
Brad Davis
18d2b184dc
Fix ability to enable mappings parsed from JSON in JS
2015-11-04 11:39:34 -08:00
U-GAPOS\andrew
f260c6b12b
fix bad time measurment in AtRestDetector
2015-11-04 10:47:39 -08:00
Seth Alves
9b3708ea66
use parentChanged to recalculate entity bounding boxes
2015-11-04 09:27:57 -08:00
EdgarPironti
ade0862948
Spacemouse fixes
2015-11-04 00:49:40 -08:00
EdgarPironti
7adf38f781
Spacemouse migration
2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 18:22:29 -08:00
Howard Stearns
4a54f2052e
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-03 17:42:38 -08:00
ericrius1
af0c0e6a1b
spacing fix
2015-11-03 17:32:22 -08:00
ericrius1
31fe5fa953
Bump version num, use different shader for additive blending effect
2015-11-03 17:15:10 -08:00
Seth Alves
ffb0317a50
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-03 16:53:00 -08:00
Seth Alves
fbaa86426c
re-remove the _nextPosition stuff
2015-11-03 16:52:46 -08:00
ericrius1
470f814776
Fixed glitches with large particles being sorted along wrong axis
2015-11-03 16:39:16 -08:00
Seth Alves
60824a1fb0
back out some off-brand changes. add parentChanged call
2015-11-03 16:07:28 -08:00
ericrius1
a722ad46f6
Merge branch 'master' into particleSorting
2015-11-03 15:47:44 -08:00
ericrius1
60f35ce8c7
discarding pixel if alpha is below threshold
2015-11-03 15:46:58 -08:00
ericrius1
0c8a712935
removed comment
2015-11-03 15:36:11 -08:00
Seth Alves
f60b1d9bd7
unmangle merge
2015-11-03 13:50:35 -08:00
Andrew Meadows
4215ce5d25
Merge pull request #6212 from howard-stearns/dont-use-other-avatar-sounds
...
Don't play other avatar's collision sounds.
2015-11-03 13:40:27 -08:00
Seth Alves
dba9eb7046
merge from upstream
2015-11-03 13:35:17 -08:00
ericrius1
777fbe6d83
moved additive_blending flag to proper location
2015-11-03 12:43:41 -08:00
EdgarPironti
d99838de9c
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 12:25:19 -08:00
Zach Pomerantz
6bf9a4518a
Bail early from ScriptEngine::run if stopped
...
evaluate() bails anyway, so this will avoid the cost of init().
If run() is invoked from runInThread(), this may avoid a race
where _isRunning is set after it is checked because the check
occured during init().
2015-11-03 11:24:04 -08:00
Ryan Huffman
c0a7da0b88
Add comment to ObjectMotionState::updateCCDConfiguration
2015-11-03 11:22:15 -08:00
Ryan Huffman
b410604475
Add comments to updateCCDConfiguration
2015-11-03 11:18:38 -08:00
Ryan Huffman
b75e053e9d
Add automatic CCD activation to the physics engine
2015-11-03 11:01:51 -08:00
Thijs Wenker
73d7fd4648
Fix: Vec3.UP was pointed to Vectors::UNIT_X
...
This fixes the scripting property Vec3.UP to point to Vectors::UP which is equal to {X: 0, Y: 1, Z: 0}.
2015-11-03 19:19:12 +01:00
ericrius1
0ed868077d
Added additive blending as option for particle effect
2015-11-03 10:02:51 -08:00
Howard Stearns
70b1165393
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-03 10:01:36 -08:00
EdgarPironti
5d695da630
Do not merge - Spacemouse
2015-11-02 23:31:10 -08:00
Brad Hefta-Gaub
79f7284c32
Merge pull request #6285 from jherico/lisa
...
Adding diagnostics to track down the 'black rectangles of death'
2015-11-02 22:18:16 -08:00
Brad Davis
764ecba2a8
Adding diagnostics to track down the 'black rectangles of death'
2015-11-02 21:55:35 -08:00
Howard Stearns
94ae1ef638
Fix accumulateTime
2015-11-02 20:37:57 -08:00
James B. Pollack
192e4c8185
Merge pull request #6274 from ZappoMan/rightClickMenu
...
add example of overriding default rightClick behavior
2015-11-02 18:58:12 -08:00
Brad Davis
699a13b2a7
Merge pull request #6275 from ZappoMan/mappingTweaks
...
Mapping tweaks to match Controllers spec
2015-11-02 16:06:08 -08:00
Brad Hefta-Gaub
02288e84e8
CR feedback
2015-11-02 15:35:30 -08:00
samcake
3d2739c7b4
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-02 15:34:57 -08:00
ericrius1
f57f3c1138
Disabled writing to depth buffer for particles and no longer sorting the,
2015-11-02 15:25:42 -08:00
Brad Hefta-Gaub
f532607cca
add touch and other gestures to standard
2015-11-02 15:06:38 -08:00
samcake
0211e00c86
Cleaning the feature not conditional do the true design
2015-11-02 15:01:59 -08:00
samcake
c2687b4998
Cleaning the feature not conditional do the true design
2015-11-02 14:17:07 -08:00
Anthony J. Thibault
2236573a9d
Merge branch 'master' into tony/anim-sync-blend
2015-11-02 12:18:11 -08:00
Brad Hefta-Gaub
b94258f953
add example of overriding default rightClick behavior
2015-11-02 11:55:50 -08:00
Andrew Meadows
9799693135
remove extra whitespace
2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52
route HMD-following through the physics simulation
2015-11-02 11:07:40 -08:00
Seth Alves
c381da24a7
get interface building on my linux box
2015-11-02 10:42:06 -08:00
samcake
543f322ffe
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-02 09:48:32 -08:00
Brad Hefta-Gaub
d9dd045886
better parameter name
2015-11-02 09:29:09 -08:00
Brad Hefta-Gaub
c3a78ed151
cleanup
2015-11-02 09:27:35 -08:00
Brad Hefta-Gaub
b00f572e1a
add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag
2015-11-02 09:21:15 -08:00
Anthony J. Thibault
e3e759248f
Merge branch 'master' into tony/anim-sync-blend
2015-11-02 08:37:10 -08:00
Howard Stearns
ea2971a24f
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-11-01 17:02:59 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -08:00
Brad Hefta-Gaub
fe4a6fa2bf
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings
2015-11-01 15:01:30 -08:00
Brad Hefta-Gaub
9c23f2551d
Merge pull request #6207 from jherico/pluginSupport
...
Support for runtime plugins (DLLs)
2015-11-01 14:57:13 -08:00
Brad Hefta-Gaub
4a08329d22
fix unix warnings for comparing enums to enums
2015-11-01 12:10:42 -08:00
Brad Hefta-Gaub
43df5b55fe
fix linker warnings
2015-11-01 11:55:55 -08:00
Brad Davis
cfb2fd1523
Support for runtime plugins (DLLs)
2015-11-01 11:12:12 -08:00
Brad Davis
99d8554cc8
Make zlib a true external on windows (linux and OSX should rely on system libraries)
2015-11-01 01:36:59 -07:00
Brad Davis
7fdb8e28e7
Merge pull request #6262 from ZappoMan/fixControllers
...
Tweaks to standard hand controller mappings
2015-10-31 23:42:13 -07:00
Brad Hefta-Gaub
05dea847be
add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu
2015-10-31 15:47:40 -07:00
Howard Stearns
fb26e85faf
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-31 14:33:17 -07:00
Brad Davis
0e13348b5a
PR feedback
2015-10-31 14:26:14 -07:00
Brad Davis
abbfe15395
Adding peek support for endpoints
2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub
b877f832a9
fix SDL joysticks
2015-10-31 13:02:17 -07:00
Howard Stearns
79f05c63e5
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-31 11:23:18 -07:00
Seth Alves
5916875345
one more
2015-10-31 08:20:24 -07:00
Seth Alves
224aeea044
quiet compiler
2015-10-31 08:11:43 -07:00
Andrew Meadows
9809fcfa54
Merge pull request #6244 from sethalves/grab
...
kinematic grab fixes
2015-10-31 04:36:13 -07:00
Bradley Austin Davis
0355a37fb1
Fixing SDL2 active/inactive value
2015-10-30 22:19:44 -07:00
Bradley Austin Davis
9b9e35d396
Limit sixense to mavericks and below
2015-10-30 22:02:20 -07:00
Seth Alves
896ed3927c
merge from upstream
2015-10-30 19:17:43 -07:00
Bradley Austin Davis
46d87dda5a
Fixing paths for SDL2 and Sixense libs
2015-10-30 19:00:26 -07:00
Brad Hefta-Gaub
88fda01ce2
Merge pull request #6254 from hyperlogic/tony/log-handler-crash-fix
...
Fix for rare crash in LogHandler::flushRepeatedMessages()
2015-10-30 18:47:37 -07:00
Anthony J. Thibault
2eb62f2fd8
LogHandler: fix for linux build
2015-10-30 17:44:06 -07:00
samcake
78e6fe5563
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-30 17:33:38 -07:00
samcake
00be6b3e3a
Add support for NOT conditional in the route json
2015-10-30 17:32:26 -07:00
Anthony J. Thibault
f50e1a0977
Fix for rare crash in LogHandler::flushRepeatedMessages()
...
This can happen when LogHandler::flushRepetedMessages is called on
the main thread, while the application is printing messages on
a separate thread. The access to the _lastRepeatedMessage QHash was
not guarded.
I've added two mutexes to guard access to both the repeatedMessage
hashes/regexes and the onlyOnceMessages/regexes. This will unfortunately
incur a performance hit for frequent debug logging, but that's better
then crashing.
Also, I've added the ability to print threadIDs as well as Process ids.
This is helpful when debugging multi-threaded access to shared variables.
2015-10-30 17:18:37 -07:00
Seth Alves
944f0965c0
some refactoring and a bug fix -- grab script can throw things again
2015-10-30 16:35:50 -07:00
Seth Alves
cf83ca22bb
change how kinematic objects get data back to entity when an action is active
2015-10-30 15:30:54 -07:00
AlessandroSigna
b8a2fcbb2c
Vive controller - fix inverted inputs
2015-10-30 15:21:48 -07:00
Andrew Meadows
f652e983a9
flag kinematic objs when changed in stepSimulation()
2015-10-30 14:53:29 -07:00
Howard Stearns
28246c1951
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-30 13:21:56 -07:00
Brad Hefta-Gaub
8839458d54
Merge pull request #6242 from highfidelity/controllers
...
New Controller interfaces/api
2015-10-30 12:47:51 -07:00
samcake
393f6a4c76
Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version
2015-10-30 11:35:50 -07:00
Howard Stearns
ce1d0fe07c
Git rid of unused (un-emitted and intended to be removed long ago) script signal.
2015-10-30 11:25:54 -07:00
Seth Alves
93503d0a21
make kinematic grab set entities kinematic in bullet and update entity position
2015-10-30 11:03:13 -07:00
Anthony Thibault
fcfb44207f
Merge pull request #6097 from howard-stearns/expose-anim-vars
...
Expose animation vars to Javascript
2015-10-30 10:50:42 -07:00
Brad Hefta-Gaub
b2f27054f4
Merge pull request #6239 from AlessandroSigna/controllers
...
ViveController - input mapping
2015-10-30 10:39:26 -07:00
Brad Davis
9607812116
Fixing input plugin dependencies
2015-10-30 10:18:51 -07:00
Brad Davis
49e7d42c2c
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-30 10:07:40 -07:00
Clément Brisset
a37c94bd3c
Merge pull request #6202 from birarda/asset-parenting
...
don't force parenting of AssetUpload/AssetRequest
2015-10-30 09:45:42 -07:00
Brad Hefta-Gaub
126f68114b
Merge pull request #6241 from huffman/fix-physics-substep-warning
...
Fix warning in ThreadSafeDynamicsWorld
2015-10-30 09:37:55 -07:00
Ryan Huffman
84869c512b
Fix mis-renamed method names
2015-10-30 09:30:22 -07:00
Ryan Huffman
7a4787a79c
Rename stepSimulation to stepSimulationWithSubstepCallback to fix warning
2015-10-30 09:21:13 -07:00
Brad Hefta-Gaub
43a4f1001d
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings
2015-10-30 08:30:02 -07:00
Brad Davis
fcfab0fc51
Moving SDL2, Sixense and Faceshift to external projects
2015-10-30 00:57:51 -07:00
Brad Hefta-Gaub
a149a2dd60
fix some warnings
2015-10-30 00:19:14 -07:00
Brad Davis
d9c534f404
Merge pull request #6236 from thoys/js-vec3-fixes
...
Scripting - Fix Vec3 properties and added multiplyVbyV function
2015-10-29 22:45:25 -07:00
Brad Hefta-Gaub
70f3156328
make sure CompositeEndpoints properly report readability more axis based keyboard inputs
2015-10-29 22:37:12 -07:00
Brad Hefta-Gaub
8a03383adc
use makeAxis for some keyboard support
2015-10-29 22:19:33 -07:00
Howard Stearns
c2873ef720
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-29 22:17:31 -07:00
Howard Stearns
96900dab25
Merge pull request #6195 from CrackerHax/master
...
Added AvatarList features for creating userlists in AC scripts
2015-10-29 22:11:57 -07:00
Howard Stearns
eb9e54de41
Make AnimVariantXXX.xxx consistent.
2015-10-29 19:45:23 -07:00
Howard Stearns
d491ddc3d6
comment.
2015-10-29 19:43:57 -07:00
Howard Stearns
1918f1835c
Tolerate AnimVars that are float when we want int, and vice versa.
2015-10-29 19:37:13 -07:00
Howard Stearns
f7d558a252
comment
2015-10-29 19:26:54 -07:00
Howard Stearns
dcc173c93a
comment.
2015-10-29 19:21:24 -07:00
Howard Stearns
5d1ba90f1e
More readable code.
2015-10-29 19:18:34 -07:00
Howard Stearns
ada32dd260
typo
2015-10-29 19:17:52 -07:00
AlessandroSigna
01d3805148
ViveController - mapping of buttons
2015-10-29 18:44:43 -07:00
Brad Hefta-Gaub
b56c49a182
add makeAxis support to JSON parsing
2015-10-29 17:33:30 -07:00
Thijs Wenker
35e03d662d
fix the constants of Vec3 , const glm::vec3& UNIT_***() weren't accessible in javascript. Solved it by making them properties that are CONSTANT. Also added function to multiply a vec3 by a vec3 called multiplyVbyV since overloading it over multiply gave me some problems
2015-10-30 00:58:32 +01:00
Howard Stearns
502cc7f580
Don't copy while converting.
2015-10-29 16:44:01 -07:00
Howard Stearns
303491817b
assert to get hard error in dev, warning and no-op in release.
2015-10-29 16:35:59 -07:00
Howard Stearns
6b4b4440e8
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 16:06:24 -07:00
Brad Hefta-Gaub
c962697b18
Merge pull request #6230 from samcake/controllers
...
Controllers : Comfort mode is working through the stanadrd mapping
2015-10-29 14:59:42 -07:00
samcake
c1e00ca08c
FIxing the mac build again ?
2015-10-29 14:30:51 -07:00
Brad Hefta-Gaub
ffa805affb
Merge pull request #6223 from AlessandroSigna/controllers
...
Vive Controller
2015-10-29 14:16:34 -07:00
samcake
9c860346df
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 14:05:34 -07:00
Brad Davis
036ae62dd3
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-29 14:00:52 -07:00
samcake
d73eafddd1
COmfort mode working with the COntroller system observing the menu state
2015-10-29 13:48:16 -07:00
Brad Hefta-Gaub
3c11cf2926
Merge pull request #6226 from kencooke/master
...
Workaround for audio having channels swapped under Qt 5.5.1
2015-10-29 13:25:41 -07:00
AlessandroSigna
ffd2b39874
Fix vive controller - update to new input plugin register
2015-10-29 13:18:37 -07:00
samcake
b09a159090
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-29 13:06:52 -07:00
samcake
77759fa8af
t reset --:wq
...
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 13:06:16 -07:00
samcake
e902e5e97a
Introduce the concept of loading the default Mapping
2015-10-29 13:05:29 -07:00
Ken Cooke
1eabb924f1
Fixed the logic to be correct
2015-10-29 12:53:47 -07:00
