Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 06:10:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
39272 commits 76 branches 59 tags 1.2 GiB
Commit graph

15888 commits

Author SHA1 Message Date
Philip Rosedale
a98efbc660 Merge pull request #6997 from jagwire/WorkingEnergy 
Working energy usage for entity manipulation.
 2016-02-05 17:17:45 -08:00
samcake
502abd3e93 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-05 16:50:18 -08:00
samcake
e5f3805d0e Fixing the item insert in cell criteria for subcell and adding debgging tool 2016-02-05 16:49:43 -08:00
Ken Cooke
ad0383114b Compiler fixes 2016-02-05 16:34:04 -08:00
Ken Cooke
1a1b34296c Compiler fixes 2016-02-05 15:44:31 -08:00
Ken Cooke
721fa9d43a HRTF-based audio spatialization engine 2016-02-05 15:24:09 -08:00
Andrew Meadows
09bdccb18c Merge pull request #7032 from hyperlogic/tony/standing-jump 
MyAvatar: Standing Takeoff and In-Air Animations
 2016-02-05 13:45:52 -08:00
Zach Pomerantz
c334e4ebcb Add JSON interface to render::Job::Config 2016-02-05 13:03:47 -08:00
Zach Pomerantz
8bf6c66327 Add (de)serializer for QObject->JSON 2016-02-05 13:03:46 -08:00
Bradley Austin Davis
ebf0bf394a Fix native text rendering by forcing positions to integer values 2016-02-05 11:43:31 -08:00
Zach Pomerantz
d9132f3973 Clean up geometry instanced calls 2016-02-05 11:22:45 -08:00
Zach Pomerantz
b0a9c299ed Add tone mapping to overlay shaders 2016-02-05 11:18:42 -08:00
Anthony J. Thibault
f13e31c7fc CharacterController: removed unnecessary code. 2016-02-05 10:53:58 -08:00
Zach Pomerantz
a1ed29e6f8 Rename setupTransparent->setupBatch 2016-02-05 10:53:01 -08:00
Babiuch, Ryan Nicholas
aab98db812 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-05 12:49:38 -06:00
Zach Pomerantz
aa50d1e98e Add factor and shading to overlay/translucent light shaders 2016-02-05 10:27:07 -08:00
samcake
57b6ad3c54 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-05 09:23:31 -08:00
Anthony J. Thibault
bfeace78f7 AnimInverseKinematics: warning fixes 2016-02-04 18:51:48 -08:00
samcake
a999e046b5 Showing the LOD angle 2016-02-04 17:59:35 -08:00
Anthony J. Thibault
51189cfc50 AnimInverseKinematics: opened up UpLeg and Leg constraints 
This improves the quality of the jump animations, while IK is enabled.
 2016-02-04 17:56:41 -08:00
Anthony J. Thibault
8ca8550f26 MyAvatar: Standing Takeoff and In-Air Animations 
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.

CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
 2016-02-04 17:56:07 -08:00
Zach Pomerantz
a4cea0a307 Conform model/overlay shaders 2016-02-04 16:21:56 -08:00
Brad Hefta-Gaub
817245accc Merge pull request #7025 from jherico/qml 
QML Work
 2016-02-04 16:03:39 -08:00
