Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33045 commits 71 branches 56 tags 1.2 GiB
Commit graph

660 commits

Author SHA1 Message Date
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
Anthony J. Thibault
d75353eeb2 added left/right hand click actions, vive controller should be able to emulate mouse events 2015-07-07 14:35:55 -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
Seiji Emery
0ee0c92f2f Re-added stuff 2015-06-24 14:54:54 -07:00
Seiji Emery
00900d6906 Rewrote MovingPercentileTests 
(hope someone uses this...)
 2015-06-24 14:46:01 -07:00
Seiji Emery
735c4a7dcf bugfix 2015-06-23 17:45:02 -07:00
Seiji Emery
0f97d95c2f Removed debug info from cmake files 2015-06-23 17:18:18 -07:00
Seiji Emery
1f0d9a250a Reverted render-utils and ui tests to be manual tests (not unit tests, and not incorporating QtTest). 2015-06-23 17:13:43 -07:00
Seiji Emery
57b86c0762 Added docs for QTestExtensions.h 2015-06-23 15:27:49 -07:00
Seiji Emery
ede365acc6 Updated AngularConstraintTests 2015-06-23 13:51:26 -07:00
Seiji Emery
cbfd8485e4 Added an implementation stub for JitterTests 
(the current tests take port and ip address info via command line args, and would be non-trivial to reimplement using QtTest.
The original tests can be run by #defining RUN_MANUALLY in the source file, and running jitter-JitterTests).
 2015-06-23 11:50:31 -07:00
Seiji Emery
5a9d2a4d9c Updated audio-tests 2015-06-23 11:38:22 -07:00
Seiji Emery
da04442f85 Updated networking-tests 2015-06-23 11:25:43 -07:00
Seiji Emery
4cb1dddb89 Refactored OctreeTests to use QtTest. 
Note: unit tests currently fail, so that needs to be looked into.
 2015-06-23 11:05:53 -07:00
Brad Davis
d4b9a739f5 Still working on GL update 2015-06-23 09:49:10 -07:00
Brad Davis
fbf3a0cbe6 Working on GL 4 2015-06-23 09:48:16 -07:00
Bradley Austin Davis
0000b5a8c8 Working on GL 4.1 core 2015-06-23 09:48:15 -07:00
Seiji Emery
dfe58a5ed4 Disabled Model (entity) Tests, as they are waaay out of date and will not run with the current codebase. These should get reimplemented at some point. 2015-06-22 17:42:07 -07:00
Seiji Emery
c61b38f5e6 finished physics tests 2015-06-22 16:25:26 -07:00
Seiji Emery
0d9a661839 physics test cleanup 2015-06-22 15:55:34 -07:00
Seiji Emery
c2b7f70d2b ShapeColliderTests now uses QtTest 2015-06-22 15:25:24 -07:00
Seiji Emery
01c85e0a2c cleanup 2015-06-22 10:17:26 -07:00
Seiji Emery
16dd5e0590 Added a custom test macro, QFUZZY_COMPARE (compares two values with an explicit error tolerance), and the infrastructure for defining more. 
Reworked physics test files, but they're a WIP.
 2015-06-21 09:29:09 -07:00
Seiji Emery
d75f3b1398 Fixed test target dependencies (which were not getting added into the *-tests build targets) 2015-06-20 11:49:26 -07:00
Seiji Emery
64922ecc62 Setup cmake build files for QtTest-based unit tests. 2015-06-19 21:39:34 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Atlante45
0384b74479 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 17:37:53 +02:00
Andrew Meadows
0c6de897f5 replace tab with spaces 2015-05-28 12:26:29 -07:00
Atlante45
bca80addef Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer 2015-05-28 16:13:24 +02:00
andrew
2a6955ce12 fix windows build 2015-05-27 09:14:11 -07:00
Andrew Meadows
39d8244255 use highfideltiy style for class data member names 2015-05-26 22:59:29 -07:00
Andrew Meadows
708203089c replace tabs with spaces 2015-05-26 22:53:57 -07:00
Andrew Meadows
efbb9b0238 rewritten MassProperties with complete unit tests 2015-05-26 22:48:45 -07:00
Andrew Meadows
16e5710325 Merge pull request #4954 from ZappoMan/entitysmartpointers 
EnitityItem smart pointers
 2015-05-26 14:05:03 -07:00
Atlante45
76fc59675b Merge branch 'team-teaching' into text-renderer 2015-05-26 20:01:26 +02:00
ZappoMan
c92e7bed87 andrews CR feedback 2015-05-26 09:44:02 -07:00
Atlante45
88d42f931e Remove unused Headers 2015-05-26 18:12:20 +02:00
ZappoMan
31021c1dfd more work on smart pointers 2015-05-22 21:46:05 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Andrew Meadows
461d08c0a9 merge upstream/master into andrew/bispinor 2015-05-22 11:35:02 -07:00
Andrew Meadows
f6721aa6eb moved ShapeInfoUtil to be ShapeFactory 2015-05-21 15:53:16 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Andrew Meadows
4872a565c9 bid for simulation ownership 2015-05-12 21:46:52 -07:00
Brad Hefta-Gaub
4de6d645e5 Merge pull request #4701 from jherico/infoview 
Infoviews & Browser in QML
 2015-05-06 12:12:21 -07:00
David Rowe
35dbb9491c Merge branch 'master' into 20518 2015-05-05 13:13:49 -07:00
samcake
61f6139f4f Merge pull request #4764 from ZappoMan/atmosphereInZones 
First cut at adding "Atmosphere" support to zone
 2015-05-05 11:00:58 -07:00
Bradley Austin Davis
d2a8681139 Merge branch 'master' into infoview 2015-05-05 10:31:19 -07:00
Philip Rosedale
e9476029fb Merge pull request #4724 from jherico/menu_polish 
Menu polish
 2015-05-04 23:44:06 -07:00
ZappoMan
77232e35f8 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones 2015-05-04 17:16:33 -07:00
ZappoMan
4561c59203 wire up zone to environment atmosphere rendering 2015-05-04 13:49:43 -07:00
Stephen Birarda
14fa89858e use epsilon constant in MovingMinMaxAvgTests 2015-05-04 10:45:26 -07:00
Stephen Birarda
7ce62f49e2 fix absolute value checks in MovingMinMaxAvgTests.cpp 2015-05-01 16:37:53 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
David Rowe
d053379831 Add "Mute Face Tracking" menu item 2015-04-30 23:14:21 -07:00
Brad Davis
87ef98005d menu polish 2015-04-29 02:42:57 -07:00
Bradley Austin Davis
75f6ad3b99 Working on menus look 2015-04-29 00:43:18 -07:00
Brad Davis
0fb8884f9c Merge branch 'browser' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 17:54:04 -07:00
Brad Davis
9836ffed97 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 01:17:51 -07:00
Brad Davis
4bb5e562ea Browser work 2015-04-27 22:39:48 -07:00
Brad Davis
19ca543c2c Cleaning up code and tweaking menu layout 2015-04-27 19:07:53 -07:00
Brad Davis
7bd8bbf565 Merge branch 'vr_menus' into infoview 2015-04-27 18:33:45 -07:00
Bradley Austin Davis
ca16d37ce5 Mac testing 2015-04-27 12:46:34 -07:00
Brad Davis
c799ecbf83 Fixing bad merge 2015-04-27 12:16:04 -07:00
Brad Davis
d8b814082e Removing extraneous header 2015-04-27 12:15:16 -07:00
Brad Davis
14b660baf7 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-27 11:43:49 -07:00
Brad Davis
76ce34a74b Scanning for code style 2015-04-27 11:41:10 -07:00
Brad Davis
d55d467d3f Tweaking VR menu for PR 2015-04-27 11:35:57 -07:00
Brad Davis
fa31ba0754 Info-view 2015-04-26 10:37:14 -07:00
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -07:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
e7b8efc2d9 Cleaning up unused stuff 2015-04-24 16:44:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
Brad Davis
c0d562ed55 Merge branch 'offscreen' into m_and_m 2015-04-23 23:45:11 -07:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
Brad Davis
bb1c73adc7 Working on menus 2015-04-23 14:24:01 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00
Brad Davis
a9d65f168b Working on marketplace dialog 2015-04-23 14:23:11 -07:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Brad Davis
930ec7a6d8 One more 2015-04-22 19:22:10 -07:00
Brad Davis
c4d2bd2cda More coding standard fixes 2015-04-22 19:18:09 -07:00
Atlante45
b446644549 Rename CollisionModelURL handle 2015-04-22 21:03:56 +02:00
Brad Davis
16efa2a46f Improving toggle visibility and loading behavior 2015-04-17 16:59:04 -07:00
Bradley Austin Davis
4b73481604 Respond to changes in the device pixel ratio in the test window 2015-04-17 10:19:31 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Bradley Austin Davis
f700607a65 Working on OSX functionality 2015-04-15 23:08:55 -07:00
Brad Davis
aba2b395a6 Working on testing the QML ui 2015-04-15 12:35:30 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Andrew Meadows
da9091a99d remove SHAPE_TYPE_CONVEX_HULL from libs and tests 2015-04-14 14:54:43 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Philip Rosedale
6a4dbd35b5 Merge pull request #4449 from AndrewMeadows/thermonuclear 
ShapeManager can release shape by pointer
 2015-03-13 17:34:32 -07:00
Andrew Meadows
e4c6d49c4d ShapeManager can release shape by pointer 2015-03-13 16:36:18 -07:00
Andrew Meadows
d1b977ec9e remove warnings about unused variables 
and remind us to impelement unit test for tetrahedron mass props
 2015-03-12 16:36:08 -07:00
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
Virendra Singh
7954dd4d67 anticlockwise triangle order 2015-03-11 03:27:26 +05:30
Virendra Singh
a0e7125e11 code revamp and correction in parallel axis theorem 2015-03-11 03:11:17 +05:30
Virendra Singh
ce4226d6b9 Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-10 22:36:18 +05:30
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Seth Alves
e4baaa38b4 collision model url 2015-03-07 20:33:00 -08:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Virendra Singh
84e05e361e Accuracy improved to 0.01 2015-03-06 22:07:35 +05:30
Virendra Singh
42867bf98d code revamp 2015-03-06 11:10:38 +05:30
Andrew Meadows
49eee89c19 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-03-05 08:22:02 -08:00
Virendra Singh
126d3cf237 Merge branch 'master' of git://github.com/highfidelity/hifi into 20304 2015-03-04 08:22:20 +05:30
Virendra Singh
4627d2e7b5 Parallel axis theorem correction 2015-03-04 03:52:59 +05:30
Virendra Singh
7a129235c2 Mass properties unit tests 2015-03-04 01:12:20 +05:30
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Andrew Meadows
93c77d557a EntityTree::findClosestEntity() now takes meters 2015-02-26 14:14:17 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Seefo
ab590440be Cleaned up warnings on Windows 2015-02-23 22:15:24 -05:00
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
Stephen Birarda
6b08b2993a fix for bullet system include to silence warnings 2015-02-19 13:03:16 -08:00
Stephen Birarda
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
7d25013659 add DLL copying for all project targets 2015-02-17 17:44:58 -08:00
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Andrew Meadows
53855c89e9 Merge pull request #4289 from birarda/dependencies 
add gverb and glm as cmake external projects
 2015-02-17 10:00:29 -08:00
ZappoMan
1fc0225939 change ScriptCache and SoundCache to derive from Dependency 2015-02-13 15:33:41 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
9c13bec476 remove glm include where no longer required 2015-02-13 10:38:01 -08:00
Stephen Birarda
263afdd22c use external project glm in physics tests 2015-02-13 10:37:17 -08:00
Stephen Birarda
d3973a724c remove glm requirement in audio tests 2015-02-13 10:35:52 -08:00
Andrew Meadows
e6a6946027 merge upstream/master into andrew/thermonuclear 2015-02-09 12:44:52 -08:00
Andrew Meadows
0ef5d42a5b unit tests support new ShapeInfo API 2015-02-08 15:13:21 -08:00
Stephen Birarda
41d2da8712 remove doubled Q_INIT_RESOURCE calls 2015-02-06 15:28:36 -08:00
Stephen Birarda
9a98e07b2d call Q_INIT_RESOURCE from mains to handle static link 2015-02-06 12:39:14 -08:00
Seth Alves
6d5d6b9085 Merge branch 'master' of github.com:highfidelity/hifi into allowed-editors 2015-02-06 09:15:41 -08:00
Seth Alves
60a4f48985 rather than a list of allowed editors, a list of allowed lockers/unlockers 2015-02-06 09:14:40 -08:00
Brad Davis
9b7743c6d3 making test code identical on old and new renderer 2015-02-05 21:25:16 -08:00
Brad Davis
be3cca2d04 Working on performance test 2015-02-05 13:11:35 -08:00
Brad Davis
dc1cc84c1c Working on porting to mac compatible shaders 2015-02-05 12:58:09 -08:00
Brad Davis
da05c26aad Moving shaders to standard format, adding bounding box support and using it in text node 2015-02-04 21:32:05 -08:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
Brad Davis
ba277e802a Working on OSX compilability 2015-02-04 11:29:31 -08:00
Brad Davis
cb7f4ca672 Pre-pull checking 2015-02-03 23:06:09 -08:00
Brad Davis
42703d2234 Working on testing code 2015-02-03 22:13:16 -08:00
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00
Brad Davis
8d81607e28 Tweaking the example text renderer 2015-02-02 23:27:57 -08:00
Brad Davis
e71b61a256 remove oglplus references 2015-02-02 12:01:21 -08:00
Brad Davis
a096c79747 Working on text rendering test 2015-02-01 19:46:49 -08:00
Brad Davis
6835068496 Adding text rendering test tool 2015-02-01 16:24:43 -08:00
Andrew Meadows
ff171a5782 Bullet is now required dependency 2015-01-15 10:27:43 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
David Rowe
a5b3ae397a Code review 2015-01-08 18:20:23 -08:00
David Rowe
07b30da2ac Fix miscellaneous types and casts 2015-01-08 13:44:51 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
Andrew Meadows
6f72d4ad81 easier to read Bullet to GLM conversions and back 2014-12-30 13:15:57 -08:00
Andrew Meadows
439cdbdac1 re-expose unit tests for legacy shapes 2014-12-29 11:15:09 -08:00
Andrew Meadows
71ab4a5780 fix unit ShapeManager unit tests 2014-12-29 11:07:57 -08:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
Sam Gateau
4c670ac17a merging with upstream master and origin temp0 2014-12-22 10:38:11 -08:00
Sam Gateau
967c6dbc4b Add the Model library 2014-12-19 16:19:06 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Atlante45
aa0998dc7d Moved LimitedNodeList into DM 2014-12-18 10:32:34 -08:00
Andrew Meadows
ad7641c7e0 repairs to build when Bullet not found 2014-12-11 16:05:45 -08:00
Andrew Meadows
919214b7cb split ShapeInfo into shared and physics parts 2014-12-02 10:44:40 -08:00
Andrew Meadows
8aba2a06e0 Splitting Bullet stuff out of ShapeInfo 2014-12-01 16:47:33 -08:00
Andrew Meadows
37093cbd00 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-11-24 11:24:39 -08:00
Andrzej Kapolka
0a976ad262 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 11:26:29 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Andrew Meadows
7c53c7a495 fix build to work when cmake does not fiind Bullet 2014-11-11 12:24:29 -08:00
Andrew Meadows
fa48da6c98 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2014-11-11 11:14:12 -08:00
Andrzej Kapolka
a77525209d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-10 11:54:05 -08:00
Stephen Birarda
2ca673175a rename StdDev to StDev, patch its leak 2014-11-07 17:15:54 -08:00
Andrzej Kapolka
4c60be4a31 Fix for hang on test exit. 2014-11-06 19:37:37 -08:00
Andrzej Kapolka
e08a0144c2 Cleanup on aisle three! Removed the color/normal/voxelized spanner bits, as 
well as the throbbing/scripted guides and the notion of spanner masking.
 2014-11-06 19:15:43 -08:00
Andrew Meadows
2734afcf9a Adding BulletUtil.h with tests. 2014-11-04 16:43:50 -08:00
Andrew Meadows
4a1133fbc2 moved ShapeInfo tests to their own file 2014-11-03 15:25:04 -08:00
Andrew Meadows
aa0172cf8b Unit tests for ShapeManager 2014-11-03 14:03:05 -08:00
Andrew Meadows
d26540b029 ShapeManager now under unit test 2014-10-31 17:13:17 -07:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
Leonardo Murillo
a4965e7f60 No need for https when downloading assets 2014-10-23 13:59:08 -06:00
Andrzej Kapolka
bd4738d2c2 Reliable delta fix. 2014-10-21 15:48:53 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
Leonardo Murillo
0b7ff18970 Changes in non-Js code 2014-10-06 11:24:10 -06:00
ZappoMan
4b52fddffd collions with voxels and avatars 2014-09-24 17:37:56 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00
Andrew Meadows
0539246089 merge upstream/master into andrew/ragdoll 2014-09-15 13:56:51 -07:00
ZappoMan
d10bd6857d add use of missingSet in release build to silence warning 2014-09-13 08:02:38 -07:00
Andrew Meadows
f2882618be merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-09-12 17:50:26 -07:00
Andrew Meadows
c475d5db36 unit tests for ray-vs-AACubeShape and PlaneShape 2014-09-12 08:41:28 -07:00
Andrew Meadows
08e5dbadfd added validation of RayIntersectionInfo::_hitShape 2014-09-11 09:44:41 -07:00
Andrew Meadows
0494ffcf38 implement Ray-vs-Capsule and Ray-vs-AACube 2014-09-10 17:01:51 -07:00
Andrew Meadows
4da1ca22ba Add RayIntersectionInfo and use for shape-vs-ray 2014-09-09 17:35:06 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
Andrew Meadows
526d998924 removed warnigs about ill-formed narrowing conversion 2014-09-05 17:21:15 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
Clément Brisset
72af7617fa Merge pull request #3332 from AndrewMeadows/ragdoll 
add AACubeShape to ShapeCollider
 2014-09-03 14:34:32 -07:00
MarcelEdward
95cab15864 the command: 
cmake . -GXcode

creates a CMakeFiles direcory in the test directory, causing the creation of the xcode files to fail with an the source directory does not contain a CMakeList.txt file.

This patch updates the CMakeList.txt file in the test directory to ignore that created dir.
 2014-09-03 16:34:23 +02:00
Andrew Meadows
ebcc960ec7 merge upstream/master into andrew/ragdoll 2014-08-29 15:48:40 -07:00
Andrew Meadows
a0eb13f6db collision logic for capsule-side-vs-cube-face 
with unit tests
 2014-08-29 14:23:00 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Andrew Meadows
00913d4422 fixes for capsuleVsAACube() with unit tests 2014-08-28 16:51:16 -07:00
Andrew Meadows
f1ae0ce992 moved some functions around 2014-08-27 12:21:03 -07:00
Andrew Meadows
c6253bb51a AACube vs Sphere and Capsule collision tests 
Sphere is unit tested.
Also removed the shape collision query against Octree
 2014-08-27 12:09:41 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Andrew Meadows
1bd7734ec1 sometimes swap order of shapes for simpler code 2014-08-22 18:07:11 -07:00
Andrew Meadows
de0ebf2f57 make sure all test errors have newline at end 2014-08-22 17:33:31 -07:00
Andrew Meadows
5d39efea82 make sure each test error has a newline at end 2014-08-22 17:26:19 -07:00
Andrew Meadows
1be922f986 add shapeVsList etc to dispatch table 
renamed some functions for more readability
 2014-08-22 11:20:53 -07:00
Andrew Meadows
3ebd8c1969 use dispatchTable for shape-vs-shape collisions 2014-08-21 16:40:25 -07:00
ZappoMan
daffb00bf2 build issues fixed after merge 2014-08-18 15:41:20 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
 2014-08-18 15:16:35 -07:00
ZappoMan
be94f98a91 fix warning 2014-08-17 14:10:42 -07:00
ZappoMan
cac4e5ba6c improved use of MovingMinMaxAvg<> for better performance, added execution timing stats 2014-08-17 14:08:07 -07:00
wangyix
029ef962b7 made JitterTester work on windows 2014-08-14 11:31:31 -07:00
wangyix
81fa5ed41f readPendingDatagrams stats printed and sent to domain page 
jittertester now prints out send or receive error msgs
 2014-08-13 16:48:06 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
737228e7bb another newline 2014-08-12 15:40:58 -07:00
wangyix
3c73fd5e0b forgot newline 2014-08-12 15:39:03 -07:00
wangyix
53d6cdd67c forgot more lines 2014-08-12 15:36:51 -07:00
wangyix
d43c39fd57 forgot a line 2014-08-12 15:28:36 -07:00
wangyix
dc46d6b80f added stdev to jitter tester 2014-08-12 15:27:17 -07:00
wangyix
184e4b8bde sestets added to jitter tester 2014-08-12 14:38:28 -07:00
wangyix
406be72f41 per-report stats added to jitter tests 2014-08-12 13:46:55 -07:00
wangyix
4ec84b32b0 updated AudioRingBuffer bytes vs samples returns 2014-08-08 17:00:39 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
Stephen Birarda
2fda95ae8f repair build of various tools 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
27419b7b6b fix some build blockers in test directory 2014-08-08 13:17:54 -07:00
Stephen Birarda
e4d01d269c use shared dependency linking macro in hifi projects 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d tweak setup_hifi_library to bubble up full path of Qt modules 2014-08-08 13:17:54 -07:00
Stephen Birarda
1f0a722d0d remove antequated windows libraries that have been replaced by Qt usage 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00