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

45153 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
a0e6654ac6 Merge pull request #8247 from hyperlogic/feature/grab-script-polish-part-deux 
Grab Script Polish (part deux)
 2016-07-15 17:34:50 -07:00
Brad Davis
9ebc0c28c8 Fix hover states for toolbar buttons 2016-07-15 17:12:49 -07:00
Brad Hefta-Gaub
b9e11f23dd Merge pull request #8256 from jherico/decorations2 
Fix decoration inflation
 2016-07-15 17:10:32 -07:00
David Kelly
fb99828e30 PR feedback 
Code a bit more readable.  Sadly (and I guess it makes sense), a
enum class XXX is not a class, so you cannot have member functions
for it.  I can imagine no way to have a vtable if you are really
representing it as a uint8_t or whatever.  So, I put a stateHas
function in the AudioInjector instead.  Definite improvement.
 2016-07-15 17:09:27 -07:00
howard-stearns
f73c2b884d Remove now-superflous Column. 2016-07-15 17:01:37 -07:00
howard-stearns
b106dee3e9 Provide our own default image. 2016-07-15 16:52:13 -07:00
howard-stearns
f00114e53e Make it work with laser pointers (selection at least), and fix magic 
numbers.
 2016-07-15 16:46:20 -07:00
David Kelly
8df4ed01d9 fixed typo 
which oddly I was sure I already did.  Seems I didn't push it?  OK
now it is pushed.
 2016-07-15 16:22:41 -07:00
Brad Davis
b31300406a Don't extend glow line length 2016-07-15 16:20:05 -07:00
Brad Davis
317dee1b23 Fix decoration inflation 2016-07-15 16:15:53 -07:00
howard-stearns
99e9a76803 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-15 16:14:48 -07:00
howard-stearns
289617d4ce styling 2016-07-15 16:14:29 -07:00
Anthony Thibault
e4794450c2 Disable attach point saving 2016-07-15 15:36:20 -07:00
howard-stearns
cc367f7b49 We don't need HorizontalSpacer.qml. 2016-07-15 14:56:31 -07:00
howard-stearns
562446e7b8 use AddressManager, rather than adding a trampoline to hostname in 
AddressBarDialog.
 2016-07-15 14:44:27 -07:00
howard-stearns
87e54482dd check pictures only for the domains that have someone in them, but use all 
domains when filtering (occupied or no, picture or no).
Also, make darn sure we use default picture if no data.
 2016-07-15 14:30:28 -07:00
Sam Gondelman
e24b064ccd Merge pull request #8244 from BingShearer/logrolling 
Delete Old Interface Logs If the Sum Size of Those Logs Exceeds Reasonable Size
 2016-07-15 14:14:44 -07:00
Brad Davis
0d811c489a Removing debug logging 2016-07-15 14:05:16 -07:00
Brad Davis
c462b8c387 Make search line termination a circle, like 2D UI 2016-07-15 13:51:14 -07:00
Bing Shearer
9ee64d114b Sam's space. 2016-07-15 13:47:36 -07:00
howard-stearns
6fb2cedfe0 card default image: settable, use to start, and reset when needed 2016-07-15 13:42:31 -07:00
Brad Hefta-Gaub
72739cb6d9 Merge pull request #8228 from jherico/render-perf-updates 
More render performace testing work
 2016-07-15 12:50:38 -07:00
Brad Hefta-Gaub
574aaa9f28 Merge pull request #8248 from jherico/edit_toolbar 
Migrate edit.js toolbar to the new toolbar API
 2016-07-15 12:42:13 -07:00
Brad Hefta-Gaub
bc647a15ec Merge pull request #8250 from BingShearer/dice 
Removed button color declarations on createDice.js to make icons visible
 2016-07-15 12:39:44 -07:00
Brad Hefta-Gaub
496f3b14c7 Merge pull request #8205 from AndrewMeadows/model-cache-cleanup 
decouple Geometry from its GeometryResource in ModelCache
 2016-07-15 12:38:46 -07:00
Brad Hefta-Gaub
7bb31fe075 Merge pull request #8240 from jherico/hand_controller 
Menu & hand controller polish
 2016-07-15 12:36:31 -07:00
Brad Davis
90299a98fe PR feedback 2016-07-15 12:19:02 -07:00
Brad Davis
d084623662 PR feedback 2016-07-15 12:15:23 -07:00
Leonardo Murillo
ce67d57279 Removing Debugs 2016-07-15 13:03:40 -06:00
Leonardo Murillo
b0c27a53e2 Linking to Linux only SDK 2016-07-15 13:01:21 -06:00
howard-stearns
99e229467b Don't show the word "suggesions" when there aren't any. 2016-07-15 11:49:21 -07:00
howard-stearns
8faa961c8d all domains, not just the 'active' ones, which turns out to be defined as 
having at least one person in it.
 2016-07-15 11:41:00 -07:00
Leonardo Murillo
53d524eb2f Checkpoint 2016-07-15 12:04:45 -06:00
David Kelly
0fcc427d41 Merge branch 'master' of github.com:highfidelity/hifi into dk/localNoEcho 2016-07-15 11:01:42 -07:00
Leonardo Murillo
f0db7b9d39 Checkpoint 2016-07-15 11:42:30 -06:00
howard-stearns
e974bad8f0 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-15 10:36:19 -07:00
Brad Davis
846c2457a3 Merge pull request #8236 from huffman/fix/atp-reliable 
Update all asset server responses to be reliable
 2016-07-15 10:33:11 -07:00
howard-stearns
ce99146733 filter by typing 2016-07-15 10:27:52 -07:00
David Kelly
e1212c54cb Updated to deal with streaming out of both buffers 
So gotta keep track of when finished streaming to network and
locally separately.  That means the State needed to be more of a
bitflag and less of an enum.
 2016-07-15 09:55:50 -07:00
samcake
a3f6ed6a89 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-15 09:22:34 -07:00
samcake
800d2db8f1 New plots to watch the GPU load" 
"
 2016-07-15 09:13:55 -07:00
samcake
22ac95d463 REvisiting the RangeTimer to measure the real gpu duration 2016-07-15 09:12:16 -07:00
Brad Hefta-Gaub
878a01cbaf Merge pull request #8242 from kencooke/improved-hrtf 
Improved HRTF
 2016-07-15 09:02:15 -07:00
Ken Cooke
2674df6095 Fix the distance-attenuation model (for injectors only) 
The original attenuation model seems wrong, under-attenuating at close distance but completely muting after 45m.

This uses a physics-based model of -6dB per doubling of distance in free space, for the injectors. The AudioMixer model and domain settings still need to be reworked in a future PR.
 2016-07-14 18:34:07 -07:00
samcake
89ec547161 Trying to get the gpu timer to work correctly 2016-07-14 18:20:20 -07:00
Brad Davis
cd6abadc41 Make sure buttons get removed when shutting down scripts 2016-07-14 17:40:05 -07:00
Brad Davis
43e045c22a Restore mouseover events for items in windows 2016-07-14 17:40:05 -07:00
Brad Davis
a6d71f508e Fix edit toolbar button vanishing, persistent edit button 2016-07-14 17:40:04 -07:00
Brad Davis
1adf96c8df Move edit.js to new toolbar API 2016-07-14 17:40:03 -07:00
Brad Davis
fdcbf71623 Remove fade effect from toolbar buttons 2016-07-14 17:40:02 -07:00