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

34754 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
c22d632c3a Merge pull request #6446 from jherico/rec4 
Support writing a clip to a qbytearray
 2015-11-20 11:45:39 -08:00
Clément Brisset
c45fe5caae Merge pull request #6440 from cozza13/20741 
CR for Job #20741 - Change default
 2015-11-20 11:43:57 -08:00
Brad Davis
a356f96a7b Merge pull request #6448 from ZappoMan/messaging 
fix senderID in messages, dry up code
 2015-11-20 11:42:30 -08:00
Clément Brisset
f4b0492b33 Merge pull request #6436 from birarda/ghost-avatar 
fix for ghosted avatars thanks to check/add race
 2015-11-20 11:41:20 -08:00
samcake
c6aa04ac42 Merge pull request #6415 from EdgarPironti/record_branch 
DO NOT MERGE - Migration of AC playback
 2015-11-20 11:30:59 -08:00
Brad Hefta-Gaub
7441e20f58 cleanup 2015-11-20 11:20:36 -08:00
Brad Hefta-Gaub
caa8b0b5b6 fix unix build 2015-11-20 11:07:01 -08:00
Stephen Birarda
9b5bfd45bc change lock back to locker to remove change 2015-11-20 11:04:46 -08:00
Stephen Birarda
19d3d80ff9 fixes for some incorrect assumptions 2015-11-20 11:03:52 -08:00
Brad Hefta-Gaub
4bbfcb6092 Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-20 10:30:38 -08:00
Brad Hefta-Gaub
e530aa6545 don't assert on sender mismatch 2015-11-20 09:58:28 -08:00
Brad Hefta-Gaub
0e5e33446e handle old protocol case 2015-11-20 09:57:30 -08:00
Seth Alves
00c8ccb6b0 Merge pull request #6449 from ZappoMan/removeSVO 
add deprecation warning about binary SVOs
 2015-11-20 09:52:52 -08:00
Brad Hefta-Gaub
8ba6dfe721 add deprication warning about binary SVOs 2015-11-20 09:29:36 -08:00
Brad Hefta-Gaub
abf169ebd9 fix senderID in messages, dry up code 2015-11-20 09:03:21 -08:00
Brad Davis
5adcbcaf5f Support writing a clip to a qbytearray 2015-11-19 20:23:50 -08:00
EdgarPironti
e267926725 JSON computing 2015-11-19 20:04:04 -08:00
EdgarPironti
d75209cb37 Fixes to clip_url overwriting 2015-11-19 20:04:03 -08:00
EdgarPironti
fb90ffec5c Migration of AC playback 2015-11-19 20:04:03 -08:00
Brad Hefta-Gaub
e6db72c887 Merge pull request #6437 from imgntn/grasp_equip 
Grasp hands when equipping entities
 2015-11-19 18:28:44 -08:00
Brad Hefta-Gaub
a59dc6a423 Merge pull request #6419 from imgntn/betterbubbles 
Improvments to Bubblewand
 2015-11-19 18:26:59 -08:00
Brad Hefta-Gaub
ce9c3f1969 Merge pull request #6433 from AlessandroSigna/groupRecording 
cleanup directory + recording bug fix
 2015-11-19 18:26:33 -08:00
Chris Collins
7f8274f58f removed omnitool 
removed omnitool
 2015-11-19 18:08:12 -08:00
samcake
732c911fd7 Merge pull request #6439 from ZappoMan/assetJS 
add Assets.uploadData() and Assets.downloadData()
 2015-11-19 17:56:10 -08:00
Brad Hefta-Gaub
f80a765a29 add Assets.uploadData() and Assets.downloadData() 2015-11-19 17:28:20 -08:00
samcake
c9f7bffd36 Merge pull request #6435 from jherico/dargo 
Load recorded clips from URLs, not file paths
 2015-11-19 16:29:50 -08:00
Stephen Birarda
22f5d4df6d change signature of copy return 2015-11-19 16:25:33 -08:00
Stephen Birarda
430cb7876d remove a couple of read lockers for AvatarHashMap 2015-11-19 16:22:56 -08:00
James B. Pollack
6f76f0cbc0 release grasp at cleanup 2015-11-19 16:22:54 -08:00
James B. Pollack
3f89d73fc6 add grasp to equip and example 2015-11-19 16:15:34 -08:00
Stephen Birarda
40397add43 fix for extra adds in AvatarManager 2015-11-19 16:15:21 -08:00
Brad Davis
e187aaedcb Load recorded clips from URLs, not file paths 2015-11-19 15:56:37 -08:00
Stephen Birarda
6398a922c6 leverage COW for AvatarHash 2015-11-19 15:43:29 -08:00
Stephen Birarda
5140a480a1 fix for recursive write then read lock 2015-11-19 15:35:41 -08:00
Stephen Birarda
2a05ec650b fix locking in AvatarHashMap/AvatarManager 2015-11-19 14:17:48 -08:00
Philip Rosedale
f1b5589813 Merge pull request #6434 from AndrewMeadows/another-reset 
fix avatar reset
 2015-11-19 13:37:06 -08:00
U-GAPOS\andrew
28e349f421 remeasure sensor after recentering 2015-11-19 10:43:40 -08:00
U-GAPOS\andrew
b7f501c0b3 use glm::quat_cast instead of extractRotation() 2015-11-19 10:42:53 -08:00
Seth Alves
0df37612a6 Merge pull request #6428 from birarda/goodbye-to-interested 
only send node disconnect packet to interested types
 2015-11-19 10:38:57 -08:00
Seth Alves
2c1ca526df Merge pull request #6423 from ZappoMan/messaging 
add an example of an entityScript that subscribes to messages
 2015-11-19 10:32:36 -08:00
Seth Alves
2938f0d835 Merge pull request #6421 from ZappoMan/outOfOrderDelete 
Possible fix to abandoned lines/entities
 2015-11-19 10:26:14 -08:00
Brad Hefta-Gaub
e318537af4 Merge pull request #6425 from birarda/handshake-ds-settings 
fix case where servers could run without settings
 2015-11-19 10:10:28 -08:00
Seth Alves
98073de0b8 Merge pull request #6426 from ZappoMan/entitiesFileDownload 
implement support to download the persist file from entity server status page
 2015-11-19 09:47:10 -08:00
AlessandroSigna
b4f9c4158f cleanup directory + bug fix 2015-11-19 09:45:28 -08:00
Brad Hefta-Gaub
45e8ebbe8c Merge pull request #6432 from huffman/lod-range 
Increase available range in LOD Tools
 2015-11-19 09:40:10 -08:00
Ryan Huffman
f523cad0a9 Add lodTest.js for testing LOD settings 2015-11-19 09:24:29 -08:00
Ryan Huffman
8adf456b91 Update range of LOD to go up to 20:2 2015-11-19 08:52:57 -08:00
samcake
90ee205a66 Merge pull request #6429 from ZappoMan/samConditionalLove 
make preferences dialog resizable
 2015-11-18 18:07:07 -08:00
Brad Hefta-Gaub
dc093159a1 make preferences dialog resizable 2015-11-18 17:54:51 -08:00
samcake
74beeefe06 Merge pull request #6420 from jherico/dargo 
Make recording and playback work in interface, playback in agent
 2015-11-18 17:52:09 -08:00