Seth Alves
9e1bd69af3
Merge pull request #12918 from kitely/fix-addentity-failure
...
Fixed null pointer exception if importing an entity from JSON fails
2018-04-21 18:12:48 -07:00
David Rowe
7087abd201
Merge branch 'master' into 21815
2018-04-21 10:49:56 +12:00
MiladNazeri
7e780ed55a
Merge pull request #12915 from ctrlaltdavid/21849
...
Add Entities materialData JSDoc
2018-04-19 13:49:24 -07:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code
...
Remove dead Octree code
2018-04-19 09:58:20 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
John Conklin II
db99d12736
Merge pull request #12919 from kitely/fix-import-entities-distance
...
Fixed crash when importing entities from JSON multiple times
2018-04-18 11:52:46 -07:00
Clement
2e8a6e1961
Remove more dead octree code
2018-04-17 18:21:51 -07:00
Stephen Birarda
95c172f418
Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66
2018-04-17 15:34:46 -07:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018
...
Discovery: April 2018 (Huge PR; see description)
2018-04-17 15:11:50 -07:00
Oren Hurvitz
3ae65bba15
Fixed crash when importing entities from JSON multiple times
...
This happened because the Clipboard wasn't being completely cleared between uses.
This bug can also manifest in another way (if Interface doesn't crash): the imported entities appear very far away, instead of right in front of the user. This happens for the same reason as the crash: the Clipboard still contains some previously-imported entities. That causes us to calculate the wrong dimensions for the newly-imported entities which is why they are added to the domain far away.
2018-04-17 15:51:41 +03:00
Oren Hurvitz
91e27db9b0
When importing entities from JSON: fixed a null pointer exception if addEntity() failed on any of the entities
2018-04-17 12:32:28 +03:00
David Rowe
f36a5289c9
Add Entities materialData JSDoc
2018-04-17 14:33:11 +12:00
David Rowe
c1ede6ef58
Merge branch 'master' into 21815
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9
Controller API JSDoc
2018-04-17 11:46:40 +12:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801
...
HMD API JSDoc
2018-04-16 11:12:26 -07:00
Zach Fox
071bf35683
Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018
2018-04-16 10:11:44 -07:00
Seth Alves
7f285c5f90
Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal
...
Fix unprotected tree traversals
2018-04-14 14:33:25 -07:00
Seth Alves
0e081a3944
code review
2018-04-13 10:42:22 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate
...
Migrate materials from userData to materialData
2018-04-12 18:24:33 -07:00
John Conklin II
ec10fcb7b7
Merge pull request #12868 from SamGondelman/missingAlpha
...
Fix for missing alpha on server restart
2018-04-12 16:42:34 -07:00
John Conklin II
67a8e6c82e
Merge pull request #12824 from SamGondelman/matFix
...
Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch
2018-04-12 15:30:11 -07:00
John Conklin II
40ae2913eb
Merge pull request #12847 from SamGondelman/clientMat
...
Fix client-only materials on non-avatars
2018-04-12 14:53:34 -07:00
John Conklin II
1834325970
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by
...
set lastEditedBy in local tree whenever a script adds or edits an entity
2018-04-12 13:02:05 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership
...
entity-server will expire stale simulation ownership
2018-04-12 12:04:52 -07:00
John Conklin II
5c26166bd6
Merge pull request #12841 from SamGondelman/simAssert
...
Fix asserts on domain switch
2018-04-11 16:02:45 -07:00
David Rowe
7a9e3388fa
Merge branch 'master' into 21801
2018-04-12 09:48:51 +12:00
SamGondelman
3270409b7b
possible fix for missing alpha on server restart
2018-04-11 14:06:30 -07:00
John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX
...
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
2018-04-11 12:08:35 -07:00
Andrew Meadows
a0f3e3a031
add simulation ownership expiry
2018-04-11 09:40:32 -07:00
Zach Fox
a9b9a1cb10
Commerce: Gifts
2018-04-10 15:54:19 -07:00
Seth Alves
f81836c830
support specification of named landing-points in serverless-domain json files
2018-04-10 14:25:59 -07:00
SamGondelman
bba47ba2b4
materials on client only entities
2018-04-10 11:35:24 -07:00
SamGondelman
8f65813924
fix asserts on domain switch
2018-04-09 17:10:49 -07:00
SamGondelman
9b07880aab
migrate materials from userData to materialData
2018-04-09 12:49:03 -07:00
SamGondelman
5503c7909a
fix materials not disappearing on deletion in certain cases
2018-04-06 15:18:21 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003
...
cleanup around simulation-ownership
2018-04-05 10:58:45 -07:00
Atlante45
895023ca4b
Fix unprotected tree traversals
2018-04-04 14:54:21 -07:00
Seth Alves
2545e67b14
set lastEditedBy in local tree whenever a script adds or edits an entity
2018-04-04 12:27:41 -07:00
Simon Walton
692ccfc09b
Create HIFI_FCDEBUG(_ID) variants that require a category
...
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Seth Alves
db82c464eb
Merge pull request #12741 from ctrlaltdavid/21816
...
Remove Entities.currentAvatarEnergy and related from the API
2018-04-04 08:07:46 -07:00
Andrew Meadows
d57cb0b5d7
use list.empty() instead of comparing list.size()
2018-04-03 22:15:57 -07:00
Andrew Meadows
6d7574cab9
use std::numeric_limtis<uint64_t>::max() instead of -1
2018-04-03 22:13:25 -07:00
Andrew Meadows
70d6aa99e8
more 'const uint64_t&' purges
2018-04-03 21:55:31 -07:00
Simon Walton
7d16ca9c1c
Remove uses of addRepeatedMessageRegex() and its implementation
...
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
Seth Alves
71d6dbf9bf
allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree
2018-04-02 15:52:28 -07:00
Andrew Meadows
5a5376c3d5
untangle 'bidding' from 'owned'
2018-03-30 13:18:32 -07:00
Andrew Meadows
dcf5110caa
clarify hardcoded constant
2018-03-30 13:18:32 -07:00
Andrew Meadows
4e0f307dc0
quint8 --> uint8_t
2018-03-30 13:18:32 -07:00
Andrew Meadows
d6ac294f39
use uint8_t instead of quint8
2018-03-30 13:18:32 -07:00
Andrew Meadows
4501033861
add description of simulation ownership rules
2018-03-30 13:18:32 -07:00
