Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 12:20:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41700 commits 76 branches 59 tags 1.2 GiB
Commit graph

5914 commits

Author SHA1 Message Date
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
samcake
6d6f0398f5 TRying to create a graph :) 2016-03-23 17:52:06 -07:00
Menithal
12ecd592ab Added Refresh Buttons to entityProperties 
Pressing buttons next to the url bar will now allow for content to have an
automatic unix timestamp to be applied / updated to the end of the url.
Applies for all url entity Properties
 2016-03-24 01:14:48 +02:00
samcake
851cbb1c46 change 2016-03-23 16:07:41 -07:00
samcake
138a996013 First draft of monitoring the memeory consumption 2016-03-23 15:46:17 -07:00
David Rowe
454ba50dc1 Tidying 2016-03-24 10:03:47 +13:00
David Rowe
55fd861b69 Style scrollbars 2016-03-24 09:43:08 +13:00
ericrius1
e38a8755b0 Merge remote-tracking branch 'upstream/master' 2016-03-23 13:33:58 -07:00
David Rowe
0f352b77b2 Tidying 2016-03-23 21:25:02 +13:00
David Rowe
ca90ab7597 Fix initial sort indicators 2016-03-23 21:08:25 +13:00
David Rowe
054d575ed2 Report number of entities found or selected in entities table footer 2016-03-23 20:50:08 +13:00
PhilipRosedale
7e658896e6 update header 2016-03-22 22:39:55 -07:00
PhilipRosedale
472dd07625 airship from hack project 2016-03-22 22:39:22 -07:00
David Rowe
86354d0165 Table border 2016-03-23 17:34:33 +13:00
David Rowe
6684bbf404 Table header separators 2016-03-23 16:48:41 +13:00
David Rowe
c7712f2d05 Entities table styling 2016-03-23 16:16:03 +13:00
ericrius1
8ce23e2345 simple baton test 2016-03-22 17:41:29 -07:00
ericrius1
7450a2ea3a update 2016-03-22 17:38:56 -07:00
ericrius1
e5364fd186 update 2016-03-22 17:33:18 -07:00
ericrius1
60bb77fd34 unload baton 2016-03-22 17:12:42 -07:00
ericrius1
107479039a update 2016-03-22 17:10:04 -07:00
ericrius1
608821b50b simple baton 2016-03-22 17:06:49 -07:00
ericrius1
ad5a111b85 simple baton 2016-03-22 17:04:47 -07:00
David Rowe
89d4bea73e Restyle search filter and radius in Entity List tab 2016-03-23 12:22:09 +13:00
ericrius1
dfffe5f431 more removal 2016-03-22 15:02:44 -07:00
ericrius1
a0e8e00357 removed cache defeating code and fixed whitespace 2016-03-22 15:02:00 -07:00
David Rowe
b5d71d1ee1 Restyle top row of buttons in Entity List tab 2016-03-23 10:05:22 +13:00
ericrius1
918c61c166 removed extra code from virtualBaton 2016-03-22 10:34:10 -07:00
ericrius1
c9c5d3d8bc removed VRVJ files 2016-03-22 10:32:04 -07:00
ericrius1
94283904b8 update 2016-03-22 10:26:13 -07:00
ericrius1
1c876fe110 update 2016-03-22 10:16:49 -07:00
ericrius1
f043b27a56 hardcoded num avatars 2016-03-22 10:12:44 -07:00
ericrius1
130eb6b619 working for one; 2016-03-22 10:07:59 -07:00
ericrius1
bc8a8ac703 fix syntax error 2016-03-22 10:00:44 -07:00
ericrius1
2bb11c5dc6 unload baton 2016-03-22 09:59:10 -07:00
Thijs Wenker
d47e8eb999 Fix setting colors in ParticleExplorer without having the particle entity disappear. Handles Hex strings as well as color arrays. 2016-03-22 17:39:57 +01:00
David Rowe
53b86a0b55 Move the "no entities found" message into the entities list table 2016-03-22 20:02:57 +13:00
David Rowe
42b606c09d Merge branch 'master' into 20855 2016-03-22 18:51:07 +13:00
David Rowe
02a62766e0 Size entities list to dialog and scroll when necessary 
Also add a footer.
 2016-03-22 18:03:12 +13:00
ericrius1
2dce75bfb0 baton sound 2016-03-21 17:22:18 -07:00
Philip Rosedale
c8816f8e76 Merge pull request #7389 from Menithal/on-grab-fix 
Grab.js: Update Position on Mouse Grab Start
 2016-03-21 17:10:00 -07:00