Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-19 19:48:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 74 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
33765e14fa Update general layout of Physics options 2017-08-29 21:06:29 +12:00
David Rowe
666c163637 Fix Color tool's "Swatches" label 2017-08-29 20:30:04 +12:00
David Rowe
758442999d When picking a color highlight only single entity in a group 2017-08-29 18:03:31 +12:00
David Rowe
78876d39b4 Make all buttons raise when hovered 2017-08-29 17:58:37 +12:00
David Rowe
04a545da37 Style color slider 2017-08-29 16:54:45 +12:00
David Rowe
62e3c211eb Style color circle 2017-08-29 15:46:43 +12:00
Dante Ruiz
4b592687b7 finished webEntityLaserInput, now working on cloning 2017-08-28 17:35:34 -07:00
Seth Alves
7220a6998a remove unneeded bind-by-ref thing from lambdas 2017-08-28 17:08:59 -07:00
David Kelly
a7af114144 fix wallet, use text from server in history (for now) 2017-08-28 17:04:19 -07:00
Seth Alves
b9c68f9156 give MouseRayPickResultOperator and SetPrecisionPickingOperator default values to avoid crash on startup 2017-08-28 17:01:01 -07:00
Ryan Huffman
e9258ec97a Fix loading standalone baked textures from Asset Server 
NetworkTexture was not properly handling redirected ATP files. For
instance, if going from .jpg -> .ktx, the NetworkTexture class needs to
be aware of this so it can stop the current request and make multiple
requests for the individual mip levels.
 2017-08-28 15:54:40 -07:00
David Rowe
67eb92da8f Style color swatches 2017-08-29 10:51:36 +12:00
Stephen Birarda
6992bd6f48 add deletion of baked content when original removed 2017-08-28 15:38:31 -07:00
Zach Fox
22d3857501 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-28 15:10:17 -07:00
Stephen Birarda
ba34a0ddef fail bake of partially baked FBX that references KTX 2017-08-28 15:01:31 -07:00
Zach Fox
0cdef28cfd Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-28 14:55:18 -07:00
Zach Fox
37b6099f36 Hook up root_file_url 2017-08-28 12:46:01 -07:00
Zach Fox
1c1b841a86 Fix security images; actually do the right thing when wallet not set up 2017-08-28 12:18:53 -07:00
Atlante45
ca62e7168c Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-28 11:41:23 -07:00
Zach Fox
ceb38e261d HMD Keyboard for purchases filterBar 2017-08-28 10:45:08 -07:00
Anthony J. Thibault
5230b03f4f clang warning fixes 2017-08-28 10:35:03 -07:00
David Kelly
3955624e63 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay 2017-08-28 10:13:21 -07:00
Zach Fox
ea00668725 Again to Another 2017-08-28 10:04:26 -07:00
Zach Fox
67f3b5c027 Remove quantity 2017-08-28 09:58:45 -07:00
Zach Fox
52cb1dd893 Correctly handle non-JSON items 2017-08-28 09:54:51 -07:00
Zach Fox
e293d122b1 Add security image to Checkout and Purchases 2017-08-28 09:33:30 -07:00
Anthony J. Thibault
573985c7c9 Merge branch 'master' into feature/ant-man 2017-08-28 09:27:04 -07:00
Chris Collins
d675ee9427 Merge pull request #11250 from jherico/thread_safety 
Additional locking in model entities
 2017-08-28 09:22:30 -07:00
Sam Gateau
a98d861600 Merge pull request #11242 from SamGondelman/tabletLayer2 
Web overlays and entities are always non anti-aliased
 2017-08-28 09:10:14 -07:00
Dante Ruiz
633870245e Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-28 09:02:00 -07:00
vladest
d8fb7300c3 Merge branch 'master' into tablet_login_button 2017-08-28 16:59:35 +02:00
vladest
38295ab73f Merge conflicts 2017-08-28 16:58:30 +02:00
vladest
e38075f7ba Disable web engine scrollbars 2017-08-28 16:27:33 +02:00
David Rowe
9abcf9525c Use Settings values to determine whether or not swatches are populated 2017-08-28 15:51:11 +12:00
David Rowe
8dd06bc270 Style color picker button 2017-08-28 12:06:26 +12:00
vladest
9baf518c6a Merge branch 'master' into flickable_web_pages 2017-08-27 12:00:05 +02:00
vladest
78aa5820d0 Added proper destructor call for audio scripting interface. Save settings in destructor. Added logging to check readed audio settings 2017-08-27 11:56:28 +02:00
David Rowe
c8381f32bb Style current color indicator 2017-08-27 21:15:27 +12:00
vladest
d4332e7776 Adopting according comments from designers 2017-08-26 20:55:16 +02:00
vladest
7796946343 Merge branch 'master' into audio_devices_split 2017-08-26 20:00:00 +02:00
David Rowe
64821ccd76 Update general Color options layout 2017-08-26 17:09:04 +12:00
David Rowe
b0ef570ce0 Style Group options 2017-08-26 14:20:37 +12:00
Anthony J. Thibault
937f400534 Bug fixes for Avatar::getEyeHeight() when no feet joints are present 2017-08-25 18:23:19 -07:00
Liv
59fe5ffdc1 Initial attempt at changing first run behavior 2017-08-25 17:48:35 -07:00
Dante Ruiz
0eceb7b382 unviersial web3d vs laser 2017-08-25 17:40:30 -07:00
Stephen Birarda
79231cdee0 fix switched signature for completed bake handling 2017-08-25 17:10:09 -07:00
David Rowe
c29a900588 Fix button hovering and pressing problems 2017-08-26 12:08:37 +12:00
Stephen Birarda
cc7dd2162b fixes for OS X build 2017-08-25 17:03:52 -07:00
Zach Fox
4c16366562 Ints aren't floats, silly! 2017-08-25 16:55:50 -07:00
Zach Fox
50f7f91d4e Close the loop. 2017-08-25 16:49:02 -07:00