Zach Pomerantz
44d297e7e2 Differentiate named calls by pipeline 2016-02-04 15:32:47 -08:00
Zach Pomerantz
f0797d8ea0 Move instanced pipeline setup to lambda from batch 2016-02-04 15:32:28 -08:00
Babiuch, Ryan Nicholas
fb5236e9b2 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 16:50:43 -06:00
Bradley Austin Davis
dc0e038535 Add drive selection to the file dialog 2016-02-04 13:51:43 -08:00
Stephen Birarda
42e9a4ebf0 fix ATP SendQueue failure to receive after re-activity 2016-02-04 13:43:50 -08:00
Bradley Austin Davis
64597f9d9f Fixing save dialog issues saving new files 2016-02-04 13:32:52 -08:00
Andrew Meadows
2da46ff26a server-side release ownership 2016-02-04 13:26:07 -08:00
Andrew Meadows
af57f5d120 add simple and fast DirtyOctreeElementOperator 2016-02-04 13:26:07 -08:00
Andrew Meadows
959f924b1d flag entity as changed when changing simulatorID 2016-02-04 13:26:07 -08:00
Andrew Meadows
91a2f86482 update some comments 2016-02-04 13:26:06 -08:00
Andrew Meadows
e51edaa117 update some comments 2016-02-04 13:26:06 -08:00
Andrew Meadows
381049acb3 clear simulation ownership when owners vanish 2016-02-04 13:26:06 -08:00
Andrew Meadows
05fb866bb5 fix spelling typo in comment 2016-02-04 13:26:06 -08:00
Andrew Meadows
e3351c05a2 make some methods const 2016-02-04 13:26:06 -08:00
Anthony J. Thibault
a8e092272c AnimStateMachine: added new State parameter interpType 
interpType defines how the interpolation between two states is performed.

   * SnapshotBoth: Stores two snapshots, the previous animation before interpolation begins and the target state at the
     interTarget frame.  Then during the interpolation period the two snapshots are interpolated to produce smooth motion between them.
   * SnapshotPrev: Stores a snapshot of the previous animation before interpolation begins.  However the target state is
     evaluated dynamically.  During the interpolation period the previous snapshot is interpolated with the target pose
     to produce smooth motion between them.  This mode is useful for interping into a blended animation where the actual
     blend factor is not known at the start of the interp or is might change dramatically during the interp.
 2016-02-04 10:32:58 -08:00
samcake
cc7f03e7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-04 10:29:41 -08:00
Zach Pomerantz
cb06d4a9e4 Fix -Wunused-variable for geometry solid stream formats 2016-02-04 10:13:35 -08:00
Zach Pomerantz
9e7e6be549 Fix -Wunused-variable for MeshPart ShapeKeys 2016-02-04 10:06:07 -08:00
Zach Pomerantz
0c31c072a3 Fix -Wreorder for DrawOverlay3D ctor 2016-02-04 10:03:35 -08:00
samcake
513561ba2d Using an angle for the LOD test 2016-02-04 09:31:21 -08:00
Babiuch, Ryan Nicholas
0069849da3 Consider existing velocity in calculating energy costs when editing entities. 2016-02-04 08:55:23 -06:00
Babiuch, Ryan Nicholas
dca7ff967c Conform to coding standard. 2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 08:18:47 -06:00
Zach Pomerantz
65ddb944d2 Add defaults/light/shaders to plumber 2016-02-03 19:18:56 -08:00
Zach Pomerantz
666213b7a8 Add CULL, DEPTH_BIAS to ShapeKey 2016-02-03 19:18:56 -08:00
Zach Pomerantz
8d0f82fa6a Split DrawOverlay3D to Transparent/Opaque 2016-02-03 19:18:56 -08:00
Zach Pomerantz
399fe95dc9 Update overlay/emissive shaders 2016-02-03 19:18:56 -08:00
Zach Pomerantz
9af7dc9c3e Add layering to text renderer 2016-02-03 19:18:56 -08:00
Zach Pomerantz
127f9694f6 Fix ordering of batchSetter in pickPipeline 2016-02-03 19:18:56 -08:00
Zach Pomerantz
a790b09892 Supply normals to GeometryCache draw calls 2016-02-03 19:18:56 -08:00
Zach Pomerantz
d14ce8a9fe Pass an explicit pipeline to render.*Instance calls 2016-02-03 19:18:56 -08:00
samcake
78b21c3f4d Refining the culling test and defining the 2 new jobs FetchSPatialTree and CullSpatialSelection 2016-02-03 18:39:40 -08:00
samcake
0478450205 Refining the culling test and defining the 2 new jobs FetchSPatialTree and CullSpatialSelection 2016-02-03 18:38:57 -08:00
Stephen Birarda
816fe52c5b mark getAvatarBySessionID as virtual 2016-02-03 17:31:38 -08:00
Stephen Birarda
058bba7b55 move avatar invokables from AvatarManager to AvatarHashMap 2016-02-03 17:13:35 -08:00
Bradley Austin Davis
60d97c45af Support save file dialog 2016-02-03 14:51:10 -08:00
Bradley Austin Davis
0a99086617 Moving to QML based dialogs 2016-02-03 14:51:02 -08:00
Andrew Meadows
63df34541d Merge pull request #6802 from huffman/agent-simulation 
Fix Agents bidding on simulation ownership
 2016-02-03 13:45:12 -08:00
