Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-22 10:41:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Midnight
9185e1d80d code style. 2017-08-21 14:48:10 -07:00
Ryan Huffman
8d4ab5f751 Update FBXBaker to take output directory and update oven to use it 2017-08-21 13:40:51 -07:00
Ryan Huffman
b862336d17 Add PathUtils::generateTemporaryDir() 2017-08-21 13:40:51 -07:00
Ryan Huffman
8e73eae341 Update nvtt to only use a single thread 2017-08-21 13:40:50 -07:00
David Rowe
72166dcfab Merge branch 'master' into vr-edit-a 2017-08-22 08:34:39 +12:00
Zach Fox
ed5445ec51 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-21 13:09:41 -07:00
SamGondelman
8ebaeddbc4 Merge remote-tracking branch 'upstream/master' into image3DFix 2017-08-21 11:05:44 -07: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
vladest
43d3544a0d Fix width of html pages in Create mode 2017-08-21 17:07:24 +02:00
vladest
9fd2a742a9 Fix QML warning. Fix AddressBar info scroll 2017-08-21 16:45:47 +02:00
vladest
3be684b973 Fixed spinner in center. Flicking only vertically 2017-08-21 16:31:25 +02: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
vladest
78e9bb6020 almost works for marketplace 2017-08-20 23:06:23 +02:00
Ken Cooke
099723fe4d Use RAII to avoid deletion of extended argv while in use 2017-08-20 13:49:26 -07:00
vladest
56dedea66c 1st experimental approach 2017-08-20 17:57:14 +02: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
vladest
bad8c39444 Align user/login text right border with tablet buttons 2017-08-19 17:46:52 +02:00
vladest
3783b8a57c Merge branch 'master' into tablet_login_button 2017-08-19 17:27:46 +02:00
Olivier Prat
20c7599c82 Merged with master 2017-08-19 16:06:58 +02:00
Midnight
6892cdb57d Consolidate Clear Prox Code, Add Clear Prox to collisionWithEntity. 2017-08-18 19:20:34 -07:00
Midnight
9ff68ce10c Remove particleTrailEntity from every prox check, the trail no longer needs to be updated each check. 2017-08-18 18:51:44 -07:00
Midnight
37ee2a31d4 Remove particleTrailEntity from every prox check, the trail no longer needs to be updated each check. 2017-08-18 18:50:03 -07:00
Zach Fox
512a08f67f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-18 17:05:56 -07:00
Zach Fox
6e171d38ce Bugfixes 2017-08-18 17:04:46 -07:00
Zach Fox
a07598c738 Bugfixes 2017-08-18 16:36:11 -07:00
Zach Fox
94da149ac8 Almost there 2017-08-18 16:28:02 -07:00
druiz17
42f6333948 Merge pull request #11206 from vladest/goto_remove_snap 
Switch off snap behavior
 2017-08-18 16:14:59 -07:00
David Kelly
1904bd3f2b encrypting image, rough first pass, lots left 2017-08-18 16:14:10 -07:00
Midnight
397d2a6853 Minor Code Cleanup. 2017-08-18 16:12:56 -07:00
Zach Fox
c42a658bde Almost-working change pages 2017-08-18 16:06:39 -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
Midnight
5f162c0352 Change emitShouldTrail to emitterShouldTrail. 2017-08-18 15:10:58 -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
Zach Fox
f28544e405 Show real balance 2017-08-18 14:53:55 -07:00
Liv
3406647966 Merge pull request #11203 from elisa-lj11/emoji 
Emoji Tablet App
 2017-08-18 14:37:14 -07:00
Andrew Meadows
aee35b751e replace 'unsigned long' with uint64_t 2017-08-18 14:35:48 -07:00
Zach Fox
a91c0cb169 Add 'exchange' tab 2017-08-18 14:22:25 -07:00
SamGondelman
f56e952253 properly update image3d render item 2017-08-18 14:21:46 -07:00
Zach Fox
4ff1fb8df0 Filling out home 2017-08-18 14:18:05 -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
Zach Fox
9636fad679 Updates from wireframes 2017-08-18 13:45:30 -07:00