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
24438 commits 71 branches 56 tags 1.2 GiB
Commit graph

364 commits

Author SHA1 Message Date
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