Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 11:04:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
41839 commits 75 branches 59 tags 1.2 GiB
Commit graph

41839 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
6e83ed5ccc use a more generic custom user agent 2016-04-01 15:49:24 -07:00
Seth Alves
37b895db0a Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-04-01 15:32:06 -07:00
Brad Hefta-Gaub
c4abec4fb2 Merge pull request #7541 from jherico/fix_simple_qml_message 
Fix passing of simple string message types from QML to scripts
 2016-04-01 15:20:39 -07:00
Stephen Birarda
6df7ddeb16 pass the HighFidelityInterface user agent with WebView 2016-04-01 15:13:28 -07:00
Seth Alves
bfa2d8f405 set angular velocity on parenting-grab release 2016-04-01 15:11:01 -07:00
howard-stearns
cec4175e9d whitespace 2016-04-01 15:00:51 -07:00
howard-stearns
b5cbd7720e Lock entity tree on export, and clipboard on import. 2016-04-01 14:56:56 -07:00
Seth Alves
eb22b5e4a7 velocity is now set when a parenting grab ends, though not angular velocity 2016-04-01 14:50:42 -07:00
Zach Pomerantz
eb2e254aa6 Release px resources when unused 2016-04-01 14:46:52 -07:00
Zach Pomerantz
0e9b783ca3 Release skybox texs when not rendering 2016-04-01 14:46:50 -07:00
Seth Alves
7c8050790b set velocity when something is un-parent-grabbed 2016-04-01 14:20:36 -07:00
Stephen Birarda
eaa0ba9e32 rename marketplace.js to examples.js 2016-04-01 14:16:44 -07:00
Seth Alves
0006ba281f Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-04-01 13:46:31 -07:00
Brad Hefta-Gaub
5f710782eb Merge pull request #7528 from howard-stearns/fbx-reader-safety 
Fbx reader safety
 2016-04-01 13:34:17 -07:00
Brad Hefta-Gaub
0f9a6bb37b Merge pull request #7543 from sethalves/fix-scriptname-case 
try again on local-scripts
 2016-04-01 13:33:45 -07:00
Andrew Meadows
20914df330 fix warning about signed/unsigned comparison 2016-04-01 13:31:14 -07:00
Andrew Meadows
de5fe705a3 optimize Bullet broadphase using collision groups 2016-04-01 13:14:03 -07:00
Andrew Meadows
25fbf926df CollisionWorld only updates _active_ Aabbs 
we manually set/clear active state of static objects
  that need their Aabbs updated
also fixing a bug when starting kinematic motion
 2016-04-01 13:14:03 -07:00
Andrew Meadows
e1602b57fa faster isNaN checks 2016-04-01 13:14:03 -07:00
Andrew Meadows
442b52313f faster kinematic motion calculations 2016-04-01 13:14:03 -07:00
Andrew Meadows
3f52d237ed adding Bullet profiler instances for better stats 2016-04-01 13:14:03 -07:00
Brad Hefta-Gaub
7db22ee8c2 Merge pull request #7477 from ericrius1/cowTipper 
Adds a cow which untips itself and moos when it collides with an entity
 2016-04-01 13:08:41 -07:00
Brad Hefta-Gaub
95e0682012 Merge pull request #7446 from ctrlaltdavid/20855 
Restyle entities editor
 2016-04-01 13:07:58 -07:00
Brad Davis
cd548744f6 Merge pull request #7531 from ZappoMan/optimizeDepthReticle 
only do depth reticle depth check when the reticle is visible
 2016-04-01 13:06:44 -07:00
Brad Hefta-Gaub
270a9b0483 Merge pull request #7534 from hyperlogic/tony/only-update-model-on-main-thread 
Application: don't call Model::simulate on network thread.
 2016-04-01 13:05:54 -07:00
Brad Hefta-Gaub
a3734eba00 Merge pull request #7535 from birarda/suppress-more 
add suppression for ring buffer and sequence number messages
 2016-04-01 13:04:32 -07:00
Stephen Birarda
309d327a37 change My Asset Server to Asset Browser in Menu 2016-04-01 13:02:26 -07:00
Brad Hefta-Gaub
830c7a90e1 Merge pull request #7537 from zzmp/fix/fst 
Keep textureBaseUrl for fst models
 2016-04-01 12:28:23 -07:00
Seth Alves
56b84b3106 fix display of path of selected file in running-scripts window 2016-04-01 12:05:49 -07:00
Seth Alves
35affe26e3 trying again on script loading changes 2016-04-01 11:52:47 -07:00
Brad Davis
7696764bfb Merge pull request #7538 from ZappoMan/hmdAudioSwitching 
switch to HMD preferred audio when mounting the HMD
 2016-04-01 11:44:34 -07:00
Stephen Birarda
ee7bee95f8 use nodeActivated to trigger refresh of Asset Browser 2016-04-01 11:35:33 -07:00
Zach Pomerantz
489a2fd0b9 Persist tex base url across caching 2016-04-01 11:32:29 -07:00
Zach Pomerantz
2daf0c4da4 Init tex base url in Geometry ctor 2016-04-01 11:32:13 -07:00
Brad Hefta-Gaub
aee6fc9c8a handle starting in HMD mode 2016-04-01 11:22:12 -07:00
Stephen Birarda
459cbebcee don't show the My Asset Server option beside Reload All Content 2016-04-01 11:15:32 -07:00
Stephen Birarda
194226103c refresh the Asset Browser when switching domains 2016-04-01 11:13:59 -07:00
Brad Davis
ca67c7335f Fix passing of simple string message types from QML to scripts 2016-04-01 11:04:01 -07:00
Anthony J. Thibault
75219573a4 Merge branch 'master' into tony/culling-fixes 2016-04-01 10:58:33 -07:00
Anthony Thibault
8d06cd2447 Merge pull request #7539 from huffman/fix-asset-request-cancel 
Fix asset resource request not properly cleaning up
 2016-04-01 10:58:31 -07:00
Seth Alves
0f288247a7 include script in default script location 2016-04-01 10:50:22 -07:00
Leonardo Murillo
946a292cfb Updating defaultAvatar_full.fbx to fixed version 2016-04-01 11:49:45 -06:00
Ryan Huffman
0948c8cefb Fix format of long lines 2016-04-01 10:11:32 -07:00
Ryan Huffman
8e375fd076 Fix asset resource request not properly cleaning up 2016-04-01 10:08:44 -07:00
Anthony J. Thibault
5e81cccc6c Merge branch 'master' into tony/culling-fixes 2016-04-01 09:29:46 -07:00
Brad Hefta-Gaub
5a665f9aef Merge pull request #7482 from huffman/extra-logging 
Add system information to log file
 2016-04-01 09:10:21 -07:00
Brad Hefta-Gaub
c36a5370e6 whitespace 2016-04-01 09:02:16 -07:00
Brad Hefta-Gaub
d5ecb99b16 switch to HMD preferred audio when mounting the HMD 2016-04-01 09:00:57 -07:00
Ryan Huffman
03f9a02857 Update env var logging to only include certain keys 2016-03-31 22:49:22 -07:00
David Rowe
b9054897f7 Merge branch 'master' into 20855 2016-04-01 17:32:47 +13:00