Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58344 commits 71 branches 56 tags 1.2 GiB
Commit graph

58344 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Prat
c88082301e Small changes to respect coding rules 2017-08-14 22:43:39 +02:00
Zach Fox
c1d771842d Remove context overlay (if present) when removing entity 2017-08-14 13:37:50 -07:00
David Kelly
803a5c6690 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys 2017-08-14 13:15:04 -07:00
David Kelly
b4b592cc00 one key file with (for now) both public and private keys in there 2017-08-14 12:53:10 -07:00
Zach Fox
a5fc47fc4d Merge pull request #11186 from zfox23/commerce_jsonInventory 
Commerce: Use new JSON inventory format
 2017-08-14 11:59:01 -07:00
Zach Fox
199ba3bff0 Use new JSON inventory format 2017-08-14 11:55:21 -07:00
samcake
f86f22309b fix render.json 2017-08-14 11:31:40 -07:00
samcake
465e390f7b Redisable spectator cam from desktop 2017-08-14 10:49:08 -07:00
samcake
db1536c521 Reactivate watch dog exit 2017-08-14 10:47:58 -07:00
samcake
05b78b0df0 Just fixing the ao combo box field 2017-08-14 10:46:33 -07:00
Zach Fox
b3b118c5f7 Merge pull request #11180 from zfox23/commerce_useAsynchronous 
Commerce frontend now uses asynchronous API
 2017-08-14 09:58:51 -07:00
druiz17
d5644885fa Merge pull request #11177 from anshuman64/icon-rename 
Correct desktop icon name
 2017-08-14 08:55:17 -07:00
Olivier Prat
358373aeac Base gradient size edition works again on Elements enter domain event 2017-08-14 11:41:01 +02:00
Olivier Prat
92d5a0c552 Fixed non working fade invert parameter 2017-08-14 11:21:47 +02:00
Cain Kilgore
619da8c415 Merge branch 'skybox-changer' of https://github.com/CainFoool/hifi into skybox-changer 2017-08-14 05:12:26 +01:00
Cain Kilgore
28c81534c4 Updated Text at Top 2017-08-14 05:11:53 +01:00
Cain Kilgore
185c8da491 Changed 6 to six, cause wording. No functionality changes. 2017-08-12 18:52:54 +01: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
Elisa Lupin-Jimenez
6c2bf63392 Back button works 2017-08-10 17:51:19 -07: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