Commit graph

7555 commits

Author SHA1 Message Date
Andrew Meadows
59a70b5b5f remove cruft and fix default entity dimensions 2015-03-04 17:32:46 -08:00
Andrew Meadows
26bb677840 remove ViewFrustum::*VoxelScale() function calls
we do our math in meters now
2015-03-04 17:26:52 -08:00
Seth Alves
7df877ced7 Merge branch 'thermonuclear' of github.com:AndrewMeadows/hifi into avatars-can-collide 2015-03-04 16:56:59 -08:00
Andrew Meadows
c3a4e5d94b fix dark lighting and missing avatars on linux 2015-03-04 16:52:27 -08:00
ZappoMan
e99ffb8307 fix bug in export 2015-03-04 16:29:34 -08:00
Andrew Meadows
d7d25a6509 Octree::findCapsulePenetration() uses meters 2015-03-04 16:16:49 -08:00
Jason
3522357c8c High Fidelity interview project -- Jason Rickwald
For my project, I decided to add a new entity -- a Particle Effect.
This is really rudimentary to start out with, but you could see where
it's headed.
2015-03-04 16:06:06 -08:00
Andrew Meadows
ca1c9b4105 EntityItem::findEntities() uses meters 2015-03-04 16:05:29 -08:00
Seth Alves
a8b688d540 move _velocity into base class. walking on a cube works 2015-03-04 15:26:02 -08:00
Seth Alves
910c8da046 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-04 14:19:12 -08:00
Clément Brisset
da6db93508 Merge pull request #4375 from ctrlaltdavid/20370
More parentheses to address Xcode compiler warnings
2015-03-04 10:06:54 -08:00
Andrew Meadows
c88f236d1c get version from packet 2015-03-04 09:41:23 -08:00
Andrew Meadows
aede107058 change version of Entity update packet 2015-03-04 09:41:07 -08:00
Andrew Meadows
b9cbd1ea6e witch internal EntityItem data to use meters 2015-03-04 09:38:37 -08:00
David Rowe
4c959e8d82 More parentheses to address Xcode compiler warnings 2015-03-04 09:17:19 -08:00
Seth Alves
15609a80ec Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-04 08:48:54 -08:00
Seth Alves
b4998e9c53 falling onto an object works 2015-03-04 08:48:48 -08:00
Stephen Birarda
3005f74411 fix localhost port check to not kill user lookup 2015-03-03 23:11:02 -08:00
Virendra Singh
4366525da4 Removed unused variables 2015-03-04 08:51:44 +05:30
Virendra Singh
126d3cf237 Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-04 08:22:20 +05:30
Virendra Singh
1facbbb844 Removed MSVC specific for each blocks 2015-03-04 08:21:39 +05:30
Seth Alves
a254f017cc Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-03 18:37:40 -08:00
Seth Alves
8eec66c066 merge upstream, avatar can now fall onto a cube 2015-03-03 18:37:16 -08:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels
remove metavoxels
2015-03-03 15:50:53 -08:00
Brad Hefta-Gaub
9649ed9936 Merge pull request #4371 from huffman/light-radius
Update Light to set direction when setting orientation
2015-03-03 15:50:04 -08:00
Seth Alves
7e4b597ca3 keep physics specific code in PhysicsEngine 2015-03-03 15:45:10 -08:00
Seth Alves
5d4ef8d5b8 initial flailing 2015-03-03 14:30:26 -08:00
Virendra Singh
4627d2e7b5 Parallel axis theorem correction 2015-03-04 03:52:59 +05:30
Virendra Singh
1914661bbf Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-04 03:51:06 +05:30
Ryan Huffman
3fef8a1622 Update Light to set direction when setting orientation 2015-03-03 12:41:51 -08:00
Brad Hefta-Gaub
b118912708 Merge pull request #4361 from samcake/temp0
evolve the Transform stack away from the legacy GL to the brand new shader way
2015-03-03 11:43:01 -08:00
Virendra Singh
7a129235c2 Mass properties unit tests 2015-03-04 01:12:20 +05:30
Virendra Singh
cd71f4531d Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-04 01:10:52 +05:30
Brad Hefta-Gaub
29340b6586 Merge pull request #4369 from ctrlaltdavid/20370
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
2015-03-03 11:17:31 -08:00
Sam Gateau
cad2184927 FIxing the compilation issue for linux 2015-03-03 11:09:11 -08:00
Brad Hefta-Gaub
b88d52a310 Merge pull request #4363 from huffman/block-restricted-users
Add permission-checking to edit entities
2015-03-03 11:04:46 -08:00
Sam Gateau
598b791aee FIxing the compilation issue for linux 2015-03-03 11:01:47 -08:00
Sam Gateau
4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-03 10:56:04 -08:00
Stephen Birarda
eb8e8e9a62 Merge pull request #4356 from sethalves/domain-server-http-port-in-shmem
pass more localhost ports via shared memory
2015-03-03 10:05:24 -08:00
Philip Rosedale
c9f97b312e Merge pull request #4365 from sethalves/log-only-once
Log message type just once
2015-03-02 20:38:54 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Ryan Huffman
b370e025c9 Move EntityScriptingInterface instance to DependencyManager 2015-03-02 15:05:31 -08:00
Ryan Huffman
98e0f235cc Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users 2015-03-02 14:47:26 -08:00
Seth Alves
bb7b132b78 Add a way to indicate that a specific message of a certain form should only be printed once. Different messages that match the same form will each be printed once. 2015-03-02 14:18:26 -08:00
Brad Hefta-Gaub
6d8ccfbc2a Merge pull request #4357 from huffman/update-light-entity-properties
Update light entity properties
2015-03-02 13:51:48 -08:00
Virendra Singh
3d558dae64 MassProperties of a 3D mesh 2015-03-03 01:51:35 +05:30
Ryan Huffman
38a361dcf0 Remove class scope on _entityScriptingInterface property references 2015-03-02 11:32:07 -08:00
Ryan Huffman
75a943386b Remove nullptr comparison 2015-03-02 10:44:32 -08:00
Ryan Huffman
a443157dd7 Update ScriptEngine::entityScriptingInterface to be static pointer
Statically allocating the EntityScriptingInterface means we can't make
sure it is initialized AFTER NodeList has been initialized
2015-03-02 10:40:46 -08:00
Ryan Huffman
9a302eebed Add Entities.canAdjustLocksChanged 2015-03-02 10:40:29 -08:00
Ryan Huffman
64cb517856 Add LimitedNodeList::canAdjustLocksChanged signal 2015-03-02 10:40:11 -08:00
Ryan Huffman
1a3eb68e2d Update lightEntityItem old version handling to be more clear 2015-03-02 09:25:18 -08:00
Andrew Meadows
90b69b1ee0 replace some "InDomainUnits" calls with "InMeters" 2015-03-01 15:58:10 -08:00
Sam Gateau
7534a6b286 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0bis 2015-03-01 15:21:01 -08:00
Andrew Meadows
c2e78931c6 revert namechange: use compiler find all instances 2015-03-01 15:21:01 -08:00
Sam Gateau
cb737d64d3 Testing the gpu::Shader compilation and building steps, ready to be used for real 2015-03-01 15:20:32 -08:00
Andrew Meadows
e1954d3e1d spherical queries into Octree use meters 2015-03-01 15:19:26 -08:00
Sam Gateau
660d9237e6 First version of the Shader and the magical shader program 2015-02-28 13:07:16 -08:00
Brad Hefta-Gaub
a2d8f89426 Merge pull request #4358 from huffman/handle-sigint
Add SIGINT handling to assignment-client
2015-02-27 22:13:10 -08:00
Sam Gateau
5652852d1a Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-27 17:35:59 -08:00
Sam Gateau
5ab3cbb7ec Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated 2015-02-27 17:11:16 -08:00
ZappoMan
31c96523fb add support for transparency in RAW heightmaps 2015-02-27 15:57:46 -08:00
Ryan Huffman
11efcd70d8 Add SIGINT handling to assignment-client 2015-02-27 14:09:46 -08:00
Ryan Huffman
84691f922c Remove old light color properties 2015-02-27 14:04:56 -08:00
Ryan Huffman
61bc32493f Fix entity version name in LightEntityItem 2015-02-27 13:49:17 -08:00
Ryan Huffman
a7f84bcd30 Update entity server version number 2015-02-27 13:46:04 -08:00
Ryan Huffman
093e5db90d Update entity light properties to use new model
Rename constantAttenuation -> intensity
Rename diffuseColor -> color
Remove remaining attenuation and colors
2015-02-27 13:42:56 -08:00
Sam Gateau
ea88cbd75f Merge with upstream master 2015-02-27 13:19:50 -08:00
Ryan Huffman
5c9473cd24 Merge branch 'master' of github.com:highfidelity/hifi into update-light-entity-properties
Conflicts:
	libraries/entities-renderer/src/RenderableLightEntityItem.cpp