Babiuch, Ryan Nicholas
786400eb53 Merge branch 'WorkingEnergy' 2016-02-03 14:53:28 -06:00
Babiuch, Ryan Nicholas
d7951f4300 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 14:52:08 -06:00
Andrew Meadows
861082964e Merge pull request #7017 from hyperlogic/tony/fly 
MyAvatar: Improved Jump / InAir / Fly behavior
 2016-02-03 12:22:30 -08:00
Brad Hefta-Gaub
839ce50bde Merge pull request #7018 from jherico/qml 
QML fixes
 2016-02-03 11:59:27 -08:00
Babiuch, Ryan Nicholas
3d727d76c2 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 13:39:13 -06:00
Babiuch, Ryan Nicholas
3cb2f9c4b7 Exposed energy cost multiplier to scripting. 
- field: costMultiplier
 2016-02-03 13:29:42 -06:00
Stephen Birarda
93530fca72 fix the last of the current override warnings for OS X 2016-02-03 11:08:41 -08:00
Anthony J. Thibault
fff603e4e2 Removed comment 2016-02-03 10:21:27 -08:00
samcake
edbcef20d4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-03 09:44:05 -08:00
Ryan Huffman
963c71a476 Fix ES rejecting unowned entity physics updates 2016-02-03 09:28:49 -08:00
Babiuch, Ryan Nicholas
7dd5bca17f Bug fixes and debt reductions on energy calculations. 
- removed superfluous code interfacing with scripts
- favor floats over doubles in cost calculations
- default avatar energy is maximum float value for cases where energy script is not loaded in order to still manipulate entities.
 2016-02-03 10:46:28 -06:00
samcake
cb59cccc0c Adding 2 lists per brick now, the subcelItems and the regular items, trying to use it, probably buggy 2016-02-02 18:10:56 -08:00
samcake
4d62df2996 Merge pull request #7011 from zzmp/fix/render-connect-warnings 
Only connect render config if dirty signal present
 2016-02-02 17:46:22 -08:00
samcake
940ef40b69 Merge pull request #6999 from zzmp/refactor/render-init-file 
Migrate stencil and overlay jobs to use plumbers
 2016-02-02 17:45:17 -08:00
Zach Pomerantz
aa10af2851 Revert "Move DrawStencil to use ShapePlumber" 
This reverts commit 671f27e5bc.
 2016-02-02 17:10:21 -08:00
Anthony J. Thibault
03d5bc885b AnimClip: added mirrorFlag anim var 2016-02-02 17:10:15 -08:00
Anthony J. Thibault
e6abc026c8 AnimClip: mirror animation support 2016-02-02 17:02:29 -08:00
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -08:00
Anthony J. Thibault
6cc3b2b47f Fixed unused variable warnings on OSX and Linux 2016-02-02 15:04:28 -08:00
Brad Hefta-Gaub
a025fab5c8 Merge pull request #7016 from jherico/qml 
QML Fixes
 2016-02-02 14:08:45 -08:00
Ryan Huffman
759b1a347c Merge pull request #7015 from birarda/audio-mute-crash 
rename canAdjustLocks to isAllowedEditor, add debug for crash
 2016-02-02 13:12:06 -08:00
Ryan Huffman
25632b63b7 Adjust Entities.addEntity to not bid on simulation from AC Script 2016-02-02 13:00:35 -08:00
Anthony J. Thibault
656608e2ff Fixes for away.js 2016-02-02 12:08:52 -08:00
Bradley Austin Davis
2c26b32341 Make QML based tool-windows close properly 2016-02-02 12:00:58 -08:00
Anthony J. Thibault
c4e1509aa2 CharacterController: better debug support of internal state machine 
Head is no longer visible when flying fast, in first-person HMD mode.
 2016-02-02 11:26:18 -08:00
Anthony J. Thibault
8b5cf3e49a CharacterController: refined state machine. 2016-02-02 11:26:17 -08:00
Anthony J. Thibault
47f3ce3786 CharacterController jump is more reliable. 2016-02-02 11:26:16 -08:00
Anthony J. Thibault
2936811484 Added takeoff animation, WIP 
Character controller still has some jump/in-air bugs.
 2016-02-02 11:26:15 -08:00
