Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
67165 commits 2 branches 0 tags 1.1 GiB
Commit graph

1198 commits

Author SHA1 Message Date
samcake
33bbbcef83 Merging with master 2018-04-24 11:49:34 -07:00
Brad Davis
ecaf162afb Fixing PR build 2018-04-23 20:41:36 -07:00
samcake
0f4aa7e27e Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-20 09:31:36 -07:00
samcake
a6bd589f4f Merging upstream 2018-04-19 12:20:10 -07:00
Clement
2e8a6e1961 Remove more dead octree code 2018-04-17 18:21:51 -07:00
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -07:00
Stephen Birarda
ab4f110ea4 add single quote tests to JS baking tests 2018-03-22 13:41:33 -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
samcake
d4d5f3a7f0 Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload 2018-03-02 08:50:47 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
Anthony J. Thibault
cb1d453f10 Removed RigTests 2018-02-28 17:15:24 -08:00
Anthony J. Thibault
470aa53454 AnimTest now passes 2018-02-28 17:12:57 -08:00
Anthony J. Thibault
95dfee25b9 Relaxed tolerance on AnimIK test so it can pass... 2018-02-28 16:43:49 -08:00
Anthony J. Thibault
f291ddae97 Animation unit tests now compile. 
not all of them pass tho...
 2018-02-28 15:55:08 -08:00
Andrew Meadows
3ca21dda67 Merge hifi/master of into hifi/workload 2018-02-28 10:28:31 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -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
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
Andrew Meadows
a4442828be fix workoad unit tests 2018-02-22 14:39:13 -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
Andrew Meadows
a8ad846f2b cleanup 2018-02-13 08:54:44 -08:00
Andrew Meadows
be38a4bc71 creating workload lib 2018-02-13 08:54:44 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml 
Migrating QML rendering off the main thread
 2018-02-12 15:32:33 -08:00
Sam Gateau
f3918ad216
Merge pull request #12367 from AndrewMeadows/fix-shared-unit-tests 
Fix shared unit tests
 2018-02-09 17:18:35 -08:00
Sam Gateau
f20e1a727e Removing the specular pipeline since we now take care of it with the base shader, remove unused shader include files adding the tone map pass 2018-02-08 23:07:39 -08:00
Andrew Meadows
64ec4dac7a remove broken DEV_BUILD context 2018-02-07 16:49:42 -08:00
Andrew Meadows
b3452f274e use glm::nan() for platform-agnostic code 2018-02-07 16:49:22 -08:00
Andrew Meadows
f0bb4d3da7 fix API bitrot and remove extra whitespace 2018-02-07 16:48:43 -08:00
Andrew Meadows
572edab79f remove dupe const 2018-02-07 16:48:31 -08:00
Bradley Austin Davis
fd007e845d Squashed scribe changes 2018-02-07 10:29:29 -08:00
Bradley Austin Davis
0455fb37b6 Merge remote-tracking branch 'upstream/master' into fix/shader_length 2018-02-06 15:55:01 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Bradley Austin Davis
f291715f87 Merge remote-tracking branch 'zvork/scribe' into fix/shader_length 2018-02-06 10:36:15 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Bradley Austin Davis
f611990b10 Fix overlimit shader char strings 2018-02-05 15:27:19 -08:00
Olivier Prat
92279b5939 Merged with master 2018-02-05 18:24:05 +01:00
Olivier Prat
ac92b3c130 Merge branch 'master' of http://github.com/highfidelity/hifi into scribe 2018-02-02 14:01:59 +01:00
samcake
062bfbd7b6 Merging with master 2018-01-30 18:33:34 -08:00