Ryan Huffman
6854f9fda4
Remove stars shaders and renderable
2016-08-08 16:03:03 -07:00
Bradley Austin Davis
5bbcbbb811
Update render perf tool to use the new API
2016-07-26 17:06:44 -07:00
Brad Hefta-Gaub
43064807d1
Merge pull request #8292 from jherico/webui
...
Fix some UI elements triggered by WebViews
2016-07-23 13:47:04 -07:00
Brad Davis
4cbf804dd4
More work on perf testing
2016-07-21 22:32:13 -07:00
Brad Davis
faba1a4b4e
Fix UI elements triggered by WebViews
2016-07-21 15:13:07 -07:00
samcake
744474982d
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-17 13:28:03 -07:00
Brad Hefta-Gaub
72739cb6d9
Merge pull request #8228 from jherico/render-perf-updates
...
More render performace testing work
2016-07-15 12:50:38 -07:00
samcake
219b41e813
Fix the mini mirror perf issue and improve the debugDeferredLighting script
2016-07-13 17:37:35 -07:00
samcake
8acc18ae8b
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-13 11:42:07 -07:00
samcake
9f91dd5bfc
Cleaning the gpu-test app to work with the new deferred pipeline
2016-07-13 10:19:42 -07:00
Brad Davis
6336362d40
Fixing decoration inflation
2016-07-12 17:23:13 -07:00
Brad Davis
f2220288fb
Expand frame decoration when mouse is over a window in HMD mode
2016-07-12 16:40:53 -07:00
Brad Davis
029251f293
More render performace testing work
2016-07-12 11:51:58 -07:00
samcake
5d4b55eeea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-12 09:19:28 -07:00
samcake
ba7590712a
BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore
2016-07-11 18:33:57 -07:00
Brad Hefta-Gaub
bcee128de0
Merge pull request #6959 from Triplelexx/20769
...
CR for Job #20769 - Touchscreen camera input for Interface
2016-07-11 14:24:52 -07:00
samcake
ed67fe4051
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-08 09:04:40 -07:00
Brad Davis
dfdc1ca1c6
Ensuring render thread is highest priority
2016-07-07 11:14:56 -07:00
Brad Davis
5be238db08
Suppressing glew link warnings
2016-07-07 11:10:59 -07:00
Brad Davis
09f2a10613
Add rendering performance tool
2016-07-07 11:10:58 -07:00
samcake
7f6c441b22
COmpiling the test
2016-07-01 15:05:52 -07:00
samcake
ab98614dd4
Fixing the basic to compile the TestWindow
2016-07-01 14:39:32 -07:00
samcake
b37df393e2
Merging with the new GL45Backend
2016-06-29 10:40:28 -07:00
Brad Davis
b16812aa4d
Adding GL 4.5 backend
2016-06-28 18:55:24 -07:00
samcake
ec68eba3cb
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-06-24 09:37:52 -07:00
Triplelexx
90cd335bda
missed a brace
2016-06-24 10:48:25 +01:00
Triplelexx
fd4d9761ce
merge master and resolve conflicts
...
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
da74114b32
Merge pull request #8070 from AndrewMeadows/triangle-soup-4
...
support btBvhTriangleMeshShape for static mesh entities
2016-06-23 12:17:32 -07:00
samcake
90e5697940
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-06-22 09:06:47 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Brad Hefta-Gaub
c322317878
rework plugins to not depend on PluginContainer unless they want to
2016-06-21 12:07:05 -07:00
samcake
0c882832bf
Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now)
2016-06-20 17:58:35 -07:00
Andrew Meadows
d64729372a
ShapeInfo name changes
2016-06-20 17:29:20 -07:00
Brad Davis
37e9f66639
Additional toolbar work
2016-06-20 15:41:21 -07:00
samcake
37a6d29406
Finally clean the lighting pass for global and local lights, split it into global and locals and make it work with the stereo single drawcall
2016-06-17 17:19:49 -07:00
Bradley Austin Davis
ec615caa80
Support toolbar API
2016-06-17 13:06:42 -07:00
Brad Davis
b9ee0c087e
Add a constant hud toggle button to the UI
2016-06-07 13:45:23 -07:00
Brad Davis
4e49f3f942
Fix browser and update dialogs
2016-06-02 19:54:25 -07:00
Brad Davis
8c13ff4ee1
Pinned UI support
2016-06-02 17:24:25 -07:00
Brad Hefta-Gaub
06cb625d09
Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision
...
Improved Avatar Mixer Rotation Precision
2016-05-25 17:14:12 -07:00
David Rowe
b9aa667c55
Fix QML test environment
2016-05-25 10:37:30 +12:00
Brad Hefta-Gaub
b8b39b962d
Merge pull request #7868 from jherico/entity_shape
...
Add a generic shape primitive
2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub
49ded9c4df
Merge pull request #7873 from ctrlaltdavid/20917
...
restyle file browser
2016-05-24 08:40:38 -07:00
David Rowe
504516b627
Merge branch 'master' into 20917
2016-05-24 08:03:54 +12:00
Anthony J. Thibault
a1c32f8c44
Merge branch 'master' into tony/improved-avatar-mixer-precision
2016-05-23 10:24:52 -07:00
Brad Davis
2c703e963c
More shapes
2016-05-22 19:48:59 -07:00
Brad Davis
cd1e910844
Add a generic shape primitive
2016-05-21 23:46:44 -07:00
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
David Rowe
17b3101ca5
Merge branch 'master' into 20917
2016-05-20 18:50:01 +12:00