Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 12:33:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85852 commits 6 branches 1 tag 1.1 GiB
Commit graph

1300 commits

Author SHA1 Message Date
utkarshgautamnyu
75aa3a73ad changed pointer args to references in JSBaker:bakeJS() 2017-10-12 12:08:44 -07:00
utkarshgautamnyu
da8b2d2137 Update JSBakerTest.cpp 2017-09-29 13:33:07 -07:00
utkarshgautamnyu
cae1560708 Update JSBakerTest.cpp 2017-09-28 13:25:08 -07:00
utkarshgautamnyu
16a75d20dc Update JSBakerTest.cpp 2017-09-28 11:58:07 -07:00
utkarshgautamnyu
305719da24 Update JSBakerTest.h 2017-09-28 11:47:39 -07:00
utkarshgautamnyu
463afd6be5 made updates to fix building 2017-09-28 11:12:26 -07:00
utkarshgautamnyu
290e3d307c Create JSBakerTest.cpp 2017-09-27 18:06:35 -07:00
utkarshgautamnyu
354fa12d36 Create JSBakerTest.h 2017-09-27 18:05:28 -07:00
utkarshgautamnyu
e4c25c0aa1 Create CMakeLists 2017-09-27 18:04:08 -07:00
samcake
f16c552978 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-26 17:18:05 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
samcake
11c55755d5 Removing unused call 2017-09-25 15:10:40 -07:00
Brad Davis
549cb77902 Fix dimensions of rendered web entities 2017-09-21 20:59:01 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -07:00
Seth Alves
186035dc5d adjust various things that cause a crash-on-exit on Linux 2017-08-06 11:57:55 -07:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
a960ea5ccb Linux build 2017-07-26 13:32:23 -07:00
Burt Sloane
246a5c9fa4 1 more 2017-07-26 08:59:48 -07:00
Burt Sloane
d2975c79c9 add midi to 3 CMakeLists.txt for linking 2017-07-26 08:41:26 -07:00
Olivier Prat
2f9885870b First merge with Sam's fader branch with custom pipeline support in shape plumber 2017-07-12 17:29:21 +02:00
Sam Gateau
49779754ff Remove unecessary shaders and apply the custom shader pipeline to polyvox 2017-07-12 15:50:06 +02:00
Olivier Prat
06d69d04c3 TransitionStage + FadeJob compiling but not linked to entity events 2017-07-07 18:22:11 +02:00
Olivier Prat
4256a1f2a7 Preparing for merge with stage. DOESN'T COMPILE! 2017-07-07 15:16:20 +02:00
Sam Gateau
4c1bf6af47 REmoving comments 2017-07-07 11:38:25 +02:00
Sam Gateau
ca7e782566 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-29 10:54:27 +02:00
Thijs Wenker
d5289d357b I need to setup my code-editor, spaces. 2017-06-29 01:01:59 +02:00
Thijs Wenker
93679f7c3b move the ResourceManager init back to where it was, to prevent problems 2017-06-29 00:52:51 +02:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
Sam Gateau
75e457ce7c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-26 10:05:04 +02:00
Seth Alves
5af07dfb62 more memory-debugger 2017-06-23 08:16:48 -07:00
samcake
20d8c11e28 ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore 2017-06-22 17:54:16 -07:00
Seth Alves
a053a1da4b more HIFI_MEMORY_DEBUGGING fixes 2017-06-22 13:50:46 -07:00
Seth Alves
7ff576ef18 add memory-debugging macro to some cmake files 2017-06-22 10:07:39 -07:00
Brad Davis
e3fb42eefd Fix crash when cache File lifetime exceeds cache lifetime 2017-06-20 14:38:51 -07:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Brad Davis
1d4b443113 Prevent cache ejection of textures in use 2017-06-19 09:51:11 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Anthony Thibault
e3c342aa77 Merge pull request #10595 from hyperlogic/feature/spine-spline 
Spline IK target support
 2017-06-08 18:09:55 -07:00
