Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 21:46:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67006 commits 24 branches 28 tags 1.2 GiB
Commit graph

114 commits

Author SHA1 Message Date
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -07:00
SamGondelman
21381a7295 fix building with gles on desktop (still crashes) 2018-03-14 11:44:00 -07:00
samcake
f8acca76e2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master 2018-03-13 09:31:50 -07:00
Olivier Prat
da6bd92ff6 Merged with master 2018-03-09 10:07:25 +01:00
Andrew Meadows
3ca21dda67 Merge hifi/master of into hifi/workload 2018-02-28 10:28:31 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08:00
Olivier Prat
2d71d7da9f Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-27 09:11:43 +01:00
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
Andrew Meadows
9246f6c24a render-perf depdends on workload library 2018-02-20 19:15:54 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
SamGondelman
4f0f6709c1 fix build errors 2018-02-20 13:56:06 -08:00
Olivier Prat
f5a2557a2e Merged with master 2018-02-19 17:28:39 +01:00
Andrew Meadows
6d347cf44f revert deadlock, remove Space stubbery in EntityTree 2018-02-15 17:40:15 -08:00
Andrew Meadows
f35469c0de give EntityTree a workload/Space instance 2018-02-15 12:57:58 -08:00
Andrew Meadows
693e27716e pull task out of render and into its own lib 2018-02-14 13:26:42 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
c924cbf2a7 Remove explicit gpu-gl dependencies 2018-01-13 12:20:41 -08:00
Olivier Prat
92e1fe8e5c Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug 2017-12-08 18:02:27 +01:00
luiscuenca
bda63e38a9 Updating all wasapi dependencies 2017-10-27 13:38:13 -07:00
luiscuenca
76223aa06f Force wasapi to compile with domain-server (TEST) 2017-10-27 13:07:16 -07:00
luiscuenca
a466cf7124 make wasapi compile first 2017-10-27 11:51:19 -07:00
luiscuenca
70b37f2e8a Cleaning some old tabs 2017-10-27 11:32:44 -07:00
luiscuenca
f32282afdd Clean update bug 8027 2017-10-27 11:03:02 -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
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
246a5c9fa4 1 more 2017-07-26 08:59:48 -07: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
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
samcake
044110e4f3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-24 15:40:40 -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
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00