Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-18 07:16:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41699 commits 69 branches 56 tags 1.2 GiB
Commit graph

5914 commits

Author SHA1 Message Date
Brad Hefta-Gaub
e5f3ec4600 Merge pull request #7545 from birarda/marketplace-to-examples 
renaming of marketplace icon/window to examples
 2016-04-03 14:25:00 -07:00
Seth Alves
3f3efc4250 remove debug prints 2016-04-01 17:55:12 -07:00
Seth Alves
9942a5edd4 don't reset local offset during a hold 2016-04-01 17:22:20 -07:00
Seth Alves
d9f5a0ccaf experiment 2016-04-01 17:17:21 -07:00
Seth Alves
f05f283b04 disable setting of angular velocity upon release of a parenting grab 2016-04-01 16:58:17 -07:00
Seth Alves
bfa2d8f405 set angular velocity on parenting-grab release 2016-04-01 15:11:01 -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
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
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
aee6fc9c8a handle starting in HMD mode 2016-04-01 11:22:12 -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
David Rowe
b9054897f7 Merge branch 'master' into 20855 2016-04-01 17:32:47 +13:00
David Rowe
7d36ec9520 Miscellaneous fixes 2016-04-01 17:30:22 +13:00
Eric Levin
8176852503 removed extra space 2016-03-31 18:50:24 -07:00
Eric Levin
e0f843d6eb removes extra space 2016-03-31 18:49:51 -07:00
David Rowe
1f0529b5ea Miscellaneous fixes 2016-04-01 14:13:38 +13:00
David Rowe
b900fcbbf0 Back out attempt at fixing OSX styling 2016-04-01 12:43:30 +13:00
Seth Alves
e8d58483aa fix typo 2016-03-31 16:37:08 -07:00
Seth Alves
0e643a1555 debugging prints 2016-03-31 16:26:54 -07:00
Brad Hefta-Gaub
bbca1ba6db only do depth reticle depth check when the reticle is visible 2016-03-31 15:58:37 -07:00
Brad Davis
27406f5b21 Add texture stress test 2016-03-31 15:13:04 -07:00
David Rowe
a2953595a5 Tweak spinbox fields for large values 2016-04-01 10:23:39 +13:00
David Rowe
048865fb09 Style spin buttons 2016-04-01 09:55:27 +13:00
Seth Alves
a8b4d1a379 ray follows controller 2016-03-31 13:46:00 -07:00
Seth Alves
a89735cb76 integrate Philip's changes to distance grabbing 2016-03-31 13:29:31 -07:00
Seth Alves
6dec015b85 Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-03-31 13:18:47 -07:00
David Rowe
dbd6b9e90b Use monospace font for textarea fields 2016-04-01 08:50:11 +13:00
Brad Hefta-Gaub
2e129a398f add example script for testing 2016-03-31 09:37:03 -07:00
David Rowe
2ac9f282c7 Merge branch 'master' into 20855 2016-03-31 17:00:09 +13:00
David Rowe
31b96c75ca Tidying 2016-03-31 16:53:03 +13:00
David Rowe
f584d4d00c Style parent joint index property as a number 2016-03-31 16:49:11 +13:00
David Rowe
751a37a1ff Arrange more properties in rows 2016-03-31 16:48:40 +13:00
David Rowe
13ab854a9d Reduce space between collapsed sections 
In settings dialogs as well as entities editor.
 2016-03-31 15:02:16 +13:00
Seth Alves
40f30b9141 get rid of distance equip 2016-03-30 17:25:53 -07:00
David Rowe
382b05e00b Make expand/collapse icon larger 2016-03-31 13:13:13 +13:00
David Rowe
4189f46156 Make input text color change to black when selected 2016-03-31 12:32:36 +13:00
David Rowe
ba43843340 Disable right-click context menu 2016-03-31 12:27:08 +13:00
Seth Alves
fd4b944458 Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-03-30 16:11:35 -07:00
samcake
6213e0859d Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned 2016-03-30 15:07:45 -07:00
David Rowe
870636832f Possible work-around for OSX font issues 2016-03-31 10:45:57 +13:00
samcake
f09593e106 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-30 14:16:16 -07:00
samcake
3cf2eeb4d5 IMproving the perfplot qml and adding 2 more info 2016-03-30 13:58:32 -07:00
David Rowe
3457d1c21e Entities list fixes 
- Fix report of number of entities selected if have two selected
- Don't show yellow focus highlight on row when first click it
 2016-03-31 09:16:31 +13:00
David Rowe
510d167c87 Merge branch 'master' into 20855 2016-03-31 08:43:35 +13:00
howard-stearns
37e6fce30b Disconnect menuItemEvent before setIsOptionChecked, and then reconnect. 2016-03-30 10:48:54 -07:00