Seth Alves
696e34b996
Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox
2015-08-26 11:11:41 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
ericrius1
f25b75093c
cleaned up conditional bitstream parsing
2015-08-26 09:44:29 -07:00
Seth Alves
23dbbcc7bb
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-26 09:42:20 -07:00
Brad Hefta-Gaub
aa80fc9127
Merge pull request #5653 from jherico/homer
...
Remove items from the VR menu properly
2015-08-26 09:14:48 -07:00
Andrew Meadows
45c846572e
Merge pull request #5645 from jherico/maggie
...
Fixing problems reported by static analysis tool
2015-08-26 08:31:05 -07:00
Brad Hefta-Gaub
029c59fb77
Merge pull request #5654 from jherico/barney
...
Fix stereo modes aspect ratio
2015-08-25 22:16:30 -07:00
Brad Hefta-Gaub
5d5c1584c3
Merge pull request #5659 from jherico/nelson
...
Fix UserInputMapper event generation
2015-08-25 22:14:37 -07:00
Seth Alves
6f46832069
clean up some commented code. attempt to fix ray-casting in non-edged polyvox -- still isn't correct
2015-08-25 21:30:38 -07:00
Anthony J. Thibault
0c02a338f2
Added support for setting Variants in the json file.
...
For example: the avatar.json file was updated to use the "sine" Variant
to drive the Overlay alpha parameter.
2015-08-25 20:57:01 -07:00
Anthony J. Thibault
4abf0cbd63
AnimVariantMap is used in eval, MyAvatar loads avatar.json via url
2015-08-25 20:28:17 -07:00
samcake
fda9827100
Merge pull request #5529 from SeijiEmery/gputest
...
gputest
2015-08-25 20:03:08 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
073567558e
Fix UserInputMapper event generation
2015-08-25 19:15:06 -07:00
Brad Davis
f176003dad
Fixing aspect ratio on stereo plugins
2015-08-25 19:05:31 -07:00
Brad Davis
0aaa07a2de
Remove items from the QML version of the menu when they are removed from the main menu
2015-08-25 19:05:29 -07:00
Seth Alves
da6a1c958b
clean up debugging prints
2015-08-25 16:40:58 -07:00
Seth Alves
3c35d90908
don't recompute meshes if nothing changed
2015-08-25 13:13:01 -07:00
Anthony J. Thibault
496c706bba
Added AnimVariantMap argument to evaluate.
2015-08-25 11:59:24 -07:00
Seth Alves
f6c440756c
do slow polyvox operations on a thread
2015-08-25 11:46:51 -07:00
Seth Alves
caafea6e3b
allow compound collision shapes with less than 2 sub-shapes
2015-08-25 11:46:34 -07:00
Anthony J. Thibault
62f86e6a46
Added AnimVariant, renamed AnimClipTests to AnimTests.
...
* Added test for AnimVariant.
2015-08-25 11:33:57 -07:00
David Rowe
a98a867b06
Delete Interface.ini.lock before accessing to check crash option
2015-08-25 11:07:20 -07:00
Anthony J. Thibault
4bdb00bbc5
Added setCurrentFrame interface to AnimClip.
...
This will recurse the tree and call setCurrentFrameInternal on each node.
This method can be overriden, currently the only meaningful implementation is AnimClip.
2015-08-25 09:58:36 -07:00
Seth Alves
7cb9968864
more work on polyvox threading
2015-08-25 05:53:36 -07:00
Seth Alves
91254245e4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-24 20:21:24 -07:00
Anthony J. Thibault
7a2ca047cb
Added network resource download support to AnimNodeLoader.
2015-08-24 19:00:12 -07:00
Brad Davis
f9f5743fd7
Merge pull request #5650 from ZappoMan/fixCrashInController
...
Fix a couple crashes in the Controller scripting interface
2015-08-24 18:49:50 -07:00
Brad Hefta-Gaub
53ae958c74
Merge pull request #5643 from hyperlogic/tony/renderable-particle-crash-fix
...
Fix for RenderableParticleEffectEntity crash.
2015-08-24 17:44:39 -07:00
Anthony J. Thibault
bde75e9e51
AnimDebugDraw rendering works again.
...
I had to port AnimDebugDraw shader to GLSL 4.1.
2015-08-24 17:36:21 -07:00
Stephen Birarda
c8ba24817f
fix for hash specialization for QUuid
2015-08-24 17:09:52 -07:00
Anthony J. Thibault
5a73aef1f8
AnimSkeleton more accurate bind pose generation.
2015-08-24 16:19:16 -07:00
Brad Hefta-Gaub
13a9dc4df2
cleanup controller interface, add getActionNames() and getDeviceNames()
2015-08-24 15:35:55 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
Seiji Emery
4d9f45475e
Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
2015-08-24 14:38:26 -07:00
Brad Hefta-Gaub
6549e47dbc
fix crash in Controller when asking for device name out of bounds
2015-08-24 14:35:19 -07:00
Anthony J. Thibault
fa5256eefd
Merge branch 'master' into ajt/new-anim-system
2015-08-24 14:32:28 -07:00
Stephen Birarda
e8772277de
de-bloat the domain-server by adding a DomainGatekeeper
2015-08-24 14:19:33 -07:00
David Rowe
f6cf77ae68
Add Developer > Display Crash Options menu item
...
Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
2015-08-24 13:24:31 -07:00
ericrius1
13892db866
removed logging
2015-08-24 11:41:03 -07:00
Anthony J. Thibault
47b8ab373c
Fix for RenderableParticleEffectEntity crash.
...
The render item payload now keeps a shared_ptr to the entity.
2015-08-24 11:15:30 -07:00
ericrius1
5fa27a7cf1
added back computeAndUpdate mmethod for particles, and now handling parsing old streams
2015-08-24 10:59:38 -07:00
Brad Davis
78a08ed7c7
Merge pull request #5641 from thoys/20660
...
CR for Job #20660 - Render the world Axis markers into negative space, add view option
2015-08-24 10:16:56 -07:00
Howard Stearns
bb91b17314
Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
...
Fix for animation resources
2015-08-24 08:13:33 -07:00
Nex Pro
8d8a9535a0
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-24 16:07:38 +01:00
Nex Pro
3f4323e084
Added overload for renderDashedLine
2015-08-24 16:07:07 +01:00
Thijs Wenker
0f8cf80d45
Merge branch 'master' of https://github.com/worklist/hifi into 20660
2015-08-23 19:53:50 +02:00
Nex Pro
ad315cf68a
Merge branch '20660' of github.com:thoys/hifi into 20660
...
Conflicts:
interface/src/Util.cpp
2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369
Modified the world box to render axes in negative space
...
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
2015-08-23 16:21:20 +01:00
Seth Alves
dc31c7e233
back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about
2015-08-23 08:14:05 -07:00
Brad Hefta-Gaub
53f9815f69
Merge pull request #5639 from jherico/maggie
...
Stereo rendering work
2015-08-22 20:48:54 -07:00
Brad Davis
d3135dcfa6
Stereo rendering work
2015-08-22 16:15:10 -07:00
Brad Hefta-Gaub
62d8b14b8b
Merge pull request #5635 from samcake/punk
...
Improve the light attenuation formulae
2015-08-22 15:49:59 -07:00
Brad Hefta-Gaub
fe44442ffe
Merge pull request #5577 from vastcharade/horizAmbOcclPerf
...
Horiz amb occl performance updates
2015-08-22 12:39:51 -07:00
Anthony J. Thibault
80d3ae68c2
Removed redundant ends with ‘fbx’ check.
2015-08-21 22:11:53 -07:00
Anthony J. Thibault
04e7084743
Resource fix for textures in FBX files.
...
The baseTexturePath url for textures in FBXGeometry
should default to the same base url as the fbx file itself.
This error was introduced in my recent refactoring.
Textures embedded in FBXGeometries should be un-affected
by this change.
2015-08-21 21:44:15 -07:00
Ryan Huffman
e9517ef929
Merge pull request #5594 from thoys/20638
...
CR for Job #20638 - Scripting: WebSocket Implementation
2015-08-21 19:13:43 -07:00
Thijs Wenker
d84cf1859c
hook up the WebSocket error event directly
2015-08-22 02:18:21 +02:00
Thijs Wenker
0e255f4f3e
properly exposed WebSocketClass::ReadyState to the ScriptEngine
2015-08-22 01:59:44 +02:00
Seth Alves
90483e7c97
Merge pull request #5632 from birarda/master
...
force the HTTPManager to listen on IPv4
2015-08-21 16:56:55 -07:00
Seth Alves
92c1d62b7b
Merge branch 'master' of github.com:birarda/hifi into polyvox
2015-08-21 16:55:39 -07:00
Anthony J. Thibault
5e31d423b9
Removed some debugging statements
2015-08-21 16:55:08 -07:00
Thijs Wenker
9edba451eb
- remove webSockets from List after disconnect.
...
- leave it up to the QtScript to delete the WebSocket / WebSocketServer objects
2015-08-22 01:33:22 +02:00
Sam Gateau
518cf3be15
Improve the light attenuation formulae
2015-08-21 16:28:38 -07:00
Anthony J. Thibault
b7009b4631
Fix for animation resources
...
The problem was that the invokeMethod between the AnimationReader thread
and the main thread was failing, because FBXGeometry* wasn't a registered meta type.
So, I ended up normalizing the AnimationReader class to be more like GeometryReader,
in that it uses singles and slots to communicate success and failure, rather then
invokeMethod.
2015-08-21 16:09:06 -07:00
Stephen Birarda
4b95d54955
remove the explicit failure test
2015-08-21 14:55:24 -07:00
Stephen Birarda
0fbbfb77d1
exit with a code to indicate error
2015-08-21 14:42:05 -07:00
Stephen Birarda
3e4a05a57b
leave the listen check but queue Application quit
2015-08-21 14:30:41 -07:00
Stephen Birarda
34b3fb1c0c
Revert "force the HTTPManager to listen on IPv4"
...
This reverts commit 220ad189a0
2015-08-21 14:27:17 -07:00
Howard Stearns
ad0df3a47c
Make sixense work in dev builds (if you put the library in the documented place).
2015-08-21 14:21:49 -07:00
Seth Alves
5474902b0b
Merge branch 'master' of github.com:birarda/hifi into polyvox
2015-08-21 14:20:30 -07:00
Stephen Birarda
220ad189a0
force the HTTPManager to listen on IPv4
2015-08-21 14:16:34 -07:00
Thijs Wenker
d89ecc1e42
Move WebSocketServer to be accessable from Assignment-Client:Agent only.
2015-08-21 22:43:49 +02:00
Seth Alves
fdad8fc651
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-21 13:19:19 -07:00
Seth Alves
9937416729
attempt to move some time-consuming polyvox stuff off of the main thread
2015-08-21 11:23:13 -07:00
Thijs Wenker
d3a6833133
delete WebSockets on ScriptEngine finish
2015-08-21 20:20:50 +02:00
Seth Alves
105470bf26
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-21 11:02:16 -07:00
Seth Alves
6db0442fda
allow for asynchronous building of collision shape
2015-08-21 10:48:26 -07:00
Thijs Wenker
c7346209fb
fix memory leak
2015-08-21 19:44:43 +02:00
Thijs Wenker
fd82f05307
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-21 19:29:38 +02:00
Thijs Wenker
e581a57320
WebSocket constructor could allow more then one parameter now, only the first one is used though.
2015-08-21 19:13:57 +02:00
Thijs Wenker
55fd847636
removed unused code, renamed UnitTest.ready() to UnitTest.done()
2015-08-21 19:07:33 +02:00
ZappoMan
270463fc4e
restore new oculus detect code from master
2015-08-21 09:29:25 -07:00
ZappoMan
75aff2f281
fix atmosphere rendering
2015-08-21 00:29:28 -07:00
Brad Davis
cc037c8828
Fix culling calculations in HMD with new stereo mechanism
2015-08-21 00:29:27 -07:00
ZappoMan
62e8ec3fdf
add fullscreen menu item and rename side by side stereo plugin
2015-08-21 00:29:26 -07:00
Brad Davis
7fb491e48c
Cleanup plugin interface, break up oculus plugins
2015-08-21 00:29:25 -07:00
Brad Davis
76f236adf6
New stereo rendering implementation
2015-08-21 00:29:24 -07:00
Brad Davis
f6f189c4b8
Merge pull request #5609 from murillodigital/master
...
Better handling of socket binding
2015-08-21 00:22:19 -07:00
Brad Davis
c3991dbb8c
Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor
...
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
2015-08-20 23:57:16 -07:00
Brad Davis
8c7711168c
Merge pull request #5603 from sethalves/linux-memory-debugger
...
memory debugging on linux
2015-08-20 19:19:24 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Stephen Birarda
e93b360908
expose options property to AI script interface
2015-08-20 12:12:43 -07:00
Thijs Wenker
7f5fc64f6c
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-20 21:09:22 +02:00
Seth Alves
f9fb65bb4b
Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox
2015-08-20 10:15:16 -07:00
Seth Alves
f61fe46f18
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-20 10:14:56 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Leonardo Murillo
129761c002
making qtimer interval a const
2015-08-20 08:10:19 -06:00
Leonardo Murillo
2c23dab2e7
More specific logging
2015-08-20 08:03:37 -06:00
Leonardo Murillo
f87f3eb033
Typo
2015-08-20 08:02:45 -06:00
Leonardo Murillo
2b26f302fd
Better handling of socket binding
2015-08-20 08:01:33 -06:00
Brad Davis
002aea3333
Add fullscreen menu item to 2D display plugin
2015-08-20 00:30:44 -07:00
ZappoMan
6a7f367e5f
fix throttled rendering for the 2D display plugin
2015-08-19 21:11:48 -07:00
Seth Alves
ef6116465d
make edged-cubic be the default polyvox surface style
2015-08-19 19:15:36 -07:00
Seth Alves
f563b2aeba
clean up debugging prints
2015-08-19 19:15:04 -07:00
Andrew Meadows
5a442bdb30
Merge pull request #5555 from ZappoMan/centerOrigin
...
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
2015-08-19 15:59:04 -07:00
Stephen Birarda
c8fbb64bbf
fix AvatarHashMap read due to COW
2015-08-19 14:36:16 -07:00
Stephen Birarda
6860f3d126
add readWithoutCopy for clarity in Packet read
2015-08-19 14:32:26 -07:00
Stephen Birarda
42a7262707
Merge pull request #5565 from murillodigital/node-version
...
DO NOT MERGE - Node versioning
2015-08-19 13:32:48 -07:00
ZappoMan
92ae3e758c
restore DEFAULT_FAR_CLIP to 16km
2015-08-19 12:28:07 -07:00
Seiji Emery
6b5fb60fcf
Merge remote-tracking branch 'highfidelity/master' into gputest
2015-08-19 11:24:15 -07:00
Thijs Wenker
fd7d186ffb
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-19 20:23:45 +02:00
ZappoMan
684ee3bdd0
Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin
2015-08-19 11:20:15 -07:00
Thijs Wenker
ecd368fac3
new style qt connectors
2015-08-19 20:00:06 +02:00
Seth Alves
537b690d60
Merge pull request #5566 from howard-stearns/recapitate
...
Get rid of separate head/body avatar
2015-08-19 10:46:05 -07:00
Thijs Wenker
07ae00f207
Close WebSocket properly after ScriptEngine finished running
2015-08-19 19:33:48 +02:00
Andrew Meadows
990dce6795
Merge pull request #5578 from sethalves/polyvox
...
Polyvox improvements
2015-08-19 10:31:13 -07:00
Howard Stearns
0a8c1846e9
This assert causes dev builds to fail when starting interface.
2015-08-19 10:24:31 -07:00
Brad Davis
aba7bebf6e
Revert "Updating to the new version of the sixense library"
2015-08-19 09:44:51 -07:00
Thijs Wenker
9af7205672
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-19 16:49:39 +02:00
Brad Davis
86e21c91ba
Case issues again
2015-08-18 18:56:00 -07:00
Brad Davis
eba446e7f6
Updating to the new version of the sixense library
2015-08-18 18:55:59 -07:00
Thijs Wenker
7f8506acc0
fix. switchup.
2015-08-19 00:54:00 +02:00
Thijs Wenker
1b6538cc59
fixes extra qualification errors Linux
2015-08-19 00:31:40 +02:00
Seth Alves
2dc2757eca
code review
2015-08-18 13:03:54 -07:00
Andrew Meadows
9ee49c3e1e
Merge pull request #5551 from sethalves/quiet-compiler
...
Quiet compiler
2015-08-18 09:54:29 -07:00
ZappoMan
5715042102
Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin
2015-08-17 21:53:45 -07:00
Thijs Wenker
e43dc3f9fe
Completed implementation of WebSocket and WebSocketServer
2015-08-18 03:21:48 +02:00
Brad Davis
5d65937120
Merge pull request #5583 from ZappoMan/clickToFocusWebEntity
...
make web entity focus click based
2015-08-17 16:57:39 -07:00
Philip Rosedale
01108bdf6b
Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors
...
Synchronize eye joint and debugging vectors
2015-08-17 16:56:01 -07:00
ZappoMan
ae9ccb79ed
cleanup debugging and dead code
2015-08-17 15:58:51 -07:00
ZappoMan
b7d9dc444b
more work on clicking focus
2015-08-17 13:06:32 -07:00
Seth Alves
1c8030472a
back out the more controversial changes
2015-08-17 12:40:56 -07:00
ZappoMan
014bf661fa
bump packet version
2015-08-17 11:18:25 -07:00
Seth Alves
1a71c3cc04
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-17 10:17:58 -07:00
Seth Alves
af11e97daa
fix broken optimisation for skipping internal voxels when making collision hull
2015-08-17 08:49:00 -07:00
Brad Davis
db4d98ccb5
Polyvox shader fix
2015-08-16 23:21:45 -07:00
Seth Alves
1ee773a532
don't include interrior voxels in cubic collision hull
2015-08-16 14:11:37 -07:00
Seth Alves
c60a8e7dfc
minecraft style voxel editing largely works
2015-08-16 12:52:55 -07:00
Seth Alves
a57278ba3c
ray-picks against cubic-voxels seem right, now
2015-08-16 11:51:04 -07:00
Seth Alves
4ffb5c9716
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-16 11:05:03 -07:00
Seth Alves
0230d9397c
attempt to find exact ray intersection with cubic polyvox -- not working right, yet.
2015-08-16 11:04:52 -07:00
Seth Alves
b129c2a933
in edged mode, make sure border voxels are zeroed out. expose some more voxel matrix math to javascript
2015-08-16 09:36:54 -07:00
Seth Alves
558f68c150
increase max polyvox dimension from 32 to 128. don't recompress compressed data unless something changed../../libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
2015-08-15 16:53:47 -07:00
Seth Alves
c6530c4cec
fix newly created polyvox collision-hull bug
2015-08-15 16:16:27 -07:00
Seth Alves
5ecdbaa19d
have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords
2015-08-15 15:18:25 -07:00
Christopher Root
21dc58eb85
Improving readability in shader
2015-08-15 14:40:34 -07:00
Christopher Root
8ea6048ec7
Removing commented out code
2015-08-15 14:31:03 -07:00
Christopher Root
81ea8e8874
Updating some comments and removing unnecessary code
2015-08-15 14:27:08 -07:00
Christopher Root
708190bfd6
horiz amb occl performance upgrades
2015-08-15 14:10:25 -07:00
Seth Alves
09a9deabdb
compute polyvox collision hull differently for marching-cube surfaces
2015-08-15 12:55:24 -07:00
Thijs Wenker
229b7ae128
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-15 21:51:16 +02:00
Seth Alves
79a7755cdb
add SURFACE_EDGED_MARCHING_CUBES polyvox surface extraction style
2015-08-15 12:18:36 -07:00
Seth Alves
27e5322cb4
compute polyvox collision hull differently for marching-cube surfaces
2015-08-15 11:25:27 -07:00
Brad Hefta-Gaub
34403c6242
Merge pull request #5564 from jherico/maggie
...
Fix warning messages about depth and stencil buffers for the QML surfaces
2015-08-15 11:15:04 -07:00
Brad Hefta-Gaub
821063f6d2
Merge pull request #5575 from SamGondelman/sam/input-plugins
...
Working on toybox script, squeezeHands, and default mappings
2015-08-15 10:59:04 -07:00
Anthony J. Thibault
cd58f012a3
Fix for ATI discrete graphics on 2015 macbook pro / mac pro.
...
Fixed incorrect size for camera transform uniforms passed via
glBindBufferRange. This is a legitimate bug on our side.
I guess Intel and nVidia drivers just happen to ignore this field.
This was likely causing many of the shader TransformCamera members
to be identity or un-initialized, specifically, the projection
matrix values.
This was resulting in a black screen on ATI gpus.
2015-08-15 09:42:05 -07:00
Brad Davis
82310bb499
Attempting to fix rendering issues on 2015 Macs
2015-08-14 23:57:10 -07:00
Eric Levin
ec25d7994c
bumped protocol number for new particle properties
2015-08-14 21:58:22 -07:00
Thijs Wenker
028c21b7ea
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-15 03:44:15 +02:00
Brad Hefta-Gaub
f76c663bb5
Merge pull request #5558 from AndrewMeadows/chromium
...
coalesce scattered unit-test helper functions
2015-08-14 18:12:03 -07:00
Howard Stearns
d28c555a79
Synchronize eye joint and debugging vectors when the other avatar is looking at me.
2015-08-14 16:47:34 -07:00
Brad Davis
208e41efd1
WebEntity keyboard input with mouse hover
2015-08-14 16:18:38 -07:00
ZappoMan
44fcf71f07
change domain to be 32k and still have origin centered at 0
2015-08-14 15:26:49 -07:00
Brad Hefta-Gaub
31a49a551a
Merge pull request #5556 from jherico/bart
...
QML framerate improvments
2015-08-14 11:11:14 -07:00
ZappoMan
bdc78e9666
some CR cleanup
2015-08-14 10:16:48 -07:00
ZappoMan
daeb90c1e0
fix clamp in AddEntityOperator
2015-08-14 09:35:39 -07:00
ZappoMan
5fdd7304aa
Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin
2015-08-14 09:33:53 -07:00
ericrius1
b8a6105a03
Merge branch 'master' into particleExtensions
2015-08-14 08:56:59 -07:00
ericrius1
e191a301d8
added a spread to defaults to create a default fountain effect
2015-08-13 16:08:38 -07:00
ericrius1
bb84e0e403
fixed defaults
2015-08-13 15:57:45 -07:00
Howard Stearns
0f6c0a3117
Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate
2015-08-13 15:56:13 -07:00
ericrius1
6fe8703492
added defaults to particle effect for velocity and acceleration
2015-08-13 15:50:00 -07:00
Leonardo Murillo
b345d75e4d
More cleanup and showing version in ds web gui
2015-08-13 16:44:28 -06:00
Leonardo Murillo
7c4813f1cf
Another versioning checkpoint + cleanup
2015-08-13 16:35:55 -06:00
Howard Stearns
2756a00638
Get default avatar url from resources.
2015-08-13 14:23:34 -07:00
Leonardo Murillo
cda5b29fd3
Another take at versioning details exchange - checkpoint
2015-08-13 14:19:13 -06:00
Howard Stearns
62941c0914
Remove dead code.
2015-08-13 12:39:30 -07:00
Thijs Wenker
aed0688d17
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-13 21:02:39 +02:00
ericrius1
5b2e966ca5
fixing accel issues
2015-08-13 10:55:21 -07:00
ericrius1
d38d29e0f5
fixed argument signatues and optimized particle position calculations
2015-08-13 10:35:32 -07:00
Howard Stearns
9308e9df4f
Merge pull request #5458 from ctrlaltdavid/20639
...
CR for 20639 - Add SMI Rift eye tracker support
2015-08-13 10:06:15 -07:00
Thijs Wenker
7c77e0e941
initial WebSocketServer
2015-08-13 18:21:50 +02:00
Thijs Wenker
1664792e00
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-13 14:28:20 +02:00
ericrius1
f3d6992dd2
remove outdated comment
2015-08-12 17:28:07 -07:00
Howard Stearns
daae750d68
No symbolic names for non-entity contants.
2015-08-12 16:40:00 -07:00
David Rowe
c0439f123b
Merge branch 'master' into 20639
2015-08-12 16:34:53 -07:00
ericrius1
81844a82e8
fixed spacing issues and removed dead line
2015-08-12 16:25:56 -07:00
Brad Davis
0fa3044231
QML framerate improvments
2015-08-12 16:24:34 -07:00
ericrius1
36ca0c54fc
acceleration spread working properly
2015-08-12 16:13:00 -07:00
Seth Alves
2dbbc5c184
Merge pull request #5553 from howard-stearns/remove-obsolete-avatar-mixer-data
...
Warning: protocol change - Remove obsolete AvatarMixer wire data
2015-08-12 16:01:42 -07:00
ericrius1
16279bd415
emitters trail particles now
2015-08-12 14:01:42 -07:00
Andrew Meadows
488f6aa7d8
fix bug in ElbowConstraint::apply()
2015-08-12 13:34:23 -07:00
Brad Hefta-Gaub
acf9933925
Merge pull request #5557 from jherico/marge
...
Fixing crash in vive controllers
2015-08-12 12:45:57 -07:00
Brad Davis
0ff283d09e
Fixing crash in vive controllers
2015-08-12 12:24:53 -07:00
ericrius1
528d662c58
getting acceleration spread hooked up
2015-08-12 09:50:01 -07:00
Thijs Wenker
a97524f954
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-12 15:26:53 +02:00
ZappoMan
85603dab29
bump entity packet version
2015-08-11 23:51:07 -07:00
ZappoMan
4fe8f49d4c
move origin to center of domain
2015-08-11 23:47:40 -07:00
