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

11822 commits

Author SHA1 Message Date
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
ZappoMan
0990229c64 cache calculation of aabox and aacubes 2015-08-11 18:05:22 -07:00
Howard Stearns
a5d8125aa7 Remove obsolete AvatarMixer wire data. (Was duplicated in joint states that are also sent.) 2015-08-11 17:53:49 -07:00
ericrius1
2db053e56a adding acceleration spread property 2015-08-11 17:09:48 -07:00
ericrius1
0031c2a39a changed localGravity prop to acceleration, which can be along any arbitrary direction 2015-08-11 16:05:18 -07:00
ericrius1
c2915fc0f5 changing to velocity spread 2015-08-11 15:16:36 -07:00
David Rowe
c060af0de5 Merge branch 'master' into 20639 2015-08-11 14:55:17 -07:00
ericrius1
ddaba19a4e chaning to velocity from direction 2015-08-11 14:43:05 -07:00
ericrius1
9fe3444d56 Merge branch 'particleExtensions' of https://github.com/ericrius1/hifi into particleExtensions 2015-08-11 14:08:53 -07:00
Brad Davis
3595f6a8a0 Fixing bad success macro for the Oculus SDK on windows 2015-08-11 14:06:35 -07:00
David Rowe
e6473fc8b9 Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
 2015-08-11 12:34:28 -07:00
Brad Davis
f539e95e53 Fixing includes 2015-08-11 12:02:40 -07:00
Bradley Austin Davis
e94cff594d Working on breaking up transfers and draws 2015-08-11 12:02:39 -07:00
Brad Hefta-Gaub
b726769f15 Merge pull request #5402 from highfidelity/plugins 
New plugins architecture
 2015-08-11 11:11:27 -07:00
Seth Alves
fedbfe8881 fix jumbled merge 2015-08-11 11:00:04 -07:00
Seth Alves
804c1ecf8e quiet compiler 2015-08-11 10:46:53 -07:00
David Rowe
84feaeb703 Merge branch 'master' into 20639 2015-08-11 10:33:17 -07:00
Seth Alves
b0190f00fb merge 2015-08-11 10:27:43 -07:00
Seth Alves
b25f6df7af quiet compiler 2015-08-11 10:22:56 -07:00
Seth Alves
dab5848330 quiet compiler 2015-08-11 10:21:30 -07:00
Seth Alves
d6322903a2 quiet compiler 2015-08-11 10:12:46 -07:00
Howard Stearns
295d655eec Merge pull request #5545 from AndrewMeadows/chlorine 
rotation constraints in preparation for inverse kinematics
 2015-08-11 09:19:16 -07:00