Anthony J. Thibault
61c55ebf6c Updated character controller with a state enumeration 
Also, adjusted checkForSupport logic such that very slanted walls are not considered support.
 2016-02-02 11:26:15 -08:00
Anthony J. Thibault
e9fd439ffd Added inAir animations 2016-02-02 11:23:46 -08:00
Ryan Huffman
eff02d3e3a Fix Agents bidding on simulation ownership 2016-02-02 10:47:51 -08:00
samcake
19b69f370d Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-02 09:29:50 -08:00
Bradley Austin Davis
aecf582593 Don't crash on GL error in present thread 2016-02-01 18:26:32 -08:00
samcake
a29831bdf4 Fancy selection of the brick and cells 2016-02-01 18:16:23 -08:00
Zach Pomerantz
0b6cfbe50a Only connect render config if dirty signal present 2016-02-01 17:48:31 -08:00
samcake
ee7ca35c0c Adding the selectBranch 2016-02-01 16:48:23 -08:00
Stephen Birarda
095f0b9349 rename canAdjustLocks to isAllowedEditor for multi-purpose 2016-02-01 16:46:11 -08:00
samcake
7cb0108457 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-01 15:17:58 -08:00
samcake
6d4744ed47 Trying to see what s going on 2016-02-01 15:17:32 -08:00
samcake
1b52d700a0 Merge pull request #6871 from Atlante45/feat/draw-call-info 
Unify normal and named draw paths
 2016-02-01 14:19:15 -08:00
Brad Hefta-Gaub
711787a997 Merge pull request #6981 from howard-stearns/animate-iff-visible-with-step2-billboard-removal 
Animate iff visible with step2 billboard removal
 2016-02-01 13:54:25 -08:00
samcake
668378481b Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-01 13:48:20 -08:00
samcake
18d8a2fb42 Implementing the octree selection from frustum 2016-02-01 13:47:38 -08:00
Atlante45
ad215f23c6 Deactivate SSBOs for now 2016-02-01 22:41:01 +01:00
James B. Pollack
8e75ce8232 Merge pull request #6967 from zzmp/fix/render-count 
Render the correct maxDrawnItems
 2016-02-01 13:34:33 -08:00
Zach Pomerantz
5d49eacf83 Move pipeline init to separate file 2016-02-01 11:12:11 -08:00
Anthony Thibault
b345df8002 Merge pull request #6987 from AndrewMeadows/better-ik 
reduce hand-IK coupling to hip offset
 2016-02-01 10:36:21 -08:00
