Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35137 commits 2 branches 0 tags 1.1 GiB
Commit graph

35137 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
75dfef067c test script 2015-11-20 14:40:27 -08:00
Anthony J. Thibault
30087ef0bd Removed dead code 2015-11-20 14:37:53 -08:00
James B. Pollack
49e815f3d6 Merge remote-tracking branch 'upstream/master' into bow 2015-11-20 14:33:26 -08:00
Anthony J. Thibault
cb89f09635 Removed EntityRig and AvatarRig. One Rig to rule them all. 2015-11-20 14:27:01 -08:00
Howard Stearns
9673133bf4 whitespace (reduce diffs) 2015-11-20 14:26:37 -08:00
Anthony J. Thibault
a77ea8da43 Removed JointStates! You won't be missed. 2015-11-20 14:15:37 -08:00
howard-stearns
1ddcc62db9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2 2015-11-20 14:05:40 -08:00
Ryan Huffman
784df60a97 Update bullet archive to include CCD+Compound improvements 2015-11-20 13:56:20 -08:00
howard-stearns
6c784256cb final(?) cleanup 2015-11-20 13:51:12 -08:00
David Rowe
c72c6a0a47 Make multiline strings from JavaScript's print() readably in log file 
Addresses quoting of newline characters as "\n" which was introduced in
Qt 5.5.
 2015-11-21 10:44:21 +13:00
Brad Hefta-Gaub
c7673aad4a Merge pull request #6447 from huffman/polyline-texture 
Add texture property to polyline entity type
 2015-11-20 13:31:34 -08:00
Brad Hefta-Gaub
b5d764814c Merge pull request #6450 from birarda/agent-script-fail 
fix for agent script download fail
 2015-11-20 13:29:10 -08:00
Leonardo Murillo
d17bf28bce Merge branch 'master' of github.com:highfidelity/hifi into stack-manager 2015-11-20 15:20:08 -06:00
Leonardo Murillo
9ad865c7f0 checkpoint 2015-11-20 15:19:45 -06:00
Brad Hefta-Gaub
879c42c269 Merge pull request #6451 from jherico/rec5 
Force synchronous loading of clips in JS
 2015-11-20 13:13:34 -08:00
Leonardo Murillo
e17d0b2af3 Bundling and consolidating deployment package 2015-11-20 15:10:56 -06:00
Brad Davis
eef01f8a13 Merge pull request #6443 from ZappoMan/assetJS 
fix crash with no asset server
 2015-11-20 12:58:16 -08:00
Leonardo Murillo
6105191a3f OS X Bundling 2015-11-20 14:45:25 -06:00
Stephen Birarda
b34934b849 resolve conflicts on merge with upstream/master 2015-11-20 11:52:53 -08:00
Brad Davis
cc2a7cbda8 Force synchronous loading of clips in JS 2015-11-20 11:51:08 -08:00
howard-stearns
a366598598 snapshot. It works. 2015-11-20 11:48:44 -08:00
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
Stephen Birarda
cf204ad5b0 cleanup executeScript comment in Agent 2015-11-20 11:44:58 -08:00
Stephen Birarda
aa836aa4b5 add a script request timeout 2015-11-20 11:44:04 -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 Hefta-Gaub
f1badc017b CR feedback 2015-11-20 11:43:50 -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
samcake
14ebb2e609 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-20 11:41:52 -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
Brad Hefta-Gaub
7e9190d0e1 Merge branch 'master' of https://github.com/highfidelity/hifi into assetJS 2015-11-20 11:39:50 -08:00
Stephen Birarda
3b40119992 use Agent session UUID to request script 2015-11-20 11:35:24 -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
Anthony J. Thibault
a4116e633a Removed last consumer of JointState class 
Removed option to render IK constraints used by old animation system
 2015-11-20 11:26:54 -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
Anthony J. Thibault
df7ca3bc38 Rig: getJointRotation and getJointTranslation use _relativePoses 2015-11-20 10:36:40 -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
Anthony J. Thibault
923d60e452 Rig: Bug fix for copyJointsIntoJointData 2015-11-20 10:30:12 -08:00
James B. Pollack
8a65c7a48f draw strings sooner, arrow force squared, disable grab on arrow 2015-11-20 10:26:41 -08:00
Anthony J. Thibault
ad4b8e0001 Avatar transmission fixes, moved JointData into shared 
* Moved JointData into shared library
* added methods to the rig to copy into and out of JointData
* JointData translations must be in meters this is so the
  fixed point compression wont overflow, also, it's a
  consistent wire format.
 2015-11-20 10:24:24 -08:00
James B. Pollack
e41cc0979c Merge branch 'bow' of https://github.com/imgntn/hifi into bow 2015-11-20 10:09:55 -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
Howard Stearns
b5e5adc41e Update for changed target frame period. 2015-11-20 09:51:57 -08:00
Howard Stearns
0f6a37f0f7 remainder->fmod! 2015-11-20 09:49:14 -08:00
Anthony J. Thibault
27685e0425 Bug fixes for other Avatar root translation 2015-11-20 09:33:57 -08:00
Brad Hefta-Gaub
8ba6dfe721 add deprication warning about binary SVOs 2015-11-20 09:29:36 -08:00