2015-02-27 12:20:10 -08:00
Ryan Huffman
fdc1146339 Update RenderableLightEntityItem to use update light entity 2015-02-27 12:14:50 -08:00
Seth Alves
ce3c8f87d9 Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-27 11:08:29 -08:00
Brad Hefta-Gaub
08dc883b0e Merge pull request #4351 from huffman/update-light-properties
Update light properties (primarily for editEntities.js)
2015-02-27 10:54:19 -08:00
Philip Rosedale
35205fbbf3 Merge pull request #4347 from samcake/temp1
Introducing the SunSkyStage
2015-02-27 10:37:02 -08:00
Seth Alves
fb4f2fe89c Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-27 10:19:06 -08:00
Philip Rosedale
df553ac65e Merge pull request #4335 from sethalves/assignment-client-keep-a-spare-x
Assignment client keep a spare
2015-02-27 07:39:06 -08:00
Sam Gateau
c7eeebe52c and fixing a bug with shadowing of lightmapped surface 2015-02-26 18:07:43 -08:00
Andrew Meadows
7836bb4dcd rayIntersection uses meters instead of tree units 2015-02-26 17:42:17 -08:00
Seth Alves
b8322556a6 address code-review comments 2015-02-26 17:34:24 -08:00
Sam Gateau
f6a9bd1870 REfining the naming and introducing an orientation offset 2015-02-26 17:26:41 -08:00
Sam Gateau
e3b3c8e1ef Setting the defalt at a better time of the day 2015-02-26 16:09:21 -08:00
Andrew Meadows
64c28fe925 remove EntityItem::getSize() 2015-02-26 15:36:59 -08:00
Andrew Meadows
7210c7a88b added EntityTree::findEntitiesInMeters()
progress toward conversion to meters
2015-02-26 15:16:59 -08:00
Ryan Huffman
d60618a582 Remove unused variables from RenderableLightEntityItem::render 2015-02-26 14:58:06 -08:00
Ryan Huffman
dc2b670fa8 Remove extraneous comments 2015-02-26 14:46:05 -08:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
Andrew Meadows
93c77d557a EntityTree::findClosestEntity() now takes meters 2015-02-26 14:14:17 -08:00
David Rowe
21f12c1d6c Use cache ID when rendering talk bubble sphere 2015-02-26 13:50:43 -08:00
Andrew Meadows
9ad88c3793 Referentials do math using meters 2015-02-26 13:42:08 -08:00
Sam Gateau
e77d4572fa Merge branch 'temp1' of https://github.com/samcake/hifi into temp1 2015-02-26 12:03:39 -08:00
dev
b04dbf7a34 fixing compilation issue on macos 2015-02-26 11:27:40 -08:00
Ryan Huffman
e42b708b56 Update deferredLightingEffect::add*Light methods 2015-02-26 11:03:47 -08:00
Sam Gateau
38762e882e Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-26 10:53:26 -08:00
Sam Gateau
fcb293d0b2 CLean up before pr 2015-02-26 10:45:00 -08:00
Virendra Singh
19912930dd Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 2015-02-26 22:57:27 +05:30
Seth Alves
9f83eabaad Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x 2015-02-26 09:21:53 -08:00
Philip Rosedale
c2e559342a Merge pull request #4341 from AndrewMeadows/bispinor
load non-moving dynamic objects as "inactive" in physics engine
2015-02-26 09:21:49 -08:00
Seth Alves
f157c5c60d Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-26 09:13:49 -08:00
Virendra Singh
b3fdb19cad Merge branch 'master' of https://github.com/highfidelity/hifi into 20305
Conflicts:
	BUILD.md
	BUILD_WIN.md