Zach Pomerantz
df894d364a Move DrawOverlay3D to use ShapePlumber 2016-02-01 10:30:14 -08:00
Zach Pomerantz
671f27e5bc Move DrawStencil to use ShapePlumber 2016-02-01 10:30:08 -08:00
Atlante45
5ac0350993 Don't fall through in switch case 2016-02-01 18:50:01 +01:00
Andrew Meadows
71664dffae change string comparisons to be CaseSensitive 2016-02-01 09:50:01 -08:00
Atlante45
52885545ea Use feature name for ifdef 2016-02-01 18:50:01 +01:00
Atlante45
838b637591 Don't capture raw draw calls during named calls processing 2016-02-01 18:50:01 +01:00
Atlante45
a5603140de Fix for mac 2016-02-01 18:50:01 +01:00
Atlante45
8cf393bb59 Mac compatibility 2016-02-01 18:50:01 +01:00
Atlante45
8d4dab19c7 Only bind once per render batch 2016-02-01 18:50:01 +01:00
Atlante45
9e8a3f19e9 Revert max input slot changes 2016-02-01 18:50:01 +01:00
Atlante45
38a223b270 Split declareStandardTransform 2016-02-01 18:50:01 +01:00
Atlante45
71ecd1662c Add correct vertex attrib divisor 2016-02-01 18:50:01 +01:00
Atlante45
6ee88c15ec Use vbo for draw call infos 2016-02-01 18:50:01 +01:00
Atlante45
7471646569 Disable attrib vertex on normal passes 2016-02-01 18:50:01 +01:00
Atlante45
d639a838ad set currentNamedCall during setupNamedCalls 2016-02-01 18:50:01 +01:00
Atlante45
670cfc263b Capture draw call info and model xfm in batch 2016-02-01 18:50:01 +01:00
Atlante45
7e8ea4dc77 Update primitive instance rendering calls 2016-02-01 18:50:01 +01:00
Atlante45
1658c15cca Reserve last input slot for draw call info 2016-02-01 18:50:01 +01:00
Atlante45
78cd4407db Don't pass binding manually, link named call correctly 2016-02-01 18:50:01 +01:00
Atlante45
eb55e55367 Clear buffers between each batch render 2016-02-01 18:50:01 +01:00
Atlante45
6ff38bc32f Make sure _currentDraw has correct value 2016-02-01 18:50:01 +01:00
Atlante45
3e027fc5c5 Use ssbo for model transforms 2016-02-01 18:50:01 +01:00
Atlante45
23cf72bd6c Add multi draw to factored setup 2016-02-01 18:50:01 +01:00
Atlante45
6464fabd71 Update current draw call 2016-02-01 18:50:01 +01:00
Atlante45
ccb183e518 Unify Named/Normal calls 2016-02-01 18:50:01 +01:00
Atlante45
9e0af63441 Bind model transform as single buffer 2016-02-01 18:50:01 +01:00
Atlante45
bff2a2a8e5 Factor draw call updates 2016-02-01 18:50:01 +01:00
Atlante45
6463136240 start/stopNamedCall run in renderPassTransfer too 2016-02-01 18:50:01 +01:00
Atlante45
bd8f62504d Capture DrawCallInfo during renderPassTransfer 2016-02-01 18:50:01 +01:00
Atlante45
4d6931c5a8 Add private start/stopNamedCall batch commands 2016-02-01 18:50:01 +01:00
Babiuch, Ryan Nicholas
47f7d55e2c Working energy usage for entity manipulation. 
- Working example in examples/example/ui/MyEnergyBar.js
 2016-02-01 08:32:52 -06:00
samcake
f551ea9f76 fixing compilation on mac and a glsl error on mac 2016-01-31 17:19:47 -08:00
samcake
b2f6360020 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-29 20:57:21 -08:00
samcake
59434e1ea9 DDisplay of the octree cells is working, added the Brick empty / full per cell 2016-01-29 18:16:45 -08:00
Ryan Huffman
4ed38c4104 Merge pull request #6986 from birarda/injector-restart 
fix for injector restart not restarting
 2016-01-29 16:27:34 -08:00
Stephen Birarda
d7990bf88a reset hasSentFirstFrame to false for double frame on first send 2016-01-29 14:55:08 -08:00
Andrew Meadows
de54a0ac4b remove cruft 2016-01-29 14:51:24 -08:00
Stephen Birarda
d3028606c5 retart the nextFrame and frameTimer on injector restart 2016-01-29 14:47:27 -08:00
samcake
7b50a4d05f clening up the BRick insert item interface and the shaders 2016-01-29 14:30:53 -08:00
Andrew Meadows
14ec1b6295 reduce hand IK coupling to hip position 2016-01-29 14:28:56 -08:00
Andrew Meadows
a98459dfa8 minor IK optimization: changed accumulators only 2016-01-29 14:28:56 -08:00
Andrew Meadows
449d566d2a properly track lowestMovedIndex 2016-01-29 14:28:56 -08:00
Andrew Meadows
48f6a9c05f fix IK looping error after minor refactor 2016-01-29 14:28:56 -08:00
Andrew Meadows
7b3f688a17 pull CCD IK solution pass into protected method 2016-01-29 14:28:56 -08:00
Stephen Birarda
20cfe80036 use a vector instead of priority queue to avoid double sort 2016-01-29 14:04:45 -08:00
Stephen Birarda
8d17df338b allow AIM event processing during repeated injection 2016-01-29 14:04:45 -08:00
Stephen Birarda
c91f8c7685 add debug for DDOS AC drop 2016-01-29 14:04:45 -08:00
Stephen Birarda
5551a05261 removed debug for queued check-ins 2016-01-29 14:04:45 -08:00
Stephen Birarda
e50e75cba7 drop assignment even if DDOS locks NL thread 2016-01-29 14:04:45 -08:00
howard-stearns
9601b65269 Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-29 11:40:13 -08:00
samcake
2a5aab6dc8 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-29 10:11:16 -08:00
Brad Hefta-Gaub
721a911cf1 Merge pull request #6972 from jherico/qml 
Small QML Fixes
 2016-01-29 09:57:15 -08:00
