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

9743 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
f23dda7317 Less math for the same effect. 2014-03-03 17:34:16 -08:00
Andrew Meadows
1c0826d696 Add JointShapeInfo for joint shape calculations 2014-03-03 12:31:09 -08:00
Andrew Meadows
8ef657e5b2 Render avatar collision shapes in the right spot 2014-02-28 17:05:08 -08:00
Andrew Meadows
4d984b1054 cleanup 2014-02-28 16:55:16 -08:00
Andrew Meadows
702612506b very basic bounding info for joint meshes 2014-02-28 16:42:12 -08:00
Andrew Meadows
b8c1bab4ae Using pre-computed Model shapes for collisions 
...instead of generating collision shapes on the fly
 2014-02-27 17:52:35 -08:00
Andrew Meadows
50a5924574 Using shapes for collisions against Model 
rather than building tapered capsule shapes on the fly
 2014-02-27 17:33:36 -08:00
Andrew Meadows
9dc26ddfa7 First pass: add collision Shapes to Model 2014-02-27 15:50:16 -08:00
Andrew Meadows
25bdfd7677 Update to comment. 2014-02-26 15:38:33 -08:00
Andrew Meadows
5954bb91d4 ListShape now handled by ShapeCollider 2014-02-26 15:36:19 -08:00
Andrew Meadows
07eb366138 stubbed out collision handlers for ListShape 2014-02-26 14:32:46 -08:00
Andrew Meadows
da0276ac7e ShapeCollider takes CollisionList argument 
Also, adding first pass at ListShape
 2014-02-26 12:10:16 -08:00
Andrew Meadows
f0e1a6ccd3 more capsuleCapsule tests 2014-02-25 11:38:08 -08:00
Andrew Meadows
362708be60 fix another missing semicolon 2014-02-25 11:19:07 -08:00
Andrew Meadows
28d9fb9747 fix missing semicolon 2014-02-25 11:17:48 -08:00
Andrew Meadows
9a70a50bdb capsuleCapsule() collision with preliminary tests 2014-02-25 10:59:12 -08:00
Andrew Meadows
8a3640f016 Adding CapsuleSphere collisions with tests. 2014-02-24 11:38:27 -08:00
Andrew Meadows
0e28e0947c Adding ShapeColliderTests.* 2014-02-22 13:20:47 -08:00
Andrew Meadows
8c1dc40d39 Adding basic physics shapes (unfinished) 2014-02-21 16:29:07 -08:00
Andrew Meadows
072369abfe Adding physics test framework 2014-02-21 16:27:44 -08:00
Andrew Meadows
ef6d2a624b helper methods to rotate/translate CollisionInfo 2014-02-21 16:24:40 -08:00
ZappoMan
8ede0ed32b Merge pull request #2031 from Atlante45/fix_import 
Fix import
 2014-02-19 16:55:49 -08:00
Atlante45
b69bdccc8f Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-19 16:11:31 -08:00
ZappoMan
3f572765ed Merge pull request #2027 from josecpujol/19489 
Code Review for Job #19489
 2014-02-19 16:06:21 -08:00
Atlante45
af3e19e640 Added style and pngs for the buttons 2014-02-19 16:01:14 -08:00
Jose Carlos
44d5b9b2f8 cosmetic change 2014-02-20 00:22:29 +01:00
Jose Carlos
ee7b5844b8 Minor cosmetic change 2014-02-19 23:24:26 +01:00
Jose Carlos
241214ba37 Fixed compilation after merged from upstream 2014-02-19 23:08:19 +01:00
Jose Carlos
828508bbf1 merged from master 2014-02-19 23:01:13 +01:00
Jose Carlos
ba0b01d028 Style changes after ZappoMan's comments 2014-02-19 22:51:40 +01:00
Atlante45
406768bf12 Code style fixes 2014-02-19 13:13:17 -08:00
Jose Carlos
4fd735e28f Added a factor to correct display name position for non default models 
For the default avatar, the position is wrong
 2014-02-19 22:08:47 +01:00
Atlante45
919891d73c Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-19 12:38:08 -08:00
Atlante45
a732cbf300 Modified QSS for new UI (QProgressBar) 2014-02-19 12:37:08 -08:00
Atlante45
0ed7b959d7 Changed import dialog UI 2014-02-19 12:36:27 -08:00
Atlante45
7bce649080 Fix for voxelImporter 2014-02-19 12:35:45 -08:00
Atlante45
f24cd0ceba Added switch to pasteMode after successful import. 2014-02-19 12:34:38 -08:00
ZappoMan
2f5a021029 Merge pull request #2028 from ey6es/master 
Fixes for Xcode warnings without Visage, explanatory comment for Model's base geometry, left/right fixes.
 2014-02-19 12:34:15 -08:00
Atlante45
64031701e1 Added icons for import dialog buttons 2014-02-19 12:33:05 -08:00
ZappoMan
a65b376f50 Merge pull request #2026 from ZappoMan/rightbuttonbug 
fix right mouse click
 2014-02-19 12:32:26 -08:00
Andrzej Kapolka
bf12cdddf5 We need libc++, not libc++abi. 2014-02-19 12:03:14 -08:00
Andrzej Kapolka
5f9139dcd0 Fixed some left/right issues. 2014-02-19 11:54:27 -08:00
Andrzej Kapolka
f7fcbc234e Fixes for Xcode warnings with no Visage, explanatory comments for Model's 
base geometry pointer.
 2014-02-19 11:47:40 -08:00
ZappoMan
ad8a526502 fix right mouse click 2014-02-19 11:33:43 -08:00
ZappoMan
4c33296dc0 Merge pull request #2024 from AndrewMeadows/cleanup 
Cleanup hand and head
 2014-02-19 10:43:32 -08:00
Andrew Meadows
a2e0fa674f Putting new private method next to others. 2014-02-19 10:14:58 -08:00
Andrew Meadows
c24cbdadc1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-02-19 10:00:51 -08:00
AndrewMeadows
6c8291cc7d Merge pull request #2016 from ey6es/kissage 
Basic Visage integration.
 2014-02-19 09:53:17 -08:00
AndrewMeadows
306bdc783c Merge pull request #2015 from ZappoMan/more_js_edit_tools 
More js edit tools
 2014-02-19 09:46:40 -08:00
AndrewMeadows
a8d07296b8 Merge pull request #2010 from ZappoMan/voxelnotshownbug 
merge fix for "sometime voxels don't show when you move" bug
 2014-02-19 09:44:30 -08:00