Anthony J. Thibault
606c6415ae Merge branch 'master' into feature/spine-spline 2017-06-07 10:53:46 -07:00
Bradley Austin Davis
fc6a278217 Fixing dangling thread issues, consolidating thread management 2017-06-06 15:02:16 -07:00
Clément Brisset
67970182aa Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors 
Fix generateBasisVectors() helper
 2017-06-05 14:47:18 -07:00
Andrew Meadows
205e5d7309 add unit tests and fix final bugs 2017-06-05 08:54:05 -07:00
Andrew Meadows
347104204e fix StorageTests on linux 2017-06-05 08:54:05 -07:00
samcake
0a3c1712eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-02 14:35:05 -07:00
Sam Cake
f9aa400b95 Refining the stencil configuration and triggering only in hmd mode 2017-06-02 00:22:38 -07:00
Brad Davis
b9f9cddea0 Add versioning support to the KTX cache 2017-06-01 17:16:24 -07:00
Brad Davis
3fdad14ca4 Merge pull request #10571 from jherico/ktx_tests 
FileCache refactoring and test, plus KTX unit tests
 2017-06-01 16:09:14 -07:00
Sam Cake
0372deebff Last warnings? 2017-05-31 22:09:30 -07:00
Brad Davis
a77491ccb1 FileCache refactoring and tests 2017-05-31 13:45:59 -07:00
Anthony J. Thibault
fc12d7547a Addition of CubicHermiteSpline helper classes. 2017-05-30 14:25:29 -07:00
Brad Davis
765bd3890e Improving test code for KTX library 2017-05-30 10:47:49 -07:00
samcake
882df7391b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-26 16:47:49 -07:00
Sam Gateau
5b0d2f32b4 Merge pull request #10458 from jherico/ktx_validation 
Add KTX validation routines
 2017-05-25 16:02:23 -07:00
Brad Davis
aa5aba428a PR feedback 2017-05-25 15:03:39 -07:00
samcake
044110e4f3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-24 15:40:40 -07:00
Brad Davis
191b633081 Refactor KTX defines and validation 2017-05-24 11:15:34 -07:00
Brad Davis
077e56a96f Add KTX validation routines 2017-05-24 09:44:56 -07:00
samcake
e7b808cbc1 Merging with upstream 2017-05-23 12:12:31 -07:00
Sam Cake
7f9c98a922 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-22 22:54:43 -07:00
Andrew Meadows
7b879a7964 Model has a Rig rather than a RigPointer 2017-05-19 13:24:16 -07:00
samcake
80b6fd65ae Cleaning up counters and naming schemes... 2017-05-17 18:31:28 -07:00
samcake
bc41be7ec1 Introucing the BackgroundStage to manage the background / skybox in one place 2017-05-09 17:10:05 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
samcake
4514da2a09 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-01 16:49:35 -07:00
Anthony J. Thibault
58de67ba11 Fix tests/controllers/src/main.cpp clang/gcc warnings 2017-04-28 14:12:00 -07:00
Atlante45
8269e01474 Fix atp-get compile error 2017-04-26 10:49:23 -07:00
Ryan Huffman
472c888529 Fix handling of failed ktx downloads 2017-04-26 10:48:24 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Atlante45
fc1b920341 Add ability to disable texture compression 2017-04-25 15:56:23 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Atlante45
d9a7615cc8 Add compression support for skyboxes 2017-04-25 15:56:23 -07:00
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
samcake
8e73fa3eb4 Separating the task classes in their own folder, and easing the declaration 2017-04-21 18:16:07 -07:00
Seth Alves
17b83dd64c Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-21 17:19:47 -07:00
samcake
63fe579022 simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead' 2017-04-18 17:05:40 -07:00
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -07:00
Seth Alves
74c0a70cb0 rename base action classes to dynamics, start on constraints 2017-04-11 20:39:13 -07:00
Sam Cake
b65448bcbe Trying to improve the Job/Task classes and testing it with the ZoneRenderer 2017-04-09 11:08:35 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
samcake
a2b2e3e169 Revert "Revert "Don't hold KTX files open for longer than transfers require"" 2017-03-28 14:45:04 -07:00
samcake
08e1a2ba4c Revert "Don't hold KTX files open for longer than transfers require" 2017-03-28 14:06:09 -07:00
samcake
e42cb52bd1 Merge pull request #10020 from jherico/ktx_refactor 
Don't hold KTX files open for longer than transfers require
 2017-03-28 14:06:02 -07:00