Brad Davis
c80193635b Update input dialog to support choice selection 2016-01-28 21:19:21 -08:00
samcake
71e6c6e443 Starting to add the Items on the Octree 2016-01-28 17:57:21 -08:00
Brad Davis
e97850dd26 Merge pull request #6965 from ctrlaltdavid/20793 
Warn user if OpenGL version is too low (< 4.1)
 2016-01-28 20:39:56 -05:00
Ryan Huffman
c67f39a6c0 Merge pull request #6976 from birarda/injector-dos 
fix for overflow on injector playNextFrameAt
 2016-01-28 16:37:12 -08:00
David Rowe
6232a83f43 Specify minimum OpenGL version in gl library's config 
Note: Defines minimum OpenGL version as 4.1 in anticipation of Interface
soon properly supporting both 4.1 and 4.3 on Windows.
 2016-01-29 13:03:54 +13:00
Brad Davis
aa03241dd9 Make all load script dialogs QML and respect previous script location 2016-01-28 15:53:04 -08:00
Brad Davis
1324525ecc Make file dialog compatible with QFileDialog::getOpenFile 2016-01-28 15:50:57 -08:00
Stephen Birarda
0c2805db7e remove debug added to catch injector DOS 2016-01-28 15:50:04 -08:00
Stephen Birarda
311f1ac0e3 fix for overflow on time of next frame 2016-01-28 15:38:33 -08:00
samcake
9c5670fc0f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-28 15:31:56 -08:00
samcake
972d4cda77 Adding better octree visualization 2016-01-28 15:31:24 -08:00
David Rowe
2020514974 Move OpenGLVersionChecker to gl library 2016-01-29 12:29:21 +13:00
Zach Pomerantz
02d530ccc8 Merge pull request #6971 from samcake/hdr 
Fixing the default value for the TOneMapping curve
 2016-01-28 14:09:41 -08:00
Ryan Huffman
15db8040d8 Merge pull request #6961 from birarda/resampling-error 
fix a couple of resampling errors in Sound downSample
 2016-01-28 13:22:00 -08:00
Ryan Huffman
d39ab952f7 Merge pull request #6973 from birarda/injector-dos 
add some debug for AudioInjector DOS case
 2016-01-28 13:14:54 -08:00
samcake
5863e340af Cleaner... 2016-01-28 12:46:18 -08:00
samcake
ef451d40df Cleaner... 2016-01-28 12:39:52 -08:00
Brad Hefta-Gaub
49bbf42995 Merge pull request #6960 from sethalves/fix-adjust-edit-packet-for-clock-skew 
don't adjust a time of '0 usecs since epoch' with clock skew in edit packets
 2016-01-28 12:31:27 -08:00