Andrew Meadows
8e82e48f76 remove more std::max/min favor of glm utilities 2015-08-11 08:17:54 -07:00
Andrew Meadows
a38c1c82d1 use glm::clamp() instead if std::max() and min() 2015-08-10 23:08:36 -07:00
Andrew Meadows
4655bd21dd added some comments to clarify algorithm 2015-08-10 23:08:10 -07:00
Brad Davis
19d31938d3 Merge remote-tracking branch 'upstream/master' into plugins 2015-08-10 21:25:35 -07:00
David Rowe
80e296edd0 Merge branch 'master' into 20639 2015-08-10 19:25:12 -07:00
ericrius1
7ed408bf97 fixed merge conflics 2015-08-10 15:50:51 -07:00
ericrius1
d341dc337d added direction spread property to particle entity to enable users to create more varied effects (such as falling snow 2015-08-10 15:48:28 -07:00
Seth Alves
7403929323 missed this in the last commit -- bump protocol version 2015-08-10 15:15:54 -07:00
Andrew Meadows
80b36f9f12 fix typo 2015-08-10 15:11:00 -07:00
Seth Alves
b26d6d2b9c Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization 
Renderable model entity item optimizations
 2015-08-10 15:10:12 -07:00
ericrius1
d568e20e14 spread going accross wire 2015-08-10 15:06:08 -07:00
ericrius1
23dcc647c4 adding more for direction spread 2015-08-10 15:00:21 -07:00
Seth Alves
74287c3cf5 Merge pull request #5482 from ericrius1/polyLineInProgress 
Added PolyLine Entity and painting scripts to demonstrate its functionality (WARNING: protocol change) Test this please
 2015-08-10 14:57:52 -07:00
Andrew Meadows
43bf4a85d2 add RotationConstraint and friends 2015-08-10 14:48:22 -07:00
Andrew Meadows
f9a4b82edd add swing-twist decomposition util with unit-tests 2015-08-10 14:47:15 -07:00
ericrius1
59d5f61af4 incremented protocol number 2015-08-10 14:20:46 -07:00
ericrius1
460eaa515b adding direction spread 2015-08-10 14:19:25 -07:00
ericrius1
8e7398ac7d small comment change 2015-08-10 13:41:30 -07:00
David Rowe
8e93ee654e Merge branch 'master' into 20639 2015-08-10 13:25:24 -07:00
Howard Stearns
88505c180d Merge branch 'master' of https://github.com/highfidelity/hifi into restore-eye-joint-rotations 2015-08-10 12:34:59 -07:00
Howard Stearns
964d04d24f Restore correct space for eye joint rotations. 
Also, do not correct for camera position on my avatar. (That will be done by zero or one receivers.)
 2015-08-10 12:34:01 -07:00
ericrius1
c9ad8e6e10 fixed comment formatting. 2015-08-10 12:10:27 -07:00
ericrius1
0f7c21ddd7 rearranged entity props and added check in setNormals to avoid uninitialized binormal values 2015-08-10 11:55:47 -07:00
Brad Davis
59dc6c9cca Merge remote-tracking branch 'upstream/master' into plugins 2015-08-10 11:47:54 -07:00
Andrew Meadows
5acd1e7d58 Merge pull request #5467 from sethalves/polyvox 
Polyvox improvements (Warning: protocol change)
 2015-08-10 11:12:10 -07:00
ericrius1
c299d77c92 fixed implicit double to float casting and incorrect header author attribution 2015-08-10 10:57:53 -07:00
ZappoMan
ae958dd42d Merge branch 'master' of https://github.com/highfidelity/hifi into RenderableModelEntityItemOptimization 2015-08-10 09:59:45 -07:00
Thijs Wenker
6ee6785977 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-10 11:15:17 +02:00
ZappoMan
668778cfd9 optimize JointState::setRotationInConstrainedFrameInternal() to short cut cases where targetRotation matches previous targetRotation 2015-08-09 16:55:43 -07:00
ZappoMan
942958c4f1 only setJointState() if animation frame actually changed 2015-08-09 16:07:56 -07:00
Bradley Austin Davis
bfd0362bd8 Fixing mac build 2015-08-08 18:00:08 -07:00
Brad Davis
5515b9d8ee Decouple Application and plugin definitions, cleanup container usage 2015-08-08 17:51:16 -07:00
Brad Davis
ba498e8f33 Fixing plugin construction after removing OVR dependency from interface 2015-08-08 14:02:26 -07:00
Brad Davis
ccc4a59992 Cleanup and PR comments 2015-08-08 13:54:37 -07:00
Brad Davis
caf93d1aff Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.h
 2015-08-08 13:18:13 -07:00
David Rowe
051a398fa2 Merge branch 'master' into 20639 2015-08-07 18:26:56 -07:00
Andrew Meadows
331c8c0967 Merge pull request #5503 from AlexanderOtavka/panel-attachable-improvements 
Improvements to FloatingUIPanels.
 2015-08-07 17:21:51 -07:00
SamGondelman
23fea1f221 working on toybox script, squeezeHands, and default mappings 2015-08-07 16:59:50 -07:00
ericrius1
4fbd6f6337 removed old PacketHeaders.h file, updated udt version 2015-08-07 16:42:10 -07:00
ericrius1
6a4e2728ee deleted old packet headers file 2015-08-07 16:29:57 -07:00
ericrius1
19e645fc65 fixed the way colors are handled to work with new core profile changes 2015-08-07 16:26:52 -07:00
ericrius1
205a2d53b6 no longer returning early on NaN 2015-08-07 16:15:51 -07:00
Andrew Meadows
48c5a227a7 Merge pull request #5528 from ZappoMan/removeBrokenShadows 
remove shadow menu items
 2015-08-07 16:09:00 -07:00
Bradley Austin Davis
cd6667303e Merge remote-tracking branch 'upstream/master' into plugins 2015-08-07 15:32:33 -07:00
Brad Davis
64fcd2da96 Merge pull request #5530 from ZappoMan/RenderableModelEntityItemOptimization 
optimizations to RenderableModelEntityItem::render()
 2015-08-07 15:32:07 -07:00
Bradley Austin Davis
fb2c84484e Merge remote-tracking branch 'upstream/master' into plugins 2015-08-07 15:26:43 -07:00
Seth Alves
732f9ceca5 pass voxel dimensions from PolyVoxEntityItem to pixel-shader so that the textures line up with the edges 2015-08-07 14:21:20 -07:00
Seth Alves
0a5ed0eb9b Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-07 13:50:22 -07:00
Seth Alves
b1e69537f3 Merge pull request #5524 from howard-stearns/cleanup-jointstate 
Clean Up JointState
 2015-08-07 13:50:02 -07:00
ZappoMan
cec0f8ed1d optimize ModelEntityItem::getAnimationFrame() 2015-08-07 13:43:57 -07:00
Seth Alves
f9685efa4b set payload bounds for polyvoxs 2015-08-07 13:43:34 -07:00
Seth Alves
fcb30dbbe7 hook textures up to polyvoxs 2015-08-07 13:33:00 -07:00
ZappoMan
f4c3c30f6a quick optimization to RenderableModelEntityItem::render() 2015-08-07 12:49:48 -07:00
Thijs Wenker
d10ae4a68d Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-07 21:43:32 +02:00
Thijs Wenker
25266b986c added basic implementation of WebSocket class ( https://developer.mozilla.org/en-US/docs/Web/API/WebSocket ) using QWebSocket 2015-08-07 21:43:14 +02:00
David Rowe
b70c1a4960 Merge branch 'master' into 20639 2015-08-07 12:33:13 -07:00
Howard Stearns
145b730f80 Clean up instantiation. 2015-08-07 12:27:26 -07:00
ericrius1
d735c85806 moving polyLineEntity over to core profile 2015-08-07 11:41:55 -07:00
ZappoMan
87f609b9af remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows 2015-08-07 11:26:07 -07:00
Sam Gateau
fdb370e798 cleaning th ecode 2015-08-07 10:59:56 -07:00
Sam Gateau
dcedcc2fa6 cleaning th ecode 2015-08-07 10:59:55 -07:00
Sam Gateau
30900cb802 SImple fix to the case of multiple material in a mesh with different opacity 2015-08-07 10:59:55 -07:00
Howard Stearns
5aa85a5b03 Don't let individual startAnimation get messed up by blend/fade. 2015-08-07 10:59:54 -07:00
bwent
d4e22ba78e clean up formatting, make connectionUUID const in NodeList 2015-08-07 10:59:53 -07:00
bwent
1f2bd62f54 clean-up formatting 2015-08-07 10:59:52 -07:00
samcake
6864c7bcb4 Ready for release 2015-08-07 10:59:51 -07:00
Sam Gateau
0e3e0d05f1 Introducing the Normal fitting algorithm for better normal in the deferred buffer 2015-08-07 10:59:51 -07:00
bwent
d9c98ca4cd Add connection token to sign with username when connecting to domain-server 2015-08-07 10:59:50 -07:00
bwent
6368fc2ae6 Parital fix for padding error using RSA_sign and RSA_verify 2015-08-07 10:59:49 -07:00
bwent
cb57b6ccab fix username signature not const 2015-08-07 10:59:49 -07:00
bwent
ba225875cf debugging 2015-08-07 10:59:48 -07:00
bwent
64cac1db5e To debug RSA padding error 2015-08-07 10:59:47 -07:00
bwent
f14fcdee60 Fix DomainServerConnectionTOken packet writing/resetting 2015-08-07 10:59:46 -07:00
bwent
ff558a8b56 Generate session token UUIDs to be signed with username 2015-08-07 10:59:46 -07:00
ericrius1
3910cb0d69 Merge branch 'master' into polyLineInProgress 2015-08-07 10:12:02 -07:00
Stephen Birarda
eec382ade8 Merge pull request #5513 from bwent/domain-server-authentication 
Add connection token UUId to sign with username when connecting to domain-server
 2015-08-07 10:05:00 -07:00
Seth Alves
44ee13a185 Merge branch 'cleanup-jointstate' of github.com:howard-stearns/hifi into polyvox 2015-08-07 09:24:40 -07:00
Seth Alves
3953bb5b01 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-07 09:08:01 -07:00
Seth Alves
19aec4a3e7 update polyvox shader 2015-08-07 09:07:54 -07:00