Olivier Prat
|
ec1cf9dc50
|
Changed array initialization to old style C
|
2017-07-03 16:42:27 +02:00 |
|
Olivier Prat
|
3fddac9f6e
|
Fixed compilation errors with array initializations
|
2017-07-03 16:12:23 +02:00 |
|
Olivier Prat
|
d9a83539b2
|
Merged with master
|
2017-07-03 15:32:30 +02:00 |
|
Olivier Prat
|
af7957491b
|
Working avater enter/leaves + manual threshold
|
2017-07-03 12:40:58 +02:00 |
|
Olivier Prat
|
87833abd31
|
Sky working again.
|
2017-06-30 16:46:25 +02:00 |
|
Olivier Prat
|
c5ca23f4ea
|
Changing edited fade category properly updates widgets in edit window
|
2017-06-29 17:14:20 +02:00 |
|
Olivier Prat
|
fb33b8d1c1
|
Working edition and emissive edge on fade element enter/leave
|
2017-06-29 12:59:43 +02:00 |
|
Olivier Prat
|
6a31dc2659
|
Selection of edited object working
|
2017-06-29 12:13:55 +02:00 |
|
Olivier Prat
|
8a12d0c106
|
Fade effect working again for basic enter domain but with various Fade jobs
|
2017-06-29 08:54:23 +02:00 |
|
Sam Gateau
|
93963b3257
|
Apply the projection and deferred transform fixes found while working on spectator camera
|
2017-06-28 15:44:17 +02:00 |
|
Olivier Prat
|
1bb0d51849
|
Merged with master
|
2017-06-26 11:55:46 +02:00 |
|
Anthony J. Thibault
|
2dcca2125b
|
Merge branch 'master' into feature/pole-vector
|
2017-06-21 15:50:03 -07:00 |
|
samcake
|
ba9dbbb4d4
|
Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me...
|
2017-06-19 17:34:50 -07:00 |
|
Zach Fox
|
cbdffce88e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619
|
2017-06-19 13:53:29 -07:00 |
|
Olivier Prat
|
2e3ffe7721
|
Disabled check on enabled physics when deciding is fade is adequate
|
2017-06-19 18:19:36 +02:00 |
|
Anthony J. Thibault
|
323dc62ef2
|
Merge branch 'master' into feature/pole-vector
|
2017-06-16 17:37:11 -07:00 |
|
Brad Davis
|
a69cf31f4b
|
PR feedback and cmake fixes
|
2017-06-16 16:59:58 -07:00 |
|
Brad Davis
|
fece438602
|
Cleanup and refactoring
|
2017-06-15 18:58:56 -07:00 |
|
Zach Fox
|
47e5fb56d3
|
Show MyAvatar's head in the SpectatorCamera view!
|
2017-06-15 11:31:20 -07:00 |
|
Olivier Prat
|
5eeff5aa28
|
Fixed unwanted red tint due to unreset color attrib in ModelMeshPartPayload
|
2017-06-14 10:23:12 +02:00 |
|
Olivier Prat
|
ef60f78d2b
|
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
|
2017-06-14 10:16:02 +02:00 |
|
Anthony J. Thibault
|
03a6f7082e
|
Merge branch 'master' into feature/pole-vector
|
2017-06-13 15:37:59 -07:00 |
|
Anthony J. Thibault
|
f20c03fa6e
|
Pole vectors can be controlled via anim vars.
|
2017-06-13 15:36:05 -07:00 |
|
Zach Fox
|
79b6dc3f78
|
Remove one more instance of FramebufferCache
|
2017-06-13 15:26:07 -07:00 |
|
Zach Fox
|
52ea7e7994
|
Rendering improvements based on spectator-camera changes
|
2017-06-13 15:19:29 -07:00 |
|
Olivier Prat
|
ace301945c
|
Added scale and duration debug parameters in debugFade.qml
|
2017-06-13 15:31:04 +02:00 |
|
Olivier Prat
|
24d45e0f5b
|
Updated from upstream master because of change of protocol
|
2017-06-13 10:43:25 +02:00 |
|
Olivier Prat
|
f3d252ee65
|
Switched fade curve to easeInOutQuad
|
2017-06-13 08:50:50 +02:00 |
|
Brad Davis
|
db8bdbc0a6
|
Merge pull request #10659 from samcake/orange
simple Render Engine refactors coming from the Spectator Cam project
|
2017-06-12 20:31:07 -07:00 |
|
Zach Fox
|
e96c55956f
|
First pass at the fix
|
2017-06-12 09:53:14 -07:00 |
|
Seth Alves
|
eb049c8c6e
|
Merge pull request #10624 from misslivirose/feat/add-primitive-shapes
Add additional primitive shapes
|
2017-06-09 19:02:54 -07:00 |
|
samcake
|
bb38938534
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-06-09 14:34:25 -07:00 |
|
Liv
|
7785473ccb
|
moving else
|
2017-06-09 12:59:08 -07:00 |
|
Liv
|
8c488d95d1
|
Stylish updates
|
2017-06-09 11:46:38 -07:00 |
|
Liv
|
1808505d8b
|
Coding standard fixes
|
2017-06-09 10:54:57 -07:00 |
|
Liv
|
34bd2b8a2b
|
style fix
|
2017-06-08 09:01:01 -07:00 |
|
Olivier Prat
|
7d58c9a741
|
Fixed fade for shadow job
|
2017-06-08 17:09:08 +02:00 |
|
Olivier Prat
|
cba70e6be0
|
Fade working on voxel objects
|
2017-06-08 14:57:09 +02:00 |
|
Olivier Prat
|
20d4fcbbc7
|
Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL
|
2017-06-08 09:24:12 +02:00 |
|
howard-stearns
|
fa74daf875
|
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
|
2017-06-07 16:43:25 -07:00 |
|
Liv
|
c3bf915fd4
|
Changing loop to avoid unused warnings
|
2017-06-07 15:04:39 -07:00 |
|
samcake
|
bac66ee4c7
|
Introducing the renderview task
|
2017-06-06 18:00:41 -07:00 |
|
Olivier Prat
|
de143d0ea2
|
Switched to uniforms for sending fade shader data. Moved more fade functions to FadeEffect class
|
2017-06-06 17:07:20 +02:00 |
|
Olivier Prat
|
a9ab9d2476
|
Renamed FadeManager to FadeEffect
|
2017-06-06 16:27:56 +02:00 |
|
Olivier Prat
|
8af2f75996
|
Added FadeManager to centralize some common fade effect data and functions
|
2017-06-06 16:11:12 +02:00 |
|
Olivier Prat
|
e7eca7728f
|
Debug fade management moved out of the inner render loop
|
2017-06-06 14:57:52 +02:00 |
|
Liv
|
5579c409e7
|
Style fix
|
2017-06-05 18:03:10 -07:00 |
|
Liv
|
42cb2332d5
|
Remove unimplemented comment on circle
|
2017-06-05 17:46:13 -07:00 |
|
Liv
|
393aa84a55
|
Renaming conical to isConical
|
2017-06-05 17:45:52 -07:00 |
|
Liv
|
e4963e076a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes
|
2017-06-05 17:38:28 -07:00 |
|