Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 20:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
58573 commits 75 branches 59 tags 1.2 GiB
Commit graph

58573 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
a33dbfe9b3 Change Tools menu header content per current tool 2017-08-24 14:30:05 +12:00
David Rowe
e8a1614499 Remove setting tool icon color 2017-08-24 11:10:41 +12:00
David Rowe
5a1b2babde Add further items to Create palette 2017-08-24 09:21:54 +12:00
David Rowe
2a2f058898 Fix Tools menu header underline color 2017-08-23 21:59:55 +12:00
David Rowe
be45f600d4 Style Create palette items 2017-08-23 21:56:59 +12:00
David Rowe
1aba95ecb8 Style Tools menu buttons 2017-08-23 18:20:51 +12:00
David Rowe
0ef03eb52a Remove extraneous panels 2017-08-23 10:42:24 +12:00
David Rowe
7051ff8f1f Rename "tool menu" to "tools menu" 2017-08-23 09:41:46 +12:00
David Rowe
d6a23abb7c Tools menu header and panel 2017-08-23 09:30:19 +12:00
David Rowe
44778e791f Fix entity creation position 2017-08-22 22:55:43 +12:00
David Rowe
f542c54e6c Lay out Create palette entity items 2017-08-22 22:40:38 +12:00
David Rowe
5a4ebbd54d Style Create palette header and panel 2017-08-22 21:59:31 +12:00
David Rowe
bb7e4fa302 Revise coordinate system 2017-08-22 16:02:24 +12:00
David Rowe
79056c385f Fix options buttons not pressing 2017-08-22 14:57:17 +12:00
David Rowe
c953df0040 Fix "Finish" buttons not clearing tool properly 2017-08-22 14:35:56 +12:00
David Rowe
72166dcfab Merge branch 'master' into vr-edit-a 2017-08-22 08:34:39 +12:00
Chris Collins
52a850662c Merge pull request #11219 from kencooke/interface-argv-bugfix 
Fix crashes caused by deleting argv while in use
 2017-08-21 10:26:05 -07:00
David Rowe
cc0b95c70a Lint 2017-08-21 17:32:40 +12:00
David Rowe
fcf4831a3b Center Tools menu and options UI 2017-08-21 17:26:03 +12:00
David Rowe
0064c51610 Add "Finish" buttons for scale, clone, and delete tools 2017-08-21 16:24:55 +12:00
David Rowe
ca3eadb82f Don't display menu buttons when tool options panel open, and vice versa 2017-08-21 16:04:34 +12:00
David Rowe
e34e8ff2c0 Fix color circle and slider changes not being applied when coloring 2017-08-21 13:24:07 +12:00
Ken Cooke
099723fe4d Use RAII to avoid deletion of extended argv while in use 2017-08-20 13:49:26 -07:00
David Rowe
5b2d5b0174 Minor merge fix 2017-08-20 20:48:45 +12:00
David Rowe
cddb054066 Merge branch 'master' into vr-edit-h 
# Conflicts:
#	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
#	scripts/system/controllers/handControllerGrab.js
 2017-08-20 18:41:29 +12:00
David Rowe
9434ef44c3 Delay physics kick in order to avoid some erratic behavior 2017-08-20 14:15:34 +12:00
druiz17
42f6333948 Merge pull request #11206 from vladest/goto_remove_snap 
Switch off snap behavior
 2017-08-18 16:14:59 -07:00
Howard Stearns
188cbee781 Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 
Asynchronous Ledger Interactions with Server
 2017-08-18 15:40:24 -07:00
anshuman64
a7090c7e07 Merge pull request #11211 from vladest/edit_clonable_lost 
Adopt cloneable settings to new styling
 2017-08-18 15:37:37 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks 
Adding Blocks Tablet App to Marketplace
 2017-08-18 15:06:18 -07:00
Chris Collins
2456126bcc Merge pull request #11157 from SamGondelman/tabletLayer 
Render non-AA overlays correctly
 2017-08-18 14:59:20 -07:00
Liv
3406647966 Merge pull request #11203 from elisa-lj11/emoji 
Emoji Tablet App
 2017-08-18 14:37:14 -07:00
howard-stearns
29b717e22d remove dead code 2017-08-18 14:08:04 -07:00
howard-stearns
bd37679b65 working 2017-08-18 14:03:40 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
vladest
d29d4b5016 Adopt clonable settings to new styling 2017-08-18 21:44:44 +02:00
Elisa Lupin-Jimenez
762f1a9c5c Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-18 10:49:51 -07:00
Elisa Lupin-Jimenez
65f876acf3 enabled version check 2017-08-18 10:49:40 -07:00
SamGondelman
c9f4958925 handControllerGrab fix, maybe, hopefully 2017-08-18 10:39:40 -07:00
howard-stearns
6e34ab45d6 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2 2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
vladest
4eba09214c Delegate highlighting to delegate item. Make sure ListView will not snap highlighted item 2017-08-18 08:11:29 +02:00
David Rowe
c3f96b6727 Fix damping property name 2017-08-18 13:27:38 +12:00
Elisa Lupin-Jimenez
4c28b9f09a attempt to check version of interface 2017-08-17 18:16:41 -07:00
Sam Gateau
5ac65e8f35 Merge pull request #11184 from Zvork/fadeinvertfix 
Fade edition bug fix
 2017-08-17 15:10:50 -07:00
David Rowe
5dd74d71fb Activate the color picker 2017-08-18 09:55:09 +12:00
vladest
f3969b0909 Switch off snap behavior 2017-08-17 22:28:42 +02:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
Elisa Lupin-Jimenez
4b1498f727 moved blocksApp.js to unpublished scripts, added icon 2017-08-17 10:18:29 -07:00
Elisa Lupin-Jimenez
a9d5cb45e9 changed icon to white 2017-08-17 10:11:29 -07:00