Andrew Meadows
e418872f7b
namechanges: setFooInMeters() --> setFoo()
...
also fixed some warnings, made code abide to standard,
and moved some variables to be closer to where they're used
2015-03-09 09:56:15 -07:00
Andrew Meadows
51d05cc43e
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-03-09 08:51:49 -07:00
Jason
0fd9540bc3
Sync to upstream
...
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
2015-03-07 21:40:06 -08:00
Jason
cfcc4679e1
Interview project updates (2).
...
Oops, I forgot to convert tabs-to-spaces on EntityTreeRenderer.
Committing it now.
2015-03-06 15:57:38 -08:00
Jason
7a5669f14e
Interview project updates.
...
Tried to address all of Brad's notes, most of which were related to
matching the coding style for the project. Also used GeometryCache
instead of making direct calls to OpenGL to do drawing, took a different
approach to seeding rand(), updated the packet version, and fixed a bug
that I noticed in the setting of the dimensions for the particle effect
entity.
2015-03-06 15:52:21 -08:00
Andrew Meadows
373be95297
entity cubes are in meters
2015-03-06 15:32:03 -08:00
Andrew Meadows
e4c68bf31c
committing some temp debug stuff to help git diff
...
(will remove this stuff later)
2015-03-05 18:06:08 -08:00
Andrew Meadows
49eee89c19
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-03-05 08:22:02 -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
b9cbd1ea6e
witch internal EntityItem data to use meters
2015-03-04 09:38:37 -08:00
Sam Gateau
4619ba1f5b
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-03-03 10:56:04 -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
Andrew Meadows
7836bb4dcd
rayIntersection uses meters instead of tree units
2015-02-26 17:42:17 -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
Sam Gateau
d8ebb0c5b9
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-02-26 14:19:23 -08:00
Ryan Huffman
e42b708b56
Update deferredLightingEffect::add*Light methods
2015-02-26 11:03:47 -08:00
Andrew Meadows
8d4ea143ce
easy conversions of: InDomainUnits --> InMeters
2015-02-25 14:48:06 -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
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
ZappoMan
e87df0017a
code review feedback
2015-02-25 08:26:54 -08:00
ZappoMan
310654831c
clean up comments remove dead code
2015-02-24 17:34:19 -08:00
ZappoMan
fd93b99f03
more hacking on script shutdown behavior
2015-02-24 14:02:46 -08:00
ZappoMan
6be8f4c0ec
more work on improving shutdown behavior
2015-02-23 17:32:31 -08:00
ZappoMan
a8d48e592f
removing debug messages
2015-02-23 09:44:18 -08:00
ZappoMan
e5ef61e27e
simplifying the change
2015-02-23 09:23:15 -08:00
ZappoMan
d32fc645e8
remove some dead code, added a debugging notes comment
2015-02-23 09:10:15 -08:00
Sam Gateau
ffaea07130
trying to ge the shadow to render correctly
2015-02-23 07:04:14 -08:00
ZappoMan
e3de994c4a
more hacking
2015-02-20 18:42:02 -08:00
ZappoMan
0b607fa390
first cut at shutting down scripts ahead of other cleanup
2015-02-20 15:28:25 -08:00
Stephen Birarda
b2e587dbbd
remove use of include_dependency_includes and use cmake
2015-02-18 14:12:05 -08:00
Stephen Birarda
e99012efbb
updates to build guides to remove soxr
2015-02-17 10:33:12 -08:00
Stephen Birarda
8c998a65ee
use the glm find_package and check externals
2015-02-13 12:50:32 -08:00
Stephen Birarda
0e32ed280a
put back glm dependency via external proj in entities-renderer
2015-02-13 10:36:23 -08:00
Stephen Birarda
0e790daa5b
remove glm dependency from entities-renderer
2015-02-13 10:26:23 -08:00
ZappoMan
7a45b1bc96
fix the quad color being broken after rendering text
2015-02-11 15:50:04 -08:00
Brad Hefta-Gaub
390d2be48f
Merge pull request #4189 from birarda/android
...
add the gvr-interface target for GearVR
2015-02-06 14:07:28 -08:00
Stephen Birarda
c96085eb91
repairs to warnings shown in Xcode
2015-02-06 10:12:04 -08:00
Stephen Birarda
219e78425b
resolve conflicts on merge with upstream master
2015-02-06 09:49:46 -08:00
Brad Davis
da05c26aad
Moving shaders to standard format, adding bounding box support and using it in text node
2015-02-04 21:32:05 -08:00
Brad Davis
1745ba9a7e
More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage
2015-02-04 12:42:27 -08:00
Brad Davis
53b0fd409d
Tweaking text scaling value to more closely match old text renderer
2015-02-03 22:30:39 -08:00
Brad Davis
1af2b65714
Fixing scaling to lineHeight
2015-02-03 22:21:32 -08:00
Brad Davis
77ce737f61
Working on porting renderable text item to new code
2015-02-03 22:11:24 -08:00
Brad Davis
0c78af9abb
Working on text rendering refactor
2015-02-03 18:57:39 -08:00
Stephen Birarda
bd0552618f
resolve conflicts on merge with upstream/master
2015-02-02 17:10:13 -08:00
