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

58573 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
a5407398e7 Fix Group tool highlights not being cleared when switch to other tools 2017-08-12 16:21:55 +12:00
David Rowe
c281d5f94b Highlight and color single entities with Color tool 2017-08-12 15:46:53 +12:00
David Rowe
541402b559 Distinguish properly between intersected and root entities 2017-08-12 14:56:22 +12:00
samcake
ff98dedbb2 Debugging the graphics fields activation 2017-08-11 18:10:44 -07:00
Anthony J. Thibault
cd57c0706a more warning fixes 2017-08-11 17:46:50 -07:00
Cain Kilgore
8c9f3ae977 Skybox Changer PR 2017-08-12 01:35:48 +01:00
Anthony J. Thibault
f72a94e195 warning fixes 2017-08-11 17:28:50 -07:00
David Kelly
f784bc42de Initial cut using RSA keys for now 2017-08-11 16:54:04 -07:00
Zach Fox
0835b7b8e6 Bugfix 2017-08-11 16:36:26 -07:00
Zach Fox
d8e5f7a067 Small improvements 2017-08-11 16:32:35 -07:00
Zach Fox
c38837c200 Remove fixmes 2017-08-11 16:21:39 -07:00
Zach Fox
9120e678f1 Use asynchronous commerce API 2017-08-11 16:17:13 -07:00
Howard Stearns
56d57ea160 Merge pull request #11172 from howard-stearns/asynchronous-commerce 
Asynchronous commerce
 2017-08-11 15:55:45 -07:00
howard-stearns
d7f83a2fdf Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce 2017-08-11 15:53:53 -07:00
Zach Fox
46a33dd01a Merge pull request #11173 from zfox23/commerce_inventory 
Add Inventory to Commerce
 2017-08-11 15:50:06 -07:00
Anshuman Dewangan
3bc185e67c Correct desktop icon name 2017-08-11 15:37:55 -07:00
Anthony J. Thibault
b050d2c4c7 fix case on include for linux 2017-08-11 15:15:43 -07:00
Anthony J. Thibault
9e1218b4a4 Use k-dop collision to prevent hands from entering body. 2017-08-11 14:50:00 -07:00
Zach Fox
a21ff75a49 Big progress! 2017-08-11 12:54:55 -07:00
howard-stearns
8ee54c7b36 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce 2017-08-11 11:46:20 -07:00
howard-stearns
551ea921cd Make API asynchronous, for communicating with server 2017-08-11 11:45:40 -07:00
Zach Fox
080c6da71a Get HFC balance from QmlCommerce API 2017-08-11 10:49:11 -07:00
Zach Fox
d2362e6329 addInventoryButton() under setting 2017-08-11 10:31:32 -07:00
Zach Fox
e1064938cd Add inventory; also fix some bugs 2017-08-11 10:31:32 -07:00
SamGondelman
f058781f49 just kidding shared_mutexes are c++17 2017-08-11 10:07:20 -07:00
David Rowe
2bf0ea1dff Fix display artifact that occurs when overlay dimension is 0 2017-08-11 22:31:04 +12:00
David Rowe
a96d9ab85b Apply physics toggle button values 2017-08-11 22:11:34 +12:00
David Rowe
ee225e6a8d Implement toggle buttons 2017-08-11 18:23:20 +12:00
David Rowe
401a00441a Merge branch 'master' into vr-edit-a 2017-08-11 15:26:20 +12:00
David Rowe
c82a4d6d56 Layout mockup of Physics options 2017-08-11 13:15:07 +12:00
Elisa Lupin-Jimenez
6c2bf63392 Back button works 2017-08-10 17:51:19 -07:00
David Rowe
0b063926b6 Move image slider to Color options 2017-08-11 11:41:33 +12:00
Anthony J. Thibault
49adf04913 Added Developer > Avatar > Show Detailed Collision menu option 2017-08-10 16:36:09 -07:00
Elisa Lupin-Jimenez
da5bb03187 Trying to add in a back button 2017-08-10 16:34:37 -07:00
SamGondelman
e4c954e862 merge from master 2017-08-10 16:30:33 -07:00
SamGondelman
353a3e8c68 properly fix AA stenciling 2017-08-10 16:07:40 -07:00
SamGondelman
96b179386f working on fixing non-AA overlays 2017-08-10 16:07:40 -07:00
Brad Davis
26ad79aa01 Merge pull request #11171 from highfidelity/revert-11155-fix_bad_plugins 
Revert "Fix bad plugins causing instant crash on startup"
 2017-08-10 16:05:33 -07:00
Brad Davis
be9c1b0d12 Revert "Fix bad plugins causing instant crash on startup" 2017-08-10 16:05:16 -07:00
Seth Alves
972a24fea9 Merge pull request #11169 from anshuman64/new-branch 
High Fidelity Interface Application Rename
 2017-08-10 15:57:10 -07:00
Anthony J. Thibault
ae98974d79 improve 14-dop generation for avatar joint collision 
Also added debug rendering functionality.
 2017-08-10 15:52:51 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
SamGondelman
d0d5ac8dd1 switch to stl wherever possible, use bitset instead of unsigned ints 2017-08-10 15:33:55 -07:00
David Rowe
821f5de3e3 Further reduce number of Entites.getEntityProperties() calls 2017-08-11 10:20:36 +12:00
Brad Davis
eb143c42d0 Merge pull request #11168 from sethalves/avatar-url-command-line-flag 
cancel effects of --replaceAvatarURL when avatar is changed with preference dialog
 2017-08-10 15:18:21 -07:00
David Rowe
c34344161e Improve App object handling 2017-08-11 10:09:52 +12:00
David Rowe
37f57852da Set hand highlight sphere size from grab radius 2017-08-11 09:56:47 +12:00
Cain Kilgore
4e81ebf85c Added Assets for Web Browser MP Script 2017-08-10 22:53:35 +01:00
Seth Alves
1d07bc3b4e try, try again 2017-08-10 14:32:52 -07:00
David Rowe
badd57c165 Tidying 2017-08-11 09:26:05 +12:00