Atlante45
|
2dd494b5df
|
Remove additive blending option (force it)
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
4827a96bfa
|
Fix vertex shader (nested struct unsupported)
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
d08a4d77dc
|
Shader cleanup
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
28c8cf26f5
|
Fix shader transform errors
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
9adc437553
|
Make Particle's Payload/PendingChanges *almost* pointer free
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
0f316e6ae1
|
Remove particles emiter bounds compute
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
2cb2ca29e6
|
More particle shader work
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
74278cad40
|
Fix particle texturing
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
e25ea122d8
|
Start moving update to shader
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
61511d57bb
|
Rename struct/Add type aliases
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
ca17c75631
|
Save one array traversal
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
cb14fbf4a1
|
Instance particle draw calls
|
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
|
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
|
395822c6cd
|
Use make_shared
|
2015-11-24 11:51:56 -08:00 |
|
Atlante45
|
a71ed7b166
|
Implement particle bounds with Extents
|
2015-11-24 11:51:56 -08:00 |
|
Brad Hefta-Gaub
|
fd7a704753
|
Merge pull request #6471 from birarda/url-cmp
fix unnecessary model URL updating thanks to URL encoding
|
2015-11-24 10:56:21 -08:00 |
|
Stephen Birarda
|
5a7b0dd1ad
|
put the parsed model URL in ModelEntityItem
|
2015-11-24 11:46:51 -06:00 |
|
Stephen Birarda
|
0d6b919448
|
cleanup printing of updated model URL
|
2015-11-24 11:22:30 -06:00 |
|
Stephen Birarda
|
0e19e50047
|
cleaner handling for QString/QUrl conversion/comparison
|
2015-11-24 11:17:46 -06:00 |
|
Brad Hefta-Gaub
|
ce46c30647
|
change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete
|
2015-11-23 16:27:06 -08:00 |
|
Stephen Birarda
|
6339c2c48f
|
fix for unnecessary model URL updating
|
2015-11-23 17:25:31 -06:00 |
|
Ryan Huffman
|
2fe9af54d4
|
Add textures property to polyline
|
2015-11-18 13:59:32 -08:00 |
|
Seth Alves
|
715a46ee82
|
show actions in status icons
|
2015-11-11 16:35:04 -08:00 |
|
Seth Alves
|
f07d5d9d3f
|
show network and physics status on boxes and spheres
|
2015-11-11 11:32:12 -08:00 |
|
Seth Alves
|
c2b0ccd6b3
|
show simulation ownership with status icons
|
2015-11-11 08:30:04 -08:00 |
|
Seth Alves
|
4cf84a4e5b
|
use makeEntityItemStatusGetters from more entity types
|
2015-11-10 17:14:09 -08:00 |
|
Seth Alves
|
7b4dd9a908
|
Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug
|
2015-11-10 17:06:16 -08:00 |
|
Seth Alves
|
39b92d2b52
|
terse log when ownership changes
|
2015-11-10 17:06:12 -08:00 |
|
Seth Alves
|
66387c4530
|
use icons to show network and physics status
|
2015-11-10 17:02:57 -08:00 |
|
Seth Alves
|
b9ca509f07
|
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
|
2015-11-10 09:50:12 -08:00 |
|
Seth Alves
|
d535109caf
|
attempt to fix render-collision hull feature
|
2015-11-10 09:49:31 -08:00 |
|
Brad Hefta-Gaub
|
0ea901fd72
|
fix various warnings
|
2015-11-10 08:34:58 -08:00 |
|
Seth Alves
|
bc516c0b86
|
use render-item status getters to display physics debugging information
|
2015-11-06 11:32:56 -08:00 |
|
ericrius1
|
af0c0e6a1b
|
spacing fix
|
2015-11-03 17:32:22 -08:00 |
|
ericrius1
|
31fe5fa953
|
Bump version num, use different shader for additive blending effect
|
2015-11-03 17:15:10 -08:00 |
|
ericrius1
|
470f814776
|
Fixed glitches with large particles being sorted along wrong axis
|
2015-11-03 16:39:16 -08:00 |
|
ericrius1
|
60f35ce8c7
|
discarding pixel if alpha is below threshold
|
2015-11-03 15:46:58 -08:00 |
|
ericrius1
|
0c8a712935
|
removed comment
|
2015-11-03 15:36:11 -08:00 |
|
ericrius1
|
0ed868077d
|
Added additive blending as option for particle effect
|
2015-11-03 10:02:51 -08:00 |
|
ericrius1
|
f57f3c1138
|
Disabled writing to depth buffer for particles and no longer sorting the,
|
2015-11-02 15:25:42 -08:00 |
|
Brad Davis
|
036ae62dd3
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-29 14:00:52 -07:00 |
|
Andrew Meadows
|
0c5b4115ed
|
Merge pull request #6221 from huffman/physics-substep-fix
Physics substep fix
|
2015-10-29 12:39:15 -07:00 |
|
Brad Hefta-Gaub
|
1f53e425eb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
|
2015-10-29 12:28:28 -07:00 |
|
samcake
|
e4aab4bd97
|
Merge branch 'master' of https://github.com/highfidelity/hifi into color
|
2015-10-28 15:32:13 -07:00 |
|
Brad Davis
|
3c1a0930da
|
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
|
2015-10-28 13:38:22 -07:00 |
|
Brad Davis
|
5cbb2562cd
|
Move GL utilities out to their own library
|
2015-10-27 15:53:42 -07:00 |
|
Ryan Huffman
|
913026280c
|
Fix EntityTreeRenderer dropping contact end events
|
2015-10-26 13:02:39 -07:00 |
|