Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 10:27:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41961 commits 25 branches 0 tags 1.1 GiB
Commit graph

5954 commits

Author SHA1 Message Date
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
samcake
9404846ca4 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-31 22:58:36 -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
samcake
9d1f91fa19 First pass at using compressed format when uploading textures 2016-03-31 19:27:35 -07: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
David Rowe
0a83df2281 Fix textarea selection highlight 2016-03-30 19:25:45 +13:00
David Rowe
cfc5c36f05 Fix dropdowns 2016-03-30 19:16:04 +13:00
David Rowe
0b70da1581 Improve layout of scale controls 2016-03-30 19:02:28 +13:00
David Rowe
f4b9ffe26f Reorder sections 2016-03-30 18:07:45 +13:00
David Rowe
fdf45e0134 Use "-group" classification for section expand and collapse 2016-03-30 17:34:31 +13:00
David Rowe
1c5e414c15 Reinstate original property "-section" classifications 2016-03-30 16:10:32 +13:00
samcake
be27eaff24 Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights 2016-03-29 17:51:24 -07:00
David Rowe
1cb08952ae Merge branch 'master' into 20855 
Conflicts:
	interface/resources/qml/ToolWindow.qml
 2016-03-30 12:01:45 +13:00
David Rowe
d07cc82512 Color some buttons 2016-03-29 23:39:02 +13:00
David Rowe
791d3b0310 Fix styling of disabled form 2016-03-29 23:24:34 +13:00
David Rowe
252a48ed5b Miscellaneous fixes 2016-03-29 22:28:00 +13:00
David Rowe
ab37534e0d Restyle dropdowns 2016-03-29 20:14:08 +13:00
David Rowe
a2d9f088ab Typos 2016-03-29 18:47:13 +13:00
samcake
884a3e691d Cleaning up moved files 2016-03-28 18:38:34 -07:00
samcake
a815c50fca fixing the qml component 2016-03-28 18:36:17 -07:00
samcake
95418e25c0 Try to fix the iinclude for the PerfPlot/qml 2016-03-28 17:46:19 -07:00
Brad Hefta-Gaub
44b37c332a Merge pull request #7480 from jherico/webchannel_redux 
Webchannel redux
 2016-03-28 13:18:22 -07:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
samcake
7402dafc91 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-28 09:13:00 -07:00
David Rowe
9c953aa491 Style miscellaneous number fields 2016-03-28 14:49:24 +13:00
David Rowe
11ae07a91d Style header type and ID values 2016-03-28 12:43:40 +13:00
David Rowe
2ebde880af Style pitch, yaw, roll fields 2016-03-28 12:10:32 +13:00
David Rowe
ef4d67008b Style x, y, z fields 2016-03-28 11:45:50 +13:00
James B. Pollack
50cc632b9c Merge pull request #7424 from ericrius1/batonSoundEntityTest 
Add a test case for playing a short sound from an entity using virtual baton
 2016-03-27 10:49:59 -07:00
David Rowe
b9ec5f39d9 Style color RGB fields 2016-03-27 22:12:10 +13:00
David Rowe
ee6f55b81b Style color pickers 2016-03-27 17:21:02 +13:00
David Rowe
653ddd2ae0 Style URL refresh buttons 2016-03-27 15:13:51 +13:00
David Rowe
04dd27d07f Restyle entity property textarea fields 2016-03-27 11:31:30 +13:00
David Rowe
ce8cc168ee Restyle entity property text fields 2016-03-26 20:45:19 +13:00
David Rowe
e23b3157a9 Restyle entity property checkboxes 2016-03-26 18:24:56 +13:00
David Rowe
3f8b89eea8 Miscellaneous fixes 2016-03-26 18:23:11 +13:00
David Rowe
b7fa9d5f8d Style entity property headings 2016-03-26 16:27:20 +13:00
James B. Pollack
e261519b11 Update utils.js 
remove extra letter that would be crashing things
 2016-03-25 19:29:18 -07:00
samcake
7361304084 Cleaning up for review 2016-03-25 18:38:52 -07:00
Seth Alves
3108ac73b8 Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-03-25 16:25:24 -07:00
samcake
c23640249e Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-25 15:29:01 -07:00
samcake
9b58d50fd4 BUilding a more complete set of tools to monitor performances 2016-03-25 15:28:06 -07:00
ericrius1
be499747f2 no bust caching" 2016-03-25 12:54:06 -07:00
ericrius1
721b940441 untip cow 2016-03-25 12:52:53 -07:00
David Rowe
f85b7696b3 Merge branch 'master' into 20855 2016-03-26 07:53:55 +13:00
ericrius1
cc92294d16 removed vr vj stuff 2016-03-25 11:21:08 -07:00
ericrius1
9e25009734 untipping cow 2016-03-25 11:19:30 -07:00
ericrius1
8d4001e54e only tip cow after its done colliding 2016-03-25 10:57:54 -07:00
ericrius1
c3d9f0c1e7 Merge remote-tracking branch 'upstream/master' 2016-03-25 10:15:40 -07:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
samcake
9fb1a9a2a8 Merge and many more counters 2016-03-25 03:02:18 -07:00
David Rowe
8185e13e18 Style checkboxes 2016-03-25 16:40:26 +13:00
samcake
3f844d7a82 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-24 20:36:29 -07:00
David Rowe
42af3ebc4a Style the entity editor's "grid" tab 2016-03-25 14:15:03 +13:00
Brad Hefta-Gaub
fc41c5bca9 Merge pull request #7448 from Menithal/entity-properties-refresh-cache 
Added Refresh Buttons to entityProperties
 2016-03-24 17:34:46 -07:00
Brad Hefta-Gaub
d26fe77803 Merge pull request #7454 from jherico/qml_crashes 
Fix async issues related to JS <-> App <-> QML <-> HTML communication
 2016-03-24 17:32:38 -07:00
samcake
0c8556528b Polishing the PerfPlot qml to display usefull things 2016-03-24 17:25:58 -07:00
Seth Alves
ea52c2a096 Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-03-24 16:21:17 -07:00
David Rowe
9280443425 Merge branch 'master' into 20855 2016-03-25 09:06:20 +13:00
Menithal
24f2bdac77 Fixed Styling 2016-03-24 20:58:32 +02:00
Brad Davis
a43fde0803 Build a better event bridge 2016-03-24 11:01:06 -07:00
Andrew Meadows
c8655b8524 Merge pull request #7438 from PhilipRosedale/airship 
Sample script:  Airship
 2016-03-24 08:40:36 -07:00
Philip Rosedale
8e572ed635 Merge pull request #7423 from thoys/20859 
CR for Job #20859 - Fix particle color selection
 2016-03-24 00:20:59 -07:00
PhilipRosedale
8c4ecc64d9 fix entity script location 2016-03-23 22:49:18 -07:00
PhilipRosedale
7b326c9d7b fixes per review 2016-03-23 17:56:02 -07:00