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

54120 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
3f99509a19 check your own location data on failure, and notify if it is wrong 2017-05-02 13:14:38 -07:00
Howard Stearns
d3c9cb9574 standardize data init/clear 2017-05-02 13:14:17 -07:00
Howard Stearns
154af42180 setupCandidate 2017-05-02 13:13:14 -07:00
Howard Stearns
03e929ca18 clarify names, particularly hand vs handString 2017-05-02 13:13:01 -07:00
Howard Stearns
7f120febbd fix that 2017-05-02 13:12:48 -07:00
Howard Stearns
13e10873ce simplify animation load and code 2017-05-02 13:12:33 -07:00
Howard Stearns
e2dd00bdc4 unique message for exceeding poll limit 2017-05-02 13:12:24 -07:00
Howard Stearns
43f8467708 lint 2017-05-02 13:12:09 -07:00
Vladyslav Stelmakhovskyi
b3e078eb74 Trigger rebuild 2017-05-02 13:11:32 -07:00
Vladyslav Stelmakhovskyi
7f1db38390 Renamed EDIT to CREATE 2017-05-02 13:11:23 -07:00
Stephen Birarda
3b5851b7c3 Merge pull request #10326 from huffman/fix/atp-stuck-downloads 
Fix/atp stuck downloads (FOR RC)
 2017-04-28 16:54:18 -07:00
Ryan Huffman
46d4504f15 Fix poorly indented if in AssetRequest 2017-04-28 16:43:11 -07:00
Ryan Huffman
bc89af2842 Fix stuck ATP downloads 
Occasionally ATP requests would get stuck because of a race inside
AssetClient::handleAssetReply. This was more likely to happen to small
resources.
 2017-04-28 16:43:11 -07:00
Stephen Birarda
21bb4080ab Merge pull request #10324 from birarda/upload-new-models-to-entity 
[RC] add an entity file replacement via domain-server content page
 2017-04-28 16:06:01 -07:00
Clément Brisset
2f12031c51 Merge pull request #10322 from Atlante45/RC-38-patch 
[RC-38 patch] Don't save ATP requests to cache if they are range requests
 2017-04-28 15:35:11 -07:00
Stephen Birarda
945952d511 don't save ATP requests to cache if they are range requests 2017-04-28 15:30:14 -07:00
Stephen Birarda
9bc0609b1e address code review comments 2017-04-28 10:17:48 -07:00
Stephen Birarda
038ac745c8 clear domain octree details if ES killed 2017-04-27 17:47:18 -07:00
Stephen Birarda
a21a34a4a4 add entities file replacement to DS and ES 2017-04-27 16:56:27 -07:00
Stephen Birarda
11ed8c9ce1 Merge pull request #10311 from huffman/RC-38-patch 
Fix ResourceCache warning on OSX
 2017-04-27 14:38:49 -07:00
Ryan Huffman
4bc92c025d Fix ResourceCache warning on OSX 2017-04-27 14:01:55 -07:00
Ryan Huffman
aaa4cdb283 Merge pull request #10308 from huffman/RC-38-patch 
Rc 38 patch
 2017-04-27 13:52:15 -07:00
Atlante45
40e9f9025f Load High Mips before Fbx after skybox 2017-04-27 13:46:55 -07:00
Ryan Huffman
16af62b15f Fix NetworkTexture not cleaning itself up on destruction 2017-04-27 13:35:53 -07:00
Ryan Huffman
ae2dc385c3 Fix gpu access of ktx file not being thread-safe 2017-04-27 13:35:52 -07:00
Ryan Huffman
314e2558a4 Fix style in NetworkTexture 2017-04-27 13:35:52 -07:00
Ryan Huffman
ef27d30e85 Fix NetworkTexture self possibly being null when attempting request 2017-04-27 13:35:52 -07:00
Chris Collins
9f688a08cd Merge pull request #10302 from Atlante45/new-master 
Pull stable back into master
 2017-04-27 11:51:46 -07:00
Philip Rosedale
f555291d92 Merge pull request #10296 from Triplelexx/21296 
21296 - Move two menu items
 2017-04-27 11:37:07 -07:00
Atlante45
4e0780387f Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-04-27 11:20:18 -07:00
anshuman64
04f97431f4 Merge pull request #10287 from highfidelity/update-qt-win-build-guide 
Update Build Guides with Qt 5.6.2
 2017-04-27 10:59:16 -07:00
Anshuman Dewangan
521db82ed0 Use generic dir syntax 2017-04-27 10:56:56 -07:00
Seth Alves
0435749f82 Merge pull request #10210 from volansystech/21200 
21200 Transfer from far-grab to near grab when close
 2017-04-27 10:32:10 -07:00
volansystech
87ceebca82 Merge branch 'master' of https://github.com/highfidelity/hifi into 21200 
# Conflicts:
#	scripts/system/controllers/handControllerGrab.js
 2017-04-27 12:58:18 +05:30
Chris Collins
6ecbaff56e Merge pull request #10297 from ZappoMan/retrySkeletonURL 
format and spelling changes
 2017-04-26 21:58:51 -07:00
ZappoMan
bc2f893294 format and spelling changes 2017-04-26 21:47:54 -07:00
Chris Collins
df7cb09fe4 Merge pull request #10255 from ZappoMan/retrySkeletonURL 
Fix two cases for avatars stuck in T-Pose
 2017-04-26 21:38:19 -07:00
Chris Collins
b2870be25c Merge pull request #10256 from jherico/fix_stored_size 
Fix excessive copying when querying the size of a KTX backed texture
 2017-04-26 21:31:19 -07:00
ZappoMan
3e766675c5 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 21:05:28 -07:00
Seth Alves
60453f8748 Merge pull request #10294 from ctrlaltdavid/record-for-marketplace 
Make record script able to be put on the marketplace
 2017-04-26 19:34:39 -07:00
Triplelexx
a154879001 change menu item text Audio Noise Reduction to Noise Reduction 2017-04-27 03:25:24 +01:00
Triplelexx
f9c6cb27f4 change menu item for avatar collisions to "Collide with world" 2017-04-27 03:16:04 +01:00
Brad Davis
7be40a48a1 Merge branch 'master' into fix_stored_size 2017-04-26 19:08:04 -07:00
ZappoMan
76902b15d3 remove one last debug log 2017-04-26 18:51:41 -07:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62 remove debugging code 2017-04-26 18:36:44 -07:00
Ryan Huffman
ac0a738945 Merge pull request #10261 from Atlante45/feat/progressive-load-ktx 
Add progressive load for KTX textures
 2017-04-26 18:36:01 -07:00
Ryan Huffman
60ba874e2e Fix implementation of mutableData in non-File Storage classes 2017-04-26 18:02:23 -07:00
ZappoMan
a26dca73b1 more logging 2017-04-26 18:02:09 -07:00
Ryan Huffman
f5b7feccde Update AssetClient/Request to use const byteRange 2017-04-26 18:01:56 -07:00