Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 19:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55879 commits 74 branches 59 tags 1.2 GiB
Commit graph

55879 commits

This branch
This branch
All branches
Author SHA1 Message Date
howard-stearns
905b5261d1 If collisions are enabled, turn them off in safeLanding, and 
restore.
 2017-05-25 16:32:44 -07:00
seefo
32b5ac5020 Moved audio asset processing to a separate thread 2017-05-25 16:10:53 -07:00
Sam Gateau
5b0d2f32b4 Merge pull request #10458 from jherico/ktx_validation 
Add KTX validation routines
 2017-05-25 16:02:23 -07:00
Liv
10408a0fe4 basic circle function to be used as base for torus 2017-05-25 15:32:49 -07:00
Seth Alves
3c90177421 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-25 15:14:14 -07:00
Seth Alves
af5ba3a90a ask display-plugins if they are head-controllers 2017-05-25 15:14:10 -07:00
Brad Davis
aa5aba428a PR feedback 2017-05-25 15:03:39 -07:00
Seth Alves
f474361a7e Merge pull request #10549 from seefo/master 
Focus is now changed when adding a new list item in DS settings
 2017-05-25 14:47:07 -07:00
Zach Fox
6616a85be0 Merge pull request #10534 from zfox23/fixCollisionSignalEmission 
Fix collision signal emission for static objects
 2017-05-25 14:43:07 -07:00
howard-stearns
ac8cb63419 clean and DRY 2017-05-25 14:34:24 -07:00
Andrew Meadows
971855e6bf add asserts to catch dangling pointers sooner 2017-05-25 14:29:14 -07:00
Brad Hefta-Gaub
54bca1e53d Merge pull request #10551 from Atlante45/fix/infinite-loop 
Prevent Infinite loop in FBXReader
 2017-05-25 14:25:06 -07:00
Dante Ruiz
ce52494650 Merge branch 'master' of github.com:highfidelity/hifi into head-puck 2017-05-25 22:13:18 +01:00
Dante Ruiz
cce19f7027 removed unnessary code 2017-05-25 22:07:51 +01:00
Dante Ruiz
6687b99391 Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks 2017-05-25 21:59:18 +01:00
Dante Ruiz
108c444cc7 clean up code 2017-05-25 21:59:06 +01:00
Andrew Meadows
c22e4ef883 rename method to clarify where it is called 2017-05-25 13:48:19 -07:00
Andrew Meadows
3bd0c111d7 verify empty ShapeManager in Application dtor 2017-05-25 13:47:40 -07:00
Andrew Meadows
5378cbead6 make ObjectMotionState dtor virtual 2017-05-25 13:47:03 -07:00
Dante Ruiz
8538c700b5 saving head work 2017-05-25 21:41:41 +01:00
Ryan Huffman
f0c3a0ac28 Fix SendQueue not updating lastReceiverResponse when recv handshake ack 2017-05-25 13:39:47 -07:00
Seth Alves
a062c964a9 Merge pull request #10550 from sethalves/fix-grab-raypick-props-crash 
fix code that was using old raypickInfo.properties field
 2017-05-25 13:27:19 -07:00
Liv
fee26c3976 Remove not yet implemented comment from Cone shape 2017-05-25 13:12:08 -07:00
Liv
ffbe39df0a Refactor to add optional conical parameter to existing extrude polygon function 2017-05-25 13:06:24 -07:00
samcake
cba913c068 Fixing the case when the bound changes without the rest of the properties 2017-05-25 13:01:54 -07:00
Zach Fox
f2fab57187 Update conditional to handle 'other unowned' case 2017-05-25 13:01:40 -07:00
Zach Fox
b86b07c08f Pull out ownership bidding changes 2017-05-25 13:01:40 -07:00
Zach Fox
be39874999 Changes after discussion with Brad 2017-05-25 13:01:40 -07:00
Zach Fox
f6195cdb1e Committing checkpoint changes, then testing 2017-05-25 13:01:40 -07:00
Zach Fox
0ef507c037 Revert 'dynamicChanged' to be a 'misc' physics property 2017-05-25 13:01:40 -07:00
Zach Fox
acd85b379f Make this PR a protocol change 2017-05-25 13:01:40 -07:00
Zach Fox
4d791211ee Make the changes - big thanks to Andrew! 2017-05-25 13:01:40 -07:00
Liv
d3e900e42f Adding first pass on cone shape 2017-05-25 12:54:49 -07:00
Atlante45
ea870881ee Log warning when we detect a connection loop 2017-05-25 12:48:21 -07:00
howard-stearns
9d73d0c931 works with nested enclosing entities 2017-05-25 12:09:22 -07:00
samcake
6dbbd6c8d0 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-25 11:25:46 -07:00
Liv
417d9ec80b Surface cylinder option for primitive shape to html 2017-05-25 11:04:25 -07:00
Seth Alves
3823ece153 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-25 10:57:46 -07:00
Seth Alves
bdbc6ddcc1 change some code to look at head-controller position rather than hmd position 2017-05-25 10:50:41 -07:00
Atlante45
babae456d2 Fix infinite loop in fbx reader 2017-05-25 10:42:33 -07:00
Clément Brisset
aa4059eb05 Merge pull request #10503 from birarda/bake-textures 
update baking tool to enable compression and re-baking
 2017-05-25 10:38:23 -07:00
howard-stearns
74c163d047 snapshot of safeLanding. Works as long as entities don't intersect. 2017-05-25 10:25:29 -07:00
Liv
362e08a90d Add extrudePolygon for cylinder 2017-05-25 10:23:28 -07:00
Seth Alves
de40604042 whitespace 2017-05-25 09:54:40 -07:00
Seth Alves
80e641b6d4 fix code that was using old raypickInfo.properties field 2017-05-25 09:47:02 -07:00
seefo
967148e3bf Merge branch 'master' of https://github.com/highfidelity/hifi 2017-05-25 09:32:34 -07:00
Brad Davis
65c4d31676 Merge pull request #10543 from jherico/mip_data_crash 
Do not allow divide by zero on assigning mip data
 2017-05-25 09:30:27 -07:00
seefo
da41b5dc00 Focus is now changed when adding a new list item in DS settings 2017-05-25 09:20:04 -07:00
Brad Hefta-Gaub
a0484c5f0b Merge pull request #10544 from birarda/bug/refresh-access-token 
require a valid access token and expiry to attempt token refresh
 2017-05-25 08:35:18 -07:00
Brad Hefta-Gaub
ca87b792de Merge pull request #10531 from Atlante45/fix/current-address 
Never store an address with an empty host
 2017-05-25 08:33:16 -07:00