Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 18:16:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49558 commits 74 branches 59 tags 1.2 GiB
Commit graph

2321 commits

Author SHA1 Message Date
howard-stearns
09a57efaf3 checkpoint 2017-01-16 12:47:26 -08:00
howard-stearns
121d79ef36 getting there, but not yet complete 2017-01-13 16:59:51 -08:00
howard-stearns
f6446c6806 minimum entity edit filter 2017-01-13 13:18:24 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
David Rowe
be00730073 Add canWriteAssets method and signal to Entities API 2016-12-14 14:27:55 +13:00
Seth Alves
6fe35ac0da use smart pointers to avoid leaking EntityTreeElementExtraEncodeData 2016-12-12 16:04:41 -08:00
David Rowe
c87149cfc2 Tidying 2016-12-10 12:59:01 +13:00
Faye Li Si Fi
9289dd36d4 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property 2016-12-08 10:50:00 -08:00
Faye Li Si Fi
1fde68c86e better code style 2016-12-07 16:10:03 -08:00
Faye Li Si Fi
b6798adb5c yay 2016-12-07 15:40:37 -08:00
Faye Li Si Fi
0556661d13 getting rid of uneccessary flag, fix formatting, and getting it to work yay 2016-12-07 15:40:21 -08:00
Faye Li Si Fi
0fcb8803b6 attempt to expose last edited property to script 2016-12-07 12:27:31 -08:00
Brad Davis
5cbf7588ac Fixes for building on MSVC 2015 / Qt 5.8 2016-12-02 14:58:09 -08:00
Seth Alves
d2b32c3084 Merge pull request #9057 from druiz17/childParent 
fixed children of parent object not being added back when performing an undo
 2016-12-01 16:59:06 -08:00
Dante Ruiz
348c0c95e5 conforming to coding standard and better variable naming 2016-12-01 22:22:17 +00:00
Chris Collins
942850293e Merge pull request #9105 from druiz17/teleportBug 
Fix for unable to teleport to areas that you should
 2016-12-01 11:35:06 -08:00
Dante Ruiz
0c9cd5803a added descendant checking 2016-12-01 10:54:26 -08:00
Dante Ruiz
c52f893273 isChildOfParent 2016-12-01 10:54:26 -08:00
Dante Ruiz
1b20cc8bd0 more clean up 2016-11-30 18:28:50 +00:00
Dante Ruiz
104cbbff7e clean up 2016-11-30 18:26:06 +00:00
Dante Ruiz
34d24b947e better implementation 2016-11-30 18:03:11 +00:00
Dante Ruiz
daf12047ca removed unnessary comments 2016-11-22 18:55:20 +00:00
Dante Ruiz
2dfb745443 made some chnages 2016-11-22 18:53:03 +00:00
samcake
dfc0b7beac adressed reveiw comments 2016-11-22 10:15:49 -08:00
Dante Ruiz
a176c624ab fixed teleport bug 2016-11-21 23:04:07 +00:00
Dante Ruiz
1ba769b0ef teleportBug 2016-11-21 10:38:20 -08:00
samcake
9031e65aa5 Merge and fix the bug!!! 2016-11-16 19:12:56 -08:00
Dante Ruiz
66ff81f450 Another function name change 2016-11-16 22:32:15 +00:00
Dante Ruiz
9c4ae9df5a function name change 2016-11-16 22:09:22 +00:00
Dante Ruiz
ff7c11d48c Fixed avatar parent delete issue 2016-11-16 13:03:34 -08:00
samcake
982664dac5 Merging with upstream 2016-11-15 18:14:25 -08:00
Brad Hefta-Gaub
84573d373b Merge pull request #9070 from huffman/fix/docs 
Add jsdoc to Camera
 2016-11-15 13:46:16 -08:00
Ryan Huffman
5fd1ae64b0 Begin adding entities jsdoc 2016-11-14 16:54:55 -08:00
samcake
a05e42138c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-14 09:58:12 -08:00
Seth Alves
15c247fc5e quiet warnings 2016-11-11 06:37:22 -08:00
Seth Alves
899dec8b10 Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by 2016-11-11 06:11:49 -08:00
samcake
00addcad9e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-10 17:57:34 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Chris Collins
5b91c8f32b Merge pull request #8984 from sethalves/fix-setLocalJointRotation-name 
fix names of model-entity joint setters
 2016-11-10 13:39:14 -08:00
samcake
784a0540ed Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-10 10:05:03 -08:00
Brad Hefta-Gaub
8758e4a9ba add support for whitelist entity scripts 2016-11-09 19:17:24 -08:00
Seth Alves
51f6b5af78 code review 2016-11-05 10:35:21 -07:00
Seth Alves
339d6a55cf getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation 2016-11-03 10:06:07 -07:00
samcake
6926cd274c Merge with upstream 2016-11-02 18:15:08 -07:00
Seth Alves
844cc03dcb fix names of model-entity joint setters 2016-11-02 10:24:01 -07:00
Seth Alves
9b7086b1fb added EntityItemProperties.merge function. when sending edits for avatar-entities, don't call setProperties on the entity. Fix currentFrame bug in AnimationPropertyGroup::copyToScriptValue 2016-10-17 16:11:37 -07:00
Seth Alves
fe09a1a57c make sure interface accepts server adjustment to lifetime, even for imported entities 2016-10-13 16:45:37 -07:00
Seth Alves
01c1cb328f don't change UNKNOWN_CREATED_TIME to 1 during addition of LAST_EDITED_SERVERSIDE_BUMP 2016-10-13 15:05:13 -07:00