Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:23:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63855 commits 76 branches 59 tags 1.2 GiB
Commit graph

3588 commits

Author SHA1 Message Date
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar 
Fix for avatars with crooked spine/head when exiting HMD mode
 2018-01-22 11:50:44 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Anthony J. Thibault
cd4d9255bd Added defaultPoseFlags to avatar protocol 
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation.  Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
 2018-01-19 15:34:27 -08:00
Brad Davis
bdfa1273ba Merge remote-tracking branch 'upstream/master' into android 2018-01-18 17:33:10 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702 
Add Window.protocolSignature() as a replacement for location.protocolVersion()
 2018-01-18 15:20:03 -08:00
David Rowe
8c2427dd58 Rename Window.protocolVersion() to Window.protocolSignature() 2018-01-19 09:06:16 +13:00
Atlante45
482ca3f038 Make type name hash static const 2018-01-18 10:28:43 -08:00
Brad Davis
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -08:00
Seth Alves
7af90d5429
Merge pull request #12171 from mnafees/21671 
CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files
 2018-01-17 13:42:47 -08:00
Bradley Austin Davis
9f6c2c3cdd Merge remote-tracking branch 'upstream/master' into android 2018-01-17 11:44:00 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities 
Soft Entities
 2018-01-17 08:02:37 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
David Rowe
2883e24285 Add Window.protocolVersion() as a replacement for location's 2018-01-17 12:00:35 +13:00
David Rowe
f836a5f2b6 Fix typo 2018-01-17 08:06:04 +13:00
Mohammed Nafees
885801c5ca Fix copying to clipboard from JS scripts 2018-01-16 13:17:47 -05:00
David Rowe
02179e3efd Doc review 2018-01-16 17:14:30 +13:00
David Rowe
f319fa70cb Merge branch 'master' into 21679 2018-01-16 16:22:34 +13:00
Brad Davis
30bd8977b7 Remove android specific start address 2018-01-15 15:16:37 -08:00
Dante Ruiz
645f608814 fixing merge conflict 2018-01-15 10:45:51 -08:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
bee869d88e Merge remote-tracking branch 'upstream/master' into android 2018-01-14 13:53:47 -08:00
Anthony J. Thibault
088f227df2 Pass model offset from avatar skeletonModel to attached entity 2018-01-12 10:26:02 -08:00
Nissim Hadar
a1f25bf49c Moved variable setting to outside of loop. 
Added copy of ambient URL.
 2018-01-11 19:35:13 -08:00
Nissim Hadar
4bd09fd9af Corrected default values - for reading legacy content. 2018-01-11 14:53:58 -08:00
David Rowe
309e7f7333 Tidying 2018-01-11 14:48:45 +13:00
Brad Davis
560fd38547 Merge remote-tracking branch 'upstream/master' into android 2018-01-10 17:31:50 -08:00
Brad Davis
97593bc4d8 Fixing compiled resource access 2018-01-10 17:18:12 -08:00
David Rowe
951f52c4b2 Merge branch 'master' into 21679 2018-01-11 13:54:06 +13:00
David Rowe
753bd21e68 location API JSDoc 2018-01-11 13:44:16 +13:00
Brad Davis
2c35242af1 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-10 13:40:12 -08:00
Nissim Hadar
8396997dec Renamed enum element. 2018-01-10 13:35:57 -08:00
Nissim Hadar
c99a936720 Bumped up protocol version. 2018-01-10 11:45:37 -08:00
Dante Ruiz
d0bff29471 fixing merge conflict 2018-01-10 10:11:53 -08:00
Dante Ruiz
c4253f3b3b Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-09 15:31:38 -08:00
Brad Davis
d6dd29b952 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-09 11:43:03 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
Nissim Hadar
7811ddb904 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-08 15:39:09 -08:00
Nissim Hadar
b2b1807490 Changes per code review. 2018-01-08 15:37:06 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646 
Window JSDoc
 2018-01-08 11:53:34 -08:00
Nissim Hadar
a33f3446f6 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-08 11:51:13 -08:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser 
Consistent go to user
 2018-01-07 11:07:39 -08:00
David Rowe
5463f1ae6b Merge branch 'master' into 21646 2018-01-05 16:58:58 +13:00
Nissim Hadar
e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	interface/resources/qml/js/Utils.jsc
 2018-01-04 15:58:08 -08:00
Dante Ruiz
b526842a46 Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-04 14:23:10 -08:00
Atlante45
294a7ca3c6 Make sure the protocol signature still changes 2018-01-04 13:15:01 -08:00
Atlante45
d4a239731c Add Unused packet type back for ICE servers 2018-01-04 13:07:02 -08:00
Atlante45
aec5ab5921 CR 2017-12-29 12:46:52 -08:00
Atlante45
28f164d7e5 Remove legacy jurisdiction code 2017-12-29 12:46:52 -08:00
Dante Ruiz
30bbe6e41b added relayParentJoints property 2017-12-28 15:43:59 -08:00