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

15829 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
a0eb13f6db collision logic for capsule-side-vs-cube-face 
with unit tests
 2014-08-29 14:23:00 -07:00
Andrew Meadows
00913d4422 fixes for capsuleVsAACube() with unit tests 2014-08-28 16:51:16 -07:00
Andrew Meadows
921c8cfec3 fix broken build for using unititialized const float 2014-08-27 12:21:15 -07:00
Andrew Meadows
f1ae0ce992 moved some functions around 2014-08-27 12:21:03 -07:00
Andrew Meadows
e133a696f5 merge andrew/ragdoll into some ShapeCollider work 2014-08-27 12:12:08 -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
Andrew Meadows
7a5c4fdb16 remove commented out #includes 2014-08-25 15:25:46 -07:00
Andrew Meadows
681c526fe1 exploit symmetry of collision pairings 2014-08-25 08:52:45 -07:00
Andrew Meadows
f684608d1f Added AACubeShape with stubbed collision functions 2014-08-25 08:24:44 -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
Andrew Meadows
1bc88a0224 merge upstream/master into andrew/ragdoll 2014-08-21 09:58:58 -07:00
AndrewMeadows
ff9f079704 Merge pull request #3308 from Atlante45/record_feature 
Record feature Scripted UI
 2014-08-21 09:56:02 -07:00
Andrew Meadows
9ada8435be Merge branch 'huffman-19908' into upstream/master 2014-08-21 09:22:38 -07:00
Andrew Meadows
328167464f Merge branch '19908' of github.com:huffman/hifi into huffman-19908 
Conflicts:
	interface/src/Menu.cpp
 2014-08-21 09:21:24 -07:00
Andrew Meadows
bc1276944c merge upstream/master into andrew/ragdoll 2014-08-21 08:21:36 -07:00
Andrew Meadows
080c191727 namechange updateConstraint() -> buildConstraint() 2014-08-21 08:20:31 -07:00
Atlante45
022109a249 Added timestamps to the scripted UI 2014-08-20 19:36:56 -07:00
Atlante45
56f7f88d75 Changed icon URLs to the right ones 2014-08-20 18:17:38 -07:00
Atlante45
8f9a322318 Recording UI 2014-08-20 18:04:17 -07:00
Atlante45
4922592cfa Debug tweaks 2014-08-20 15:21:33 -07:00
Atlante45
e3ab6476ca Recorder.js first draft 2014-08-20 15:21:18 -07:00
Clément Brisset
c76afe7d4a Merge pull request #3298 from PhilipRosedale/master 
First cut of Spacebar-to-fly with Oculus and Faceshift, stabilize Faceshift head jittering
 2014-08-20 10:16:25 -07:00
Philip Rosedale
5e94070aa0 Merge pull request #3304 from huffman/19864 
Add AppKit as a dependency in interface CMakeLists.txt
 2014-08-19 22:31:54 -07:00
Ryan Huffman
6b1671c598 Add AppKit as a dependency in interface CMakeLists.txt 2014-08-19 22:17:09 -07:00
Philip Rosedale
8e958b49c0 Merge pull request #3303 from Atlante45/record_feature 
Record feature JS API + File Format
 2014-08-19 21:25:18 -07:00
Philip Rosedale
c68ed81691 fixes per code review 2014-08-19 20:54:08 -07:00
Philip Rosedale
8e024982d5 Merge pull request #3301 from huffman/19864 
Code Review for Job #19864
 2014-08-19 20:48:30 -07:00
Ryan Huffman
3d940469de Increase display name drawing distance 2014-08-19 19:41:31 -07:00
Ryan Huffman
42de56381a Update blue audio sphere name and angle to draw at 2014-08-19 19:40:27 -07:00
Ryan Huffman
3b7260c434 Fix blue audio sphere not showing correctly 2014-08-19 19:22:11 -07:00
Ryan Huffman
8bc5f86666 Add Audio Sphere menu option 2014-08-19 19:21:53 -07:00
Atlante45
72c60ee69c Remove used variable 2014-08-19 19:01:50 -07:00
Clément Brisset
f6609bcd26 Merge pull request #3302 from thoys/19845 
Frisbee script for #19845
 2014-08-19 18:35:14 -07:00
Clément Brisset
8ddda3b0f7 Merge pull request #3300 from AndrewMeadows/ragdoll 
Fix for Models with rootIndex != 0
 2014-08-19 18:32:24 -07:00
Atlante45
c21d1a41e5 Removed debug messages 2014-08-19 18:30:14 -07:00
Andrew Meadows
8c4f0968d8 remove unused JointState::setRotation() method 2014-08-19 17:33:06 -07:00
Andrew Meadows
1a8a2d9156 Add Avatar submenu to main menu for non-debug stuff 2014-08-19 17:26:01 -07:00
Atlante45
b028b845f4 Fox audio recording not being triggerred from JS 2014-08-19 17:22:05 -07:00
Thijs Wenker
415e58c8bd Frisbee script 2014-08-20 02:19:53 +02:00
Atlante45
b13604f968 JS API for recording 2014-08-19 16:43:26 -07:00
Atlante45
db8869a34d File format implementation + threading tweaks 2014-08-19 16:42:43 -07:00
Philip Rosedale
95e0d5928e Merge branch 'master' of https://github.com/worklist/hifi 2014-08-19 16:40:04 -07:00
Philip Rosedale
d685e5c8b9 Added roll strafe, pitch ascend, more tuning movement 2014-08-19 16:05:01 -07:00
Ryan Huffman
284c4d8ac0 Merge branch 'master' of github.com:highfidelity/hifi into 19864 
Conflicts:
	interface/CMakeLists.txt
 2014-08-19 11:59:53 -07:00
Andrew Meadows
f511fe2657 Ragdoll cannot assume skeleton's rootIndex is 0 
some Models have extra "joints" not part of the normal skeleton
 2014-08-19 11:31:50 -07:00
Clément Brisset
8de49c9a87 Merge pull request #3299 from ctrlaltdavid/19840 
Ignore empty "embedded" textures
 2014-08-19 10:36:17 -07:00