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
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
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
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
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
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
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
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
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
Brad Hefta-Gaub
e47b049200
fix render item leak on Model::reset()
2015-11-09 16:41:40 -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
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
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
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
ericrius1
470f814776
Fixed glitches with large particles being sorted along wrong axis
2015-11-03 16:39:16 -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
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
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
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