Howard Stearns
33226796ff Merge pull request #6964 from ericrius1/editHref 
Validate href entity property (hifi:// only)
 2016-01-28 12:29:18 -08:00
Stephen Birarda
79c6ed9739 add some debug for AudioInjector DOS case 2016-01-28 12:22:36 -08:00
samcake
62d5a45829 Cleaner init 2016-01-28 12:20:09 -08:00
samcake
bf3a09cd00 Fixing the default value for the TOneMapping curve and cleaning the code into the ToneMappingEffect file 2016-01-28 12:14:20 -08:00
Andrew Meadows
3e35a5fc2d Merge pull request #6937 from ctrlaltdavid/20790 
Make entity properties be undefined after entity is unloaded
 2016-01-28 11:59:01 -08:00
Zach Pomerantz
5cbb5000d2 Render the correct maxDrawnItems 2016-01-28 11:42:54 -08:00
samcake
a2a9227d28 Merging with master 2016-01-28 11:37:24 -08:00
samcake
0c50903030 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-28 11:19:37 -08:00
Anthony Thibault
85843cff39 Merge pull request #6955 from AndrewMeadows/stable-judasboots 
apply "hips offset" to root of state graph
 2016-01-28 11:13:11 -08:00
samcake
54b9c1ac0d Merge pull request #6962 from zzmp/feat/task-io 
Reduce code duplication for render::Job::Model
 2016-01-28 09:31:26 -08:00
samcake
23f2c98834 fixing the addressing issue 2016-01-28 09:23:45 -08:00
samcake
6d8c33b996 Merging with upstream and still debugging the cell navigation math 2016-01-27 18:59:45 -08:00
samcake
20e1270e92 Merging with upstream and still debugging the cell navigation math 2016-01-27 18:59:18 -08:00
Stephen Birarda
0a386cdde8 remove trimFrames call from Sound 2016-01-27 16:10:18 -08:00
ericrius1
cd5e81de36 Validating href for edit.js 2016-01-27 16:02:02 -08:00
Andrew Meadows
7b5c221ceb Merge pull request #6956 from hyperlogic/tony/velocity-fix 
MyAvatar: copy body velocity + hmd follow velocity onto avatar
 2016-01-27 14:59:46 -08:00
Andrew Meadows
1b45f5cc0c tweaks to neck and spine constraints 2016-01-27 14:45:09 -08:00
Andrew Meadows
f67a20ee68 apply _hipsOffset in hips local-frame 2016-01-27 14:45:08 -08:00
Andrew Meadows
00715f1906 apply "hips offset" to root of state graph 
(Somemtimes the hips are not the root.
I'm looking at YOU blender!)
 2016-01-27 14:45:06 -08:00
Stephen Birarda
dc716461e3 fix for a couple of resampling edge cases 2016-01-27 14:33:03 -08:00
Anthony Thibault
3cdd88e06c Merge pull request #6951 from ZappoMan/fixAnimationRestart 
fix for animations stopping after domain restart
 2016-01-27 14:31:27 -08:00
Stephen Birarda
f3903022f2 Merge pull request #6958 from huffman/injector-timing-fixes 
Fix injector looping issues when using audio that isn't a multiple of the sample size
 2016-01-27 14:29:30 -08:00
samcake
ce5c115787 Debugging some of the computations in the OCtree::Location 2016-01-27 14:26:17 -08:00
samcake
f4e0352f61 Merge pull request #6930 from zzmp/feat/bubble-render-settings 
Bubble up render settings from CPP to JS/QML
 2016-01-27 14:20:51 -08:00
Ryan Huffman
2ec201b85e Fix conversion warning 2016-01-27 14:13:23 -08:00
Seth Alves
f2ea73d646 don't adjust a time of '0 usecs since epoch' with clock skew in edit packets 2016-01-27 14:12:03 -08:00
Ryan Huffman
7e5eec55da Fix non-looped injected audio possibly looping 2016-01-27 13:47:32 -08:00
Ryan Huffman
4de8e7a3c8 Add audio resizing in injector 2016-01-27 13:47:09 -08:00
howard-stearns
fa40e347ee Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-27 13:35:02 -08:00
James B. Pollack
86b2a67f72 Merge pull request #6891 from sethalves/avatar-updates-query-cube 
Avatar updates query cube
 2016-01-27 13:04:03 -08:00
Anthony J. Thibault
c771c925c8 MyAvatar: copy body velocity + hmd follow velocity onto avatar 
This was inadvertently removed in a previous PR.

https://github.com/highfidelity/hifi/pull/6895

Also, renamed Velocity stat to Speed.
 2016-01-27 11:20:32 -08:00
Ryan Huffman
8764eda479 Merge branch 'master' of https://github.com/highfidelity/hifi into injector-timing-fixes 2016-01-27 11:03:52 -08:00
Howard Stearns
0d257b82fa Merge pull request #6934 from hyperlogic/tony/anim-pre-post-rot-support 
Avatar Developer Menu: added animation debug options
 2016-01-27 10:39:25 -08:00
Ryan Huffman
607f23618d Fix compiler warning for float->int conversion 2016-01-27 10:36:44 -08:00
Ryan Huffman
a3b2dd2295 Add proper loop handling in injector 2016-01-27 10:14:05 -08:00
samcake
6d2d7c565a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-27 10:03:34 -08:00
samcake
b53f6b2e03 late night octree traversal 2016-01-27 10:03:31 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Brad Hefta-Gaub
881a94cd19 Merge pull request #6950 from jherico/qml 
Small QML fixes
 2016-01-26 21:30:46 -08:00
Zach Pomerantz
49c1285837 Add suffix Mode to DebugMode enum to avoid collision 2016-01-26 19:11:59 -08:00
Zach Pomerantz
e770d7b679 Add PhysicsShowOwned back to Menu 2016-01-26 18:56:52 -08:00
samcake
1b1ffa494b Making the octree more useful and cleaning up the interaction with the Scene 2016-01-26 18:46:57 -08:00
Brad Hefta-Gaub
f178fc789c fix for animations stopping after domain restart 2016-01-26 18:44:34 -08:00
Zach Pomerantz
4354eae129 Fix type, gaussion->gaussian 2016-01-26 18:09:18 -08:00
Zach Pomerantz
61f337b490 Hold Varying constant over task ctor 2016-01-26 17:43:41 -08:00
Zach Pomerantz
5d157b059f Collapse all Job/Task Models to one, including TaskIO 2016-01-26 17:40:32 -08:00
Anthony Thibault
0fdfb69cae Merge pull request #6938 from AndrewMeadows/reduce-hip-swing 
reduce hips swing driven by head orientation when wearing HMD
 2016-01-26 17:00:31 -08:00
Brad Davis
940b095013 Removing menu logspam 2016-01-26 16:59:37 -08:00
Brad Davis
5f38c5265c Fixing potential crash in dialog popups 2016-01-26 16:59:19 -08:00
Brad Davis
cea57a111b Desktop cleanup 2016-01-26 16:56:33 -08:00
Zach Pomerantz
5009e8702e Cleanup new render settings 2016-01-26 15:58:50 -08:00
Anthony J. Thibault
33993b8c44 AnimClip: removed unused static member. 2016-01-26 13:34:21 -08:00
samcake
462758ebdd Merge pull request #6863 from zzmp/feat/boom-shadow 
Tie shadow frustum to boom offset
 2016-01-26 13:33:57 -08:00
Seth Alves
1cc0aa18bb Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube 2016-01-26 13:31:07 -08:00
Stephen Birarda
b6f478e087 add some debug for audio injector wrap case 2016-01-26 13:10:02 -08:00
Zach Pomerantz
2d0d542765 Fix friend class typedef confusion in gcc 2016-01-26 12:44:56 -08:00
Zach Pomerantz
5b1834d7be Fix Wreorder for Job::Models 2016-01-26 12:44:37 -08:00
Zach Pomerantz
2da2bc60db Tie shadow frustum to boom offset 2016-01-26 12:26:16 -08:00
howard-stearns
1d49c8f368 Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-26 12:00:31 -08:00
howard-stearns
2e7f1cbb3f Align avatar animation with LOD visibility. 2016-01-26 11:59:18 -08:00
samcake
d1b29d561b Merge branch 'red' of https://github.com/samcake/hifi into red 2016-01-26 11:30:31 -08:00
samcake
6224766a4a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-26 11:30:19 -08:00
David Rowe
4e9fc02af5 Fix typos noticed in passing 2016-01-27 08:03:14 +13:00
David Rowe
1bfb941057 Fix Quat.equal() 2016-01-27 08:03:13 +13:00
Anthony J. Thibault
69d833a6c0 AnimClip: consistent application of translations 
Apply animation translation the same way regardless of state of usePreAndPostPoseFromAnimation.
 2016-01-26 10:53:21 -08:00
Ryan Huffman
b56668892e Fix else style 2016-01-26 09:39:11 -08:00
U-GAPOS\andrew
2728290ffb fix bug in IK and tune head/neck constraints 2016-01-26 09:37:33 -08:00
Ryan Huffman
3160aa3068 Change 0LL to INT64_C(0) 2016-01-26 09:36:52 -08:00
Ryan Huffman
5268ef8ac2 Fix else indentation 2016-01-26 09:36:40 -08:00
Ryan Huffman
0e1742588b Fix indentation 2016-01-26 09:35:35 -08:00
Ryan Huffman
641a6e9c30 Fix injector handling for when it falls behind 2016-01-26 09:29:02 -08:00
samcake
903c7dde5a Drafting the octree, allocating the first cells 2016-01-26 01:59:00 -08:00