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
29289 commits 2 branches 0 tags 1.1 GiB
Commit graph

486 commits

Author SHA1 Message Date
Stephen Birarda
22ead79988 fix another char allocation in PacketTests 2015-07-31 17:30:22 -07:00
Stephen Birarda
41c6220731 resolve conflicts on merge with upstream/master 2015-07-31 17:27:23 -07:00
Sam Gateau
14f4c9c6c0 REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Howard Stearns
838711e526 Remove avatar->shift hips for idle animations. 
See https://app.asana.com/0/32622044445063/43127903156601
 2015-07-29 15:27:50 -07:00
Sam Gateau
8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-29 14:04:20 -07:00
Sam Gateau
17650dde74 Solving the coimpiling issue with Render-utils test 2015-07-29 11:49:22 -07:00
Andrew Meadows
a1e6fdc4b2 Merge pull request #5435 from MarcelEdward/hifi-2-20069 
Hifi 2 20069
 2015-07-29 11:13:30 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Andrew Meadows
d03a7d1b70 fix physics-tests build errors 2015-07-28 12:24:17 -07:00
Andrew Meadows
2aa453b610 fix build errors for shared-tests 2015-07-28 12:05:45 -07:00
Atlante45
8b71462dc1 Remove unnecessary headers 2015-07-28 10:36:00 -07:00
Niraj Venkat
34e400ac67 Changing var name to 'DebugAmbientOcclusion' 2015-07-27 17:14:09 -07:00
Marcel Verhagen
32d0513962 The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 
For now without a merge conflict.

Updated the menu name.

Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
 2015-07-27 19:04:49 +02:00
ZappoMan
648d0f6d43 fix a bunch of warnings 2015-07-20 15:12:27 -07:00
Stephen Birarda
f8c832e50b resolve conflicts on merge with upstream master 2015-07-17 16:48:46 -07:00
Brad Davis
e6e9f017c0 Fixing test code 2015-07-16 17:23:25 -07:00
Ryan Huffman
6f112f38c3 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-16 07:57:18 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
Ryan Huffman
9a3ba20f11 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-15 15:02:17 -07:00
Ryan Huffman
d9b962c4d9 Add packet tests 2015-07-15 15:02:08 -07:00
Ryan Huffman
07e3cf1348 Add COMPARE_DATA to QTestExtensions 2015-07-15 15:01:56 -07:00
Atlante45
501460d489 Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-15 13:14:36 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Stephen Birarda
8b5026a817 cleanup some warnings 2015-07-15 11:20:55 -07:00
Stephen Birarda
f0e07d424d Merge branch 'atp' into packet-tests 2015-07-15 11:02:52 -07:00
Stephen Birarda
3cd2887a08 add initial packet tests 2015-07-14 16:11:29 -07:00
Brad Hefta-Gaub
049419cec7 Merge pull request #5307 from howard-stearns/remove-octreeFades 
Remove old octreeFade code that wasn't working anyway
 2015-07-14 10:24:01 -07:00
Howard Stearns
5196648b22 Remove obsolete enum member. 2015-07-14 09:57:19 -07:00
Seth Alves
7a6cf40b54 quiet compiler 2015-07-13 07:39:11 -07:00
Seth Alves
5aca0c28ef quiet compiler 2015-07-13 07:37:59 -07:00
Howard Stearns
d1952583ab Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades 2015-07-13 07:24:08 -07:00
Seth Alves
f011d5c7f7 remove commented code 2015-07-12 20:42:17 -07:00
Seth Alves
c17c9f1818 quiet compiler 2015-07-12 10:29:43 -07:00
Howard Stearns
51be245159 Remove old octreeFade code that wasn't working anyway. 2015-07-10 16:55:45 -07:00
Brad Davis
eb9d52fbb3 Helps to actually commit the fix 2015-07-10 16:11:56 -07:00
Brad Davis
3db3676fae Fixing compile failure 2015-07-10 15:26:22 -07:00
Brad Davis
2ce8dba819 Removing heap allocation from property flag parsing, adding some manual tests 2015-07-10 15:08:10 -07:00
Anthony J. Thibault
474a643611 Added unit test for shared/transform. 
The getInverseMat is currently failing, it shows the issue that was affecting the
mirror rendering.
 2015-07-09 18:53:12 -07:00
Seiji Emery
1fc1c7c794 PR Fixes 2015-07-02 17:29:08 -07:00
Seiji Emery
28543c0bf2 PR Fixes 2015-07-02 17:27:00 -07:00
Seiji Emery
7ba03418fc PR Fixes 2015-07-02 17:24:03 -07:00
Seiji Emery
a48adf5ce5 Cleanup + formatting 2015-06-30 14:12:58 -07:00
Seiji Emery
8e324f5de2 Fixes 2015-06-29 11:29:10 -07:00
Seiji Emery
b47cb76e3c Removed all-tests from ALL_BUILD 
temp-fix for broken builds
 2015-06-26 15:44:15 -07:00
Seiji Emery
3bddfc58e9 debug 2015-06-26 14:16:12 -07:00
Seiji Emery
5d5b4dd2f4 ... 2015-06-26 13:52:12 -07:00
Seiji Emery
39a6a39f4d bugfix 
should fix the build…
 2015-06-26 13:48:48 -07:00
Seiji Emery
e81b0a3c3a Fixed tests for ALL_BUILD 
Fixed physics tests, disabled out-of-date octree tests, and renamed /
added QTestExtensions to the tests folder (IDE view).

ALL_BUILD will now succeed.
 2015-06-26 13:31:31 -07:00
Seiji Emery
67093cb9bd Refactoring 
Renamed QFUZZY_COMPARE to QCOMPARE_WITH_ABS_ERROR (and the fuzzyCompare function to getErrorDifference)
 2015-06-24 16:34:03 -07:00