Bradley Austin Davis
f764cd614b Don't hold KTX files open for longer than transfers require 2017-03-27 13:33:00 -07:00
samcake
25d39d2430 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-27 09:50:44 -07:00
Seth Alves
7455dcc2db Merge pull request #9985 from jherico/cmake_threads 
Force thread linkage
 2017-03-26 07:27:07 -08:00
samcake
a0488cfb91 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-24 09:41:09 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
samcake
618344fe98 Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture 2017-03-23 18:10:09 -07:00
Brad Davis
5a5eb6e168 Still trying to fix build error 2017-03-23 14:09:34 -07:00
Triplelexx
216f20ed2c rename fronts to forwards 2017-03-22 19:03:39 +00:00
Brad Davis
8782fe1d93 Merge branch 'master' into smarter_textures 
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
 2017-03-06 15:29:41 -08:00
Ken Cooke
818425707b update unit tests 2017-03-04 16:14:31 -08:00
Bradley Austin Davis
9051c84b6d Fix warnings 2017-03-03 14:16:27 -08:00
Bradley Austin Davis
5b1cd5443d Fix KTX includes 2017-03-03 11:13:11 -08:00
sam
fbb0a24c4f FIxing the bug preventing to deserialize normals, clean up the ktx usage of the storage::Storage class and cleaning up somewhat the Qt pixel formats used 2017-02-23 02:08:46 -08:00
Brad Davis
62422690d0 More KTX testing, functionality 2017-02-22 15:44:06 -08:00
Brad Davis
a2269f488f Add some testing / validation for KTX 2017-02-22 13:29:09 -08:00
Brad Davis
27e8750b9b Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
Brad Davis
d1b91cb436 Adding abstracted storage for in-memory or file backed data 2017-02-17 10:13:08 -08:00
Bradley Austin Davis
7fb7aa87eb Working on new texture management strategy 2017-02-17 07:53:16 -08:00
Anthony J. Thibault
a14dcbd513 Fix for findEntities not returning some entities that are within range. 
This bug has been around a long time... introduced by commit 39ed7f7b in 2014.
This became apparent to me when testing the tablet-ui, there was a case where the
hand styluses were not appearing when close to a web entity.  Because findEntities
is such a fundamental feature used by handControllerGrab, this fix should make all
grabbing feel more consistent and predictable.

I added a unit test that reproduces the issue.
 2017-02-06 15:13:25 -08:00
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
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
Atlante45
8be6bc6460 Add missing overrides 2016-05-19 22:00:22 -07:00
Anthony J. Thibault
818d1f4601 Added six byte quaternion compression routines & tests 2016-05-16 17:48:54 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
David Rowe
88130ee5c8 Merge branch 'master' into 20917 2016-05-14 12:13:39 +12:00
Brad Davis
85272a87ba Merge pull request #7859 from samcake/lemon 
Introduce the "Unlit" shading model support and apply it to Web Enitities
 2016-05-12 15:09:50 -07:00
David Rowe
8f214a6b14 Merge branch 'master' into 99997 2016-05-12 17:50:34 +12:00
Brad Hefta-Gaub
d656f61c64 Merge pull request #7759 from jherico/app_plugin_type 
Don't expose raw pointer to the display plugin
 2016-05-11 14:49:22 -07:00
samcake
1ec9ef560e Fixing the srgb color format conversion for web entities 2016-05-11 10:46:54 -07:00
David Rowe
b8c0ec86af Hide file filter if only 1 file type 2016-05-10 15:09:13 +12:00
David Rowe
6e59abc8f6 Switch file selection dialog over to using UI Toolkit files 2016-05-10 12:13:46 +12:00
Brad Davis
c54d0bc993 Don't expose raw pointer to the display plugin 2016-05-08 10:35:31 -07:00