2015-02-26 22:16:35 +05:30
Sam Gateau
a757229c0e Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-25 19:18:01 -08:00
Sam Gateau
4959e2924e add an example script to control the sun light 2015-02-25 19:17:38 -08:00
Sam Gateau
6b29e314c2 Adding the Stage of the Scene and exposing control of the sun light from javascript 2015-02-25 19:05:27 -08:00
Andrew Meadows
7b68916010 Merge pull request #4343 from ZappoMan/hangOnExit
BUG FIX: Hang on exit
2015-02-25 17:02:26 -08:00
ZappoMan
05d7d47045 some cleanup 2015-02-25 16:32:48 -08:00
Andrew Meadows
8d4ea143ce easy conversions of: InDomainUnits --> InMeters 2015-02-25 14:48:06 -08:00
ZappoMan
5eecb6a837 correctly delete glbuffers 2015-02-25 14:44:10 -08:00
Andrew Meadows
2f749e3c51 merge upstream/master into andrew/isentropic
Conflicts:
	libraries/entities/src/TextEntityItem.h
2015-02-25 14:40:32 -08:00
Andrew Meadows
2ffb19a0ed getPosition() --> getPositionInDomainUnits()
and friends
2015-02-25 14:35:04 -08:00
Seth Alves
128a38100f Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x 2015-02-25 14:13:55 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies
NOT MERGEABLE - add some externals as cmake external projects
2015-02-25 13:22:49 -08:00
Brad Hefta-Gaub
e7b36166ec Merge pull request #4340 from huffman/fix-repeat-captured-keys
Make KeyEvent objects equal even if they have differing isAutoRepeat val...
2015-02-25 12:24:19 -08:00
Brad Hefta-Gaub
6d237f3f79 Merge pull request #4339 from huffman/fix-plane-pick
Fix plane pick
2015-02-25 12:23:45 -08:00
Seth Alves
af341f0ee5 if hifi uri is localhost, extract domain-server port from shared memory 2015-02-25 12:11:32 -08:00
Andrew Meadows
d85be49694 merge upstream/master into andrew/bispinor 2015-02-25 12:08:02 -08:00
Andrew Meadows
5776df1012 load dynamic obj as inactive when not moving 2015-02-25 12:07:19 -08:00
Seth Alves
1a4808857e put local domain server's http port into shared memeory 2015-02-25 11:30:54 -08:00
Ryan Huffman
660d9ad499 Make KeyEvent objects equal even if they have differing isAutoRepeat values 2015-02-25 10:28:45 -08:00
Ryan Huffman
14ec9b431e Update findRayRectangleIntersection to set out variable distance 2015-02-25 10:26:44 -08:00
Seth Alves
a6c79203bd Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x 2015-02-25 08:47:58 -08:00
Clément Brisset
b1e46c1bc8 Merge pull request #4337 from ZappoMan/crashonexit
Fixes to various Crashes on shutdown
2015-02-25 08:47:36 -08:00
ZappoMan
e87df0017a code review feedback 2015-02-25 08:26:54 -08:00
Brad Hefta-Gaub
97e2e65cb3 Merge pull request #4336 from AndrewMeadows/bispinor
lower threshold for ignoring rotation updates
2015-02-24 20:13:22 -08:00
Brad Hefta-Gaub
0f4e098a61 Merge pull request #4334 from huffman/edit-ray-improvement
Fix BillboardOverlay::findRayIntersection
2015-02-24 20:13:05 -08:00
Brad Hefta-Gaub
8b47de3150 Merge pull request #4329 from Seefo/master
Cleaned up warnings on Windows
2015-02-24 20:08:56 -08:00
ZappoMan
f1017f8a5d simplify waitTillDoneRunning 2015-02-24 17:45:22 -08:00
ZappoMan
310654831c clean up comments remove dead code 2015-02-24 17:34:19 -08:00
Andrew Meadows
0456cb298f lower threshold for ignoring rotation updates
one hundred fold smaller
2015-02-24 17:16:00 -08:00
ZappoMan
eab09eaf28 removed extra debugging 2015-02-24 17:15:58 -08:00
Seth Alves
89ebb45c03 Revert "Merge pull request #4332 from birarda/master"
This reverts commit 3230857b0d, reversing
changes made to 1b669af79d.
2015-02-24 17:09:05 -08:00
ZappoMan
25ae001d3b removed extra debugging 2015-02-24 17:05:44 -08:00
Ryan Huffman
03b10b6cb0 Add findRayRectangleIntersection 2015-02-24 17:00:30 -08:00
ZappoMan
9dcea38b2b tweak some debugging 2015-02-24 16:23:39 -08:00
ZappoMan
8757600a5e ifdef around massive debug output 2015-02-24 15:57:13 -08:00
ZappoMan
ca432a415f Merge branch 'master' of https://github.com/highfidelity/hifi into crashonexit 2015-02-24 15:33:41 -08:00
ZappoMan
fd93b99f03 more hacking on script shutdown behavior 2015-02-24 14:02:46 -08:00
Stephen Birarda
09ffcbb2e8 Revert "Merge pull request #4324 from sethalves/assignment-client-keep-a-spare"
This reverts commit 087e2babde, reversing
changes made to 5202d2136a.
2015-02-24 12:30:40 -08:00
Andrew Meadows
1b669af79d Merge pull request #4307 from Atlante45/fix_warnings
Fix warnings
2015-02-24 12:19:32 -08:00
Andrew Meadows
efcac708b6 Merge pull request #4331 from PhilipRosedale/master
Toyball is a textured baseball, added ability to get controller angular velocity
2015-02-24 12:19:20 -08:00
Stephen Birarda
087e2babde Merge pull request #4324 from sethalves/assignment-client-keep-a-spare
Assignment client keep a spare
2015-02-24 11:40:43 -08:00
Philip Rosedale
d74856e01b add angularVelocity to controller 2015-02-24 11:21:04 -08:00
Seth Alves
5f9af610c2 coding convention 2015-02-24 10:41:58 -08:00
Seefo
ab590440be Cleaned up warnings on Windows 2015-02-23 22:15:24 -05:00
ZappoMan
6be8f4c0ec more work on improving shutdown behavior 2015-02-23 17:32:31 -08:00
Sam Gateau
65a3e3618a Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 17:06:46 -08:00
Sam Gateau
04a39275ef Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 16:47:43 -08:00
Andrew Meadows
3cd0a70641 store shapeType whenever it is explicitly changed 2015-02-23 14:35:44 -08:00
Sam Gateau
687c76a6f8 trying to ge the shadow to render correctly 2015-02-23 13:12:29 -08:00
Andrew Meadows
456acd8833 merge upstream/master into andrew/bispinor 2015-02-23 11:41:40 -08:00
ZappoMan
7e2d355b56 first cut at properly shutting down timers while shutting down scripts 2015-02-23 11:40:30 -08:00
Andrew Meadows
2e1c122915 moved ShapeType boilerplate stuff macos 2015-02-23 11:38:56 -08:00
Seth Alves
0b9b7f06cc address various comments from code review 2015-02-23 11:12:19 -08:00