ericrius1
8e7dfc07c0
Added logic to blacklist entities from raypicking
2015-12-24 11:59:47 -08:00
ericrius1
390dce4613
Adding blacklist
2015-12-24 11:48:40 -08:00
Seth Alves
175506bbf1
when a script sets joint-data on a model-entity, send an edit packet
2015-12-23 16:06:04 -08:00
Seth Alves
83f60d6e97
make entity properties for model-entity joint-states
2015-12-23 15:43:50 -08:00
Seth Alves
d878dde952
whitespace
2015-12-22 17:57:25 -08:00
Seth Alves
84bcfb7d71
hook up a way for scripts to set model-entity joint state
2015-12-22 17:43:01 -08:00
ericrius1
fdb909ca31
merged
2015-12-22 09:40:42 -08:00
Seth Alves
c84fa5f821
cleanups
2015-12-21 14:45:18 -08:00
Seth Alves
76df582a6c
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-21 14:29:32 -08:00
ericrius1
1cdee11784
Merge branch 'master' into polylineOptimizations
2015-12-21 12:49:00 -08:00
samcake
aef748b894
Adding linear color in Particule system
2015-12-21 10:40:29 -08:00
Seth Alves
701f99d28e
only send a queryAACube for entities to entity-server
2015-12-18 16:28:11 -08:00
Seth Alves
9b49d9d66b
default parentJointIndex to -1
2015-12-18 15:10:51 -08:00
Seth Alves
13ad6bf2f7
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-18 14:52:02 -08:00
Andrew Meadows
aa3d1c6e4c
Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix
...
ModelEntityItem: Fix for incorrect animations with preTranslations
2015-12-18 14:16:35 -08:00
Seth Alves
81d3571171
fix getMaximumAACube and getMinimumAACube success return values
2015-12-18 12:04:47 -08:00
Seth Alves
688448fe41
more queryAABox experimenting
2015-12-17 16:18:41 -08:00
Seth Alves
473212e5b7
try to be more coherent about queryAABox meaning
2015-12-17 14:29:41 -08:00
ericrius1
92f96cbb2f
Removed un-needed libraries from particle effect entity
2015-12-17 12:49:30 -08:00
ericrius1
5b52b5e5e7
Merge branch 'master' into polylineOptimizations
2015-12-17 11:41:34 -08:00
ericrius1
2aaefbcfcb
refactoring, adding headers
2015-12-17 11:32:48 -08:00
Seth Alves
eb173815f5
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-17 11:08:05 -08:00
Seth Alves
16b26bbbfd
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-17 10:16:19 -08:00
Anthony J. Thibault
2eecb61da5
Prefer erase over repeated pop_front calls
2015-12-16 19:08:31 -08:00
Seth Alves
b83579e6e5
include queryAABox in physics-induced sends
2015-12-16 17:25:49 -08:00
Anthony J. Thibault
3b1ba67a88
ModelEntityItem: Fix for incorrect animations with preTranslations
...
ModelEntities that were playing animations on models with local pivot offsets were not working correctly.
Specifically, the windmill animation in the demo domain.
We now compose a matrix containing all of the FBX's preTranslation, preRotation and postTranformations.
2015-12-16 17:08:22 -08:00
Anthony J. Thibault
1b08563079
ParticleEffectEntityItem: fix for invalid iterator increment
...
Was causing an assert in debug, due to calling ++ on an invalid iterator.
In release this might lead to memory corruption.
2015-12-16 16:56:49 -08:00
Seth Alves
9e5116bf4f
Merge branch 'dejitter-hold-action' of github.com:sethalves/hifi into near-grab-via-parenting
2015-12-16 15:56:31 -08:00
Seth Alves
d3c57821c0
call a method on actions before each physics simulation step. use this to attempt to dejitter held objects
2015-12-16 14:00:04 -08:00
Seth Alves
10b82945a6
formatting
2015-12-16 10:16:01 -08:00
Seth Alves
45d19167c9
fix a couple of missing-parent bugs
2015-12-16 10:09:46 -08:00
ericrius1
61bad36d5c
tweaks
2015-12-15 18:49:04 -08:00
Seth Alves
0003c607ea
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-15 18:46:21 -08:00
ericrius1
d9c93130e5
In a state where non uniform random vals are clear
2015-12-15 18:02:11 -08:00
Seth Alves
951db42146
only send queryAABox if something about the location changed
2015-12-15 16:17:49 -08:00
Seth Alves
0ac06bad5c
more AACube plumbing
2015-12-15 15:31:02 -08:00
Seth Alves
2b800d711f
queryAACube to and from scriptvalues
2015-12-15 15:18:43 -08:00
Seth Alves
0013d58365
include queryAACube when scripts make changes
2015-12-15 14:25:02 -08:00
ericrius1
dca83a054e
Changed additiveBlending to emitterShouldTrail
2015-12-15 10:30:57 -08:00
ericrius1
c561a53f7c
Going to change additive blending to world position prop
2015-12-15 09:56:28 -08:00
Anthony J. Thibault
617fda7832
ModelEntityItem: fix for incorrect joint mapping
...
This could happen when switching the animation url between fbx files
with different joint mappings. Only the first one would take effect.
This should fix the issue in the demo domain, with the contorted doll model.
2015-12-14 17:07:53 -08:00
Seth Alves
165c41d843
add a way to remember which entities couldn't be properly placed in octree due to missing parents
2015-12-14 14:19:19 -08:00
ericrius1
8d691f2132
light ball
2015-12-14 11:44:42 -08:00
ericrius1
3d782f1307
fixed merge conflicts
2015-12-14 10:11:49 -08:00
Seth Alves
008065ba38
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2015-12-14 09:15:56 -08:00
Seth Alves
c74f8bca49
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
2015-12-14 09:13:36 -08:00
Seth Alves
270d5fc8e1
remove commented-out code
2015-12-13 06:44:34 -08:00
Seth Alves
7f11d2a4fe
whitespace
2015-12-12 14:45:02 -08:00
Seth Alves
1492fd6090
merge from upstream
2015-12-12 12:37:57 -08:00
Seth Alves
24fb43e8cd
first steps toward a puffed-out query-box for child entities
2015-12-12 12:33:14 -08:00
Atlante45
79fdb2e882
Fix warnings on windows 64bit
2015-12-11 16:31:27 -08:00
Atlante45
0f49653da3
More OS X warning cleanup
2015-12-11 16:31:27 -08:00
Seth Alves
920e2941b9
don't crash when a child no longer has a containing element
2015-12-11 15:31:56 -08:00
Seth Alves
6c033d9603
call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model
2015-12-11 11:35:42 -08:00
Howard Stearns
585911fe98
Merge pull request #6612 from sethalves/no-physics-until-ready
...
No physics until ready
2015-12-10 16:09:49 -08:00
Atlante45
03ee07c8b7
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-10 13:37:20 -08:00
Seth Alves
8ca6c7acc3
Merge pull request #6611 from Atlante45/attachments
...
Fix Attachments jitter
2015-12-10 11:46:19 -08:00
Seth Alves
dbde0b641e
Merge branch 'attachments' of github.com:Atlante45/hifi into no-physics-until-ready
2015-12-10 11:38:08 -08:00
Atlante45
6f29d9e7b8
Use strongly typed enum instead of nested alias
2015-12-10 11:10:09 -08:00
Seth Alves
a59af2c1b2
Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready
2015-12-10 09:03:57 -08:00
Seth Alves
d09f70239c
make entity-tree a global. change how network-requests to load model geometry are triggered
2015-12-10 09:03:53 -08:00
Brad Hefta-Gaub
bd1ab418a4
Merge pull request #6606 from hyperlogic/tony/remove-animation-start-automatically-property
...
[PROTOCOL CHANGE] Entities: Removed Start Automatically property from Animation Group
2015-12-10 07:35:55 -08:00
Anthony J. Thibault
e9f529bf12
Entities: Removed Start Automatically property from Animation Group
...
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
2015-12-09 17:59:56 -08:00
Atlante45
1d513cfbba
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-09 15:09:19 -08:00
Philip Rosedale
c93252b134
Merge pull request #6596 from AndrewMeadows/fix-bad-ownership
...
fix bad simulation ownership when using edit.js
2015-12-08 17:49:38 -08:00
Andrew Meadows
987b8d3334
fix bad simulation ownership when using edit.js
2015-12-08 14:34:25 -08:00
Seth Alves
ec9f1e0754
possible fix for crash when grabbing bubblewand
2015-12-08 09:44:43 -08:00
Seth Alves
0bf276efa5
adjust method names to fit convention
2015-12-07 14:37:35 -08:00
Seth Alves
982e986f1a
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-07 14:31:18 -08:00
Seth Alves
f99812a903
adjust method names to fit convention
2015-12-07 14:31:08 -08:00
Leonardo Murillo
25494ec867
Merge pull request #6562 from Atlante45/baseball
...
Baseball
2015-12-07 14:11:21 -08:00
Seth Alves
96e9580473
change some more parameters back to being pass-by-reference, where it's safe
2015-12-07 05:30:19 -08:00
Seth Alves
3cc423ca03
remap IDs when importing entities
2015-12-06 17:55:48 -08:00
Seth Alves
f0fb9966ad
expose parent-joint-index to edit.js
2015-12-06 12:34:41 -08:00
Seth Alves
a948ae5f19
children of avatar joints might be right, now
2015-12-06 10:48:00 -08:00
Seth Alves
138125faab
fix-up parentJointIndex in terse logging
2015-12-06 05:42:51 -08:00
Seth Alves
d518a4573e
if script sets parent or jointIndex, don't pop entity off to someplace
2015-12-05 15:15:33 -08:00
Seth Alves
1f0150f65f
add parentID and parentJointIndex to terse logging
2015-12-05 15:12:44 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
ericrius1
7e7327042a
Merge branch 'master' into polylineOptimizations
2015-12-04 09:53:01 -08:00
Brad Hefta-Gaub
5a75a17174
Revert "Cruft removal"
2015-12-03 17:40:41 -08:00
Clément Brisset
fa52b97f61
Merge pull request #6538 from ZappoMan/cruftRemoval
...
Cruft removal
2015-12-03 17:03:04 -08:00
Atlante45
c8ab95bb53
Spacing
2015-12-03 15:01:18 -08:00
Atlante45
180ffcc456
Typo (English is weird)
2015-12-03 15:01:18 -08:00
ericrius1
5f881e7650
polylines now take color as a uniform
2015-12-03 13:46:29 -08:00
Brad Hefta-Gaub
1a5bc5d111
removing optional compression
2015-12-03 12:40:24 -08:00
Seth Alves
4e74c98ae7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-03 11:00:13 -08:00
Seth Alves
6f79b381f9
working toward making children of avatar joints work
2015-12-03 11:00:06 -08:00
Ryan Huffman
667d2b728e
Fix uninitialized xColor value when converting script value
2015-12-03 09:52:56 -08:00
ericrius1
07430fb75a
Merge branch 'master' into polylineOptimizations
2015-12-02 15:59:32 -08:00
Brad Hefta-Gaub
1e51a90204
add edit times and entity ids to the viewer stats
2015-12-02 14:43:00 -08:00
Seth Alves
6eae98fb28
merge from upstream
2015-12-02 14:38:26 -08:00
Brad Hefta-Gaub
08ba535c38
add some basic send tracking
2015-12-02 13:43:05 -08:00
Brad Hefta-Gaub
112cdaf028
Merge pull request #6512 from AndrewMeadows/remove-debug-cruft
...
remove debug option for disabling physics updates
2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub
75a57c3cb8
Merge pull request #6500 from Atlante45/octree_crash
...
Octree crash fix
2015-12-02 09:59:56 -08:00
Andrew Meadows
ab6367ff4e
remove debug option for disabling physics updates
2015-12-01 11:13:01 -08:00
Atlante45
083205916f
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-30 18:25:53 -08:00
ericrius1
71d361ed3b
fixed hydra paint, adding more interactive brushes
2015-11-30 17:06:35 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Seth Alves
3402585d1a
fix a crash from previous commit
2015-11-30 16:54:29 -08:00
Seth Alves
9b54924524
edit.js can now manipulate children without flipping the table
2015-11-30 16:21:14 -08:00
Atlante45
4aaa9ca02f
Make OctreeElementBag safer to use
2015-11-30 15:23:49 -08:00
Seth Alves
89b78986d5
remove some more stray const
2015-11-30 14:01:17 -08:00
Stephen Birarda
4573e5c59e
resolve conflicts on merge with upstream/master
2015-11-30 13:32:38 -08:00
Seth Alves
4b87e09848
clean up some unneeded consts. get edit.js closer to working on parented entities
2015-11-30 13:23:55 -08:00
Ryan Huffman
99dd9646bc
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-30 10:20:13 -08:00
Seth Alves
4add3e2e91
rework worldToLocal, start on allowing scripts entity position/rotation to always be in world space
2015-11-30 09:41:15 -08:00
Seth Alves
cf39cac7fc
attempt to make SpatiallyNestable data access thread-safe
2015-11-29 12:50:33 -08:00
Seth Alves
eb50c9de5f
aabox delivered to scripts in properties should be in world space
2015-11-29 10:16:56 -08:00
Seth Alves
6062691c2a
minimize diff vs master
2015-11-26 07:04:27 -08:00
Seth Alves
10cf85bad9
fix some rotation handling in EntityItem, minimize diff vs master
2015-11-26 07:02:53 -08:00
Seth Alves
ca75802b9c
unmangle merge
2015-11-26 06:43:28 -08:00
Atlante45
a364e85e1d
Remove DeleteHooks
2015-11-25 17:21:56 -08:00
Anthony J. Thibault
23def8d173
Merge branch 'master' into tony/remove-joint-states
2015-11-25 13:55:23 -08:00
Clément Brisset
5ff482071e
Merge pull request #6465 from ericrius1/polyLineFix
...
moved logic to build vertex buffer to renderable polyline class, recalculati…
2015-11-25 11:02:02 -08:00
Anthony J. Thibault
f120e10ff4
Merge branch 'master' into tony/remove-joint-states
2015-11-24 15:00:05 -08:00
Atlante45
0f316e6ae1
Remove particles emiter bounds compute
2015-11-24 11:51:56 -08:00
Atlante45
e25ea122d8
Start moving update to shader
2015-11-24 11:51:56 -08:00
Atlante45
ca17c75631
Save one array traversal
2015-11-24 11:51:56 -08:00
Atlante45
230a413ec1
First pass at new particle shader
2015-11-24 11:51:56 -08:00
Atlante45
7d0a5677fa
More code cleanup
2015-11-24 11:51:56 -08:00
Atlante45
964ac5bad6
More cleanup
2015-11-24 11:51:56 -08:00
Atlante45
c33b6205a8
Some cleanup
2015-11-24 11:51:56 -08:00
Atlante45
40e802bae7
Get rid of global variable for sort
...
Fix rhs/lhs
2015-11-24 11:51:56 -08:00
Atlante45
a71ed7b166
Implement particle bounds with Extents
2015-11-24 11:51:56 -08:00
Philip Rosedale
dde01b2071
Merge pull request #6476 from AndrewMeadows/arrow
...
fix for objects suffering from very small updates to physics properties
2015-11-24 11:22:25 -08:00
Andrew Meadows
e26081e981
always update physics properties when they change
...
and move activation check logic to MotionState
2015-11-24 10:20:19 -08:00
Ryan Huffman
dac491ef41
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-24 09:59:22 -08:00
Stephen Birarda
5a7b0dd1ad
put the parsed model URL in ModelEntityItem
2015-11-24 11:46:51 -06:00
ericrius1
1409ed2d18
moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes
2015-11-23 12:28:44 -08:00
Anthony J. Thibault
dd3f43705c
Fix for Model Entity animations.
...
Because rig->setJoint* methods take parameters in geometry space
the animations preRotation has to be applied manually.
2015-11-23 11:06:11 -08:00
Seth Alves
6f19093cb9
if an entity with an action has a motion-type of static, flag it so it gets updated in bullet
2015-11-23 10:03:35 -08:00
Seth Alves
a0c1f9a1f9
progress toward having things be children of specific joints rather than just of other objects
2015-11-22 13:11:37 -08:00
Seth Alves
4646c0c103
unmangle merge
2015-11-21 10:49:31 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Brad Hefta-Gaub
c7673aad4a
Merge pull request #6447 from huffman/polyline-texture
...
Add texture property to polyline entity type
2015-11-20 13:31:34 -08:00
Ryan Huffman
9e31614fce
Fix textures property not being sent for polyline
2015-11-19 15:16:46 -08:00
Ryan Huffman
2a416ebc61
Merge branch 'master' of https://github.com/highfidelity/hifi into received-message
2015-11-18 16:52:23 -08:00
Brad Hefta-Gaub
2f3cf82202
don't apply out of order edits to entities that have been deleted
2015-11-18 14:26:18 -08:00
Ryan Huffman
2fe9af54d4
Add textures property to polyline
2015-11-18 13:59:32 -08:00
Philip Rosedale
5b853ddf57
Merge pull request #6402 from sethalves/grab-equip
...
grab script bumper is an equip toggle
2015-11-17 20:15:26 -08:00
Philip Rosedale
450608bf5b
Merge pull request #6390 from sethalves/average-near-holds
...
Average near holds
2015-11-17 20:01:46 -08:00
Seth Alves
1d4e1eabcb
Merge branch 'master' of github.com:highfidelity/hifi into grab-equip
2015-11-17 11:01:22 -08:00
Seth Alves
b062d23f61
bumper is now an equip toggle
2015-11-17 09:51:52 -08:00
David Rowe
b3b73e8cd1
Fix particle aging
2015-11-17 12:02:35 +13:00
Seth Alves
b567a4846d
Merge branch 'master' of github.com:highfidelity/hifi into average-near-holds
2015-11-16 10:08:01 -08:00
Seth Alves
89ed3751ae
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-14 14:00:20 -08:00
Seth Alves
b0d24be58f
add a way to get a list of all actions of a certain type from an entity. hold actions average their positional targets.
2015-11-13 16:02:39 -08:00
Stephen Birarda
e263453acb
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-13 14:48:26 -08:00
Seth Alves
3746920655
allow action updates from others when we are the simulation owner
2015-11-13 13:56:30 -08:00
Seth Alves
6ec5b12081
send to network when an action is deleted, also
2015-11-13 09:52:35 -08:00
Seth Alves
3f7f5a2bbd
send to network when an action is deleted, also
2015-11-13 09:49:31 -08:00
Seth Alves
5acbb74362
send to network when an action is deleted, also
2015-11-13 09:45:06 -08:00
Seth Alves
7979fb38cf
don't always send actiondata along with other physics related properties
2015-11-13 09:25:17 -08:00
Seth Alves
dbaea5770a
include action data in properties suppressed by non-simulation ownership
2015-11-12 18:28:26 -08:00
Brad Hefta-Gaub
ecaa50c0ff
fix for infinite loop in erase entities special packet
2015-11-12 18:25:18 -08:00
Seth Alves
d7be1699a7
adjust how the decision to send action changes over the wire is made
2015-11-12 15:27:10 -08:00
Seth Alves
a8cd891e48
adjust how the decision to send action changes over the wire is made
2015-11-12 14:19:23 -08:00
Stephen Birarda
ef778c554c
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-12 10:40:51 -08:00
Seth Alves
cffe4551dd
merge from upstream
2015-11-11 16:15:07 -08:00
Seth Alves
07f3d8eca0
more debugging prints
2015-11-11 16:03:08 -08:00
Brad Hefta-Gaub
2f903a9513
CR feedback and some cleanup
2015-11-11 14:21:14 -08:00
Brad Hefta-Gaub
bdfe304f7a
remove some logging
2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
040bae6014
more debugging
2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub
866116d285
more debugging
2015-11-11 12:13:47 -08:00
Seth Alves
31ebe5dba1
terse logging for sim ownership
2015-11-11 08:51:10 -08:00
Seth Alves
39b92d2b52
terse log when ownership changes
2015-11-10 17:06:12 -08:00
Brad Hefta-Gaub
3316b63bf6
add a fixme comment
2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub
006a1d60c8
keep some additional erase entities history and send to viewers
2015-11-10 15:31:51 -08:00
Seth Alves
df5d161721
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 15:02:17 -08:00
Seth Alves
82bd506086
adjust how EntityMotionState updates its idea of what the server knows about an entity
2015-11-10 14:32:57 -08:00
Seth Alves
5e4f30b2bb
improve terse entity logging. change how action data sending is triggered
2015-11-10 13:58:09 -08:00
Atlante45
b15054c1fb
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:41:06 -08:00
Atlante45
6a53021818
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:23:31 -08:00
Eric Levin
7700e67734
Merge pull request #6326 from imgntn/entity_params
...
Add Ability to Pass Parameters When Calling Methods on Entities
2015-11-09 12:17:58 -08:00
James B. Pollack
1812444614
Merge pull request #6278 from ericrius1/particleSorting
...
Added additiveBlending property to particle effect entity
2015-11-09 11:32:44 -08:00
James B. Pollack
e928c8278b
overload a single function and cleanup, add examples
2015-11-06 11:48:51 -08:00
Seth Alves
4ed8a1e5d1
changes to send an update to entity-server when AvatarActionHold releases an entity
2015-11-06 09:25:53 -08:00
James B. Pollack
3cee569bae
pass parameters to entities
2015-11-05 16:57:39 -08:00
James Pollack
b229b5289c
entity call params
2015-11-05 14:24:21 -08:00
James Pollack
751d51ee72
entity call params
2015-11-05 14:19:11 -08:00
ericrius1
4e5b806934
particle effect entities no longer intersect with rays
2015-11-04 16:05:29 -08:00
Seth Alves
9b3708ea66
use parentChanged to recalculate entity bounding boxes
2015-11-04 09:27:57 -08:00
Atlante45
55894f2eee
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 17:46:24 -08:00
ericrius1
31fe5fa953
Bump version num, use different shader for additive blending effect
2015-11-03 17:15:10 -08:00
Seth Alves
ffb0317a50
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-03 16:53:00 -08:00
Seth Alves
60824a1fb0
back out some off-brand changes. add parentChanged call
2015-11-03 16:07:28 -08:00
ericrius1
a722ad46f6
Merge branch 'master' into particleSorting
2015-11-03 15:47:44 -08:00
Seth Alves
f60b1d9bd7
unmangle merge
2015-11-03 13:50:35 -08:00
ericrius1
777fbe6d83
moved additive_blending flag to proper location
2015-11-03 12:43:41 -08:00
ericrius1
0ed868077d
Added additive blending as option for particle effect
2015-11-03 10:02:51 -08:00
Ryan Huffman
f4531759be
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-02 12:27:08 -08:00
Ryan Huffman
7f4a8e9d7d
Merge branch 'master' of github.com:Atlante45/hifi into baseball
2015-11-02 12:25:51 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -08:00
Howard Stearns
79f05c63e5
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-31 11:23:18 -07:00
Bradley Austin Davis
46d87dda5a
Fixing paths for SDL2 and Sixense libs
2015-10-30 19:00:26 -07:00
Howard Stearns
28246c1951
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-30 13:21:56 -07:00
samcake
393f6a4c76
Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version
2015-10-30 11:35:50 -07:00
