Zach Pomerantz
|
26cfc83e20
|
Merge branch 'master' into graphics/fetch-cull-sort
|
2017-01-03 14:04:39 -05:00 |
|
Brad Hefta-Gaub
|
84eca0159e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval
Conflicts:
tests/networking/src/ResourceTests.cpp
|
2016-12-29 16:42:52 -08:00 |
|
Zach Pomerantz
|
0e9da87549
|
FetchSortCull->FetchCullSort
|
2016-12-29 19:27:37 -05:00 |
|
Brad Hefta-Gaub
|
a72f60152b
|
audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate
|
2016-12-29 08:53:37 -08:00 |
|
Andrew Meadows
|
1e38170ba9
|
fix bitrot from AudioRingBuffer API change
|
2016-12-28 18:12:22 -08:00 |
|
Andrew Meadows
|
96a9ef8f44
|
fix bitrot after UDT overhaul
|
2016-12-28 18:11:54 -08:00 |
|
Andrew Meadows
|
39538db63a
|
fix bitrot from changed glm::vec3 API?
|
2016-12-28 18:10:45 -08:00 |
|
Andrew Meadows
|
9763566bdb
|
fix bitrot from April 2016
|
2016-12-28 18:09:31 -08:00 |
|
Andrew Meadows
|
522403cf48
|
fix build error on linux
|
2016-12-28 18:08:17 -08:00 |
|
Brad Davis
|
901c020aae
|
Optimizations, SIMD and const correctness
|
2016-12-27 15:39:38 -08:00 |
|
Zach Pomerantz
|
ca1a14e5b0
|
add RenderFetchSortCull task
|
2016-12-23 15:54:22 -05:00 |
|
Brad Davis
|
e58623bcc0
|
Working on test/trace script interface
|
2016-12-22 11:46:40 -08:00 |
|
Brad Davis
|
30a9961362
|
tracing polish
|
2016-12-16 14:02:27 -08:00 |
|
Ryan Huffman
|
7bb2755913
|
Add chrome tracing support
|
2016-12-16 01:14:01 -08:00 |
|
Seth Alves
|
26639aac15
|
Merge pull request #8789 from Atlante45/fix/settings
Use JSON for application Settings
|
2016-12-15 07:00:46 -08:00 |
|
Brad Davis
|
5cbf7588ac
|
Fixes for building on MSVC 2015 / Qt 5.8
|
2016-12-02 14:58:09 -08:00 |
|
Atlante45
|
e6b9d3604d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
|
2016-12-01 09:45:50 -08:00 |
|
Atlante45
|
1d8c97b337
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
|
2016-11-30 10:22:16 -08:00 |
|
Brad Davis
|
3b07e31eab
|
Working on OpenGL debuggability
|
2016-11-29 13:15:56 -08:00 |
|
samcake
|
d806b088a9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-11-23 15:05:52 -08:00 |
|
Brad Davis
|
f2118614da
|
Fix camera in render perf test
|
2016-11-23 10:30:52 -08:00 |
|
Atlante45
|
3035d43772
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings
|
2016-11-21 13:05:08 -08:00 |
|
samcake
|
784a0540ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-11-10 10:05:03 -08:00 |
|
Bradley Austin Davis
|
9e929ca629
|
Re-enable downsampling for non-sparse textures
|
2016-11-09 12:09:24 -08:00 |
|
samcake
|
6926cd274c
|
Merge with upstream
|
2016-11-02 18:15:08 -07:00 |
|
Seth Alves
|
3ad748cfe2
|
Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068
|
2016-10-28 16:41:39 -07:00 |
|
Zach Pomerantz
|
e2826d311f
|
fix test interface
|
2016-10-28 14:57:18 -07:00 |
|
Seth Alves
|
edb3faac78
|
quiet warning
|
2016-10-27 12:55:32 -07:00 |
|
Seth Alves
|
ea3b513e71
|
quiet a couple warnings
|
2016-10-27 11:07:46 -07:00 |
|
Seth Alves
|
f47aeae2a7
|
stop passing bare pointers to EntityTreeRenderer all around
|
2016-10-27 10:10:22 -07:00 |
|
Brad Davis
|
4bb8d4e78e
|
Force all loaded textures to sparse compatible sizes
|
2016-10-25 17:47:39 -07:00 |
|
Atlante45
|
bad96d54ea
|
TCP congestion control first draft
|
2016-10-18 15:54:25 -07:00 |
|
Atlante45
|
d5429e76da
|
Warnings fixes and cleanup
|
2016-10-12 10:20:19 -07:00 |
|
samcake
|
6f7f949343
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-10-06 09:35:48 -07:00 |
|
Clément Brisset
|
808419d988
|
Merge pull request #8740 from AndrewMeadows/fix-physics-unit-tests
fix CMAKE warning about un-unit-testable CPP file in physics unit tests
|
2016-10-05 16:22:26 -07:00 |
|
Andrew Meadows
|
7642e9fd1e
|
remove cmake warning about untestable CPP file
also: fix some broken unit tests
|
2016-10-05 13:06:36 -07:00 |
|
Brad Davis
|
f3f55c9857
|
Fixing render-perf
|
2016-10-02 11:44:35 -07:00 |
|
Brad Davis
|
488d191428
|
Remove all oglplus usage and references
|
2016-10-02 11:44:34 -07:00 |
|
samcake
|
9b94a025fc
|
Refining the voxelization of the sphere in the view frustum grid
|
2016-09-26 18:41:53 -07:00 |
|
Brad Davis
|
2dd93e0586
|
Disable debug command list
|
2016-09-23 12:05:14 -07:00 |
|
Brad Davis
|
2886c51a29
|
Fixing use of widgets in test app
|
2016-09-23 12:05:08 -07:00 |
|
Brad Davis
|
2de7f62b95
|
Fixing loop logic
|
2016-09-23 12:05:07 -07:00 |
|
Brad Davis
|
5dbaa671ca
|
Add some more debugging in render perf test
|
2016-09-23 12:05:03 -07:00 |
|
Brad Davis
|
2a058fa419
|
Add file logging to perf tool
|
2016-09-23 12:04:59 -07:00 |
|
Brad Davis
|
f33d3a3b36
|
Migrate logging functionality to shared library
|
2016-09-23 12:04:58 -07:00 |
|
Brad Davis
|
0953027ef3
|
Identify pre-generated textures
|
2016-09-23 12:04:56 -07:00 |
|
Brad Davis
|
fa23fa7b2d
|
Working on cubemap mip bug
|
2016-09-23 12:04:55 -07:00 |
|
Brad Davis
|
2b5ed86a62
|
Fixing warnings
|
2016-09-23 12:04:45 -07:00 |
|
Brad Davis
|
93b0364f73
|
Working on sparse stability
|
2016-09-23 12:04:43 -07:00 |
|
Brad Davis
|
a7f0ba24ed
|
Dynamic texture memory management
|
2016-09-23 12:04:42 -07:00 |
|
samcake
|
3bcea4310d
|
Fixing the vizualisation shader for world to cluster space
|
2016-09-10 10:41:18 -07:00 |
|
samcake
|
108910052a
|
Adding the reverse transformation
|
2016-09-09 19:00:54 -07:00 |
|
Brad Davis
|
ecfe56085d
|
GLM update and GLI integration
|
2016-09-09 10:18:15 -07:00 |
|
Brad Hefta-Gaub
|
b56ad737d4
|
Merge pull request #8567 from hyperlogic/feature/tablet-ui-foundation
Web Entities Virtual Keyboard + Event Bridge support
|
2016-09-08 18:36:46 -07:00 |
|
Brad Hefta-Gaub
|
3d54600843
|
Merge pull request #8513 from Atlante45/feat/network-port
Add settings to change local port
|
2016-09-08 18:10:32 -07:00 |
|
samcake
|
139ba1b71c
|
REnaming the shaders correctly
|
2016-09-07 14:56:01 -07:00 |
|
Anthony J. Thibault
|
dc0d0c2d5c
|
Merge branch 'master' into feature/tablet-ui-foundation
|
2016-09-07 09:49:55 -07:00 |
|
sam
|
248f172832
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-09-06 23:37:16 -07:00 |
|
SamGondelman
|
9d447d4dcc
|
enabled qnetworkrequest redirects everywhere I could find them
|
2016-09-06 17:35:06 -07:00 |
|
Atlante45
|
eb007b24cd
|
Use invalid port to signal no value passed
|
2016-09-06 11:59:07 -07:00 |
|
samcake
|
92a9037b07
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-09-06 09:20:25 -07:00 |
|
Brad Davis
|
13a4671705
|
Texture load profiling test
|
2016-09-02 17:45:26 -07:00 |
|
Anthony J. Thibault
|
9122a33fff
|
only raise the webEntity virtual keyboard in HMD mode
|
2016-09-02 16:53:40 -07:00 |
|
samcake
|
560163bb75
|
removing a warning
|
2016-09-02 10:51:19 -07:00 |
|
samcake
|
354cbbc927
|
Investigate why the disable depth Bclamp doesn't work
|
2016-08-31 19:14:35 -07:00 |
|
Brad Davis
|
179e3565ef
|
More render-perf tweaks
|
2016-08-29 11:22:56 -07:00 |
|
Brad Davis
|
617633b85c
|
Moving to custom context creation
|
2016-08-29 11:21:54 -07:00 |
|
Brad Davis
|
0213dd0359
|
Don't bottleneck the render-perf tool on new frame creation
|
2016-08-26 19:08:50 -07:00 |
|
Andrew Meadows
|
cbacb02010
|
more unit tests for CollisionRenderMeshCache
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
0d84e6ece5
|
first CollisionRenderMeshCache unit test
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
c1216cbcaf
|
stubbery for CollisionRenderMeshCacheTests
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
e473edff4a
|
fix shapeManagerTests
|
2016-08-24 22:25:45 -07:00 |
|
Zach Pomerantz
|
8c559bc65d
|
use lights from nontextured skyboxes
|
2016-08-16 13:27:22 -07:00 |
|
Brad Davis
|
0c990c621d
|
Fix perf tool build
|
2016-08-12 22:29:01 -07:00 |
|
Brad Davis
|
f9d522a1ae
|
Re-remove web from render-perf tool, add frame timing stats
|
2016-08-12 22:28:55 -07:00 |
|
Brad Davis
|
d548da02d9
|
Expose whether nsight is running to the app, disable some stuff under nsight
|
2016-08-12 22:28:50 -07:00 |
|
Brad Davis
|
4795ddd014
|
Perf test improvments (skybox support)
|
2016-08-12 22:28:49 -07:00 |
|
Bradley Austin Davis
|
d2fd7f88fd
|
Enabling OSX Oculus plugin
|
2016-08-12 22:28:43 -07:00 |
|
Brad Davis
|
c2509e9492
|
Working on draw crash bug, adding render thread trash handling
|
2016-08-12 22:28:27 -07:00 |
|
Brad Davis
|
adcfd55cc0
|
Batch replay reprojection
|
2016-08-12 22:28:23 -07:00 |
|
Bradley Austin Davis
|
274321de8a
|
First pass at threaded rendering
|
2016-08-12 22:18:36 -07:00 |
|
SamGondelman
|
9b27f8bc0f
|
Merge remote-tracking branch 'upstream/master' into loadingFade
|
2016-08-09 14:55:14 -07:00 |
|
Ryan Huffman
|
6854f9fda4
|
Remove stars shaders and renderable
|
2016-08-08 16:03:03 -07:00 |
|
SamGondelman
|
2eb0c7735f
|
working on fading shape entities
|
2016-08-03 13:30:05 -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 |
|