Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51837 commits 29 branches 0 tags 1.1 GiB
Commit graph

51837 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
b2a35f45db when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3 2017-02-24 13:04:43 -08:00
Seth Alves
6e9854cad0 don't crash if geometry fails to load 2017-02-24 13:01:01 -08:00
Seth Alves
eedc5c1647 don't allow tablet to get stuck to a hand when passing it back and forth between hands 2017-02-24 12:10:52 -08:00
David Kelly
d6f0d8c960 styling changes, first pass 2017-02-24 11:45:03 -08:00
Seth Alves
71ab6a1a84 fix a couple of problems related to grabbing tablet while edit.js is active 
Conflicts:
	scripts/system/controllers/handControllerGrab.js
 2017-02-24 11:38:42 -08:00
Seth Alves
70060eb464 in 2d mode, clicks on tablet don't get used for other things 
Conflicts:
	scripts/system/libraries/entitySelectionTool.js
 2017-02-24 11:37:04 -08:00
Seth Alves
73774a6590 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-24 11:34:59 -08:00
David Rowe
a98824f483 Code review 2017-02-25 08:13:15 +13:00
Howard Stearns
a9b8045697 Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance 
Filter pal by view distance
 2017-02-24 11:10:13 -08:00
David Kelly
d399f648d5 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-02-24 10:32:43 -08:00
David Kelly
2458f95c42 more of a peak loudness with decay, now 2017-02-24 10:31:55 -08:00
humbletim
02827552ae Add EntityScriptServer version of the stampede test 2017-02-24 12:31:18 -05:00
humbletim
c89d203f94 Adapt from std::map locks to simple QHash for flagging busy scriptURLs 2017-02-24 12:27:33 -05:00
sam
5257194c48 SImplify the overlay PLumber 2017-02-24 01:11:59 -08:00
sam
e1aad8bd63 Deep dive into the shape key and filters and the PLumber construction 2017-02-24 00:35:10 -08:00
sam
67031850aa Deep dive into the shape key and filters and the PLumber construction 2017-02-24 00:05:54 -08:00
Menithal
10151c3f5b Added Multi-userdata field updater 2017-02-24 08:04:03 +02:00
David Rowe
d9a716bf3d If someone else is grabbing entity you want to grab show their grab beam 2017-02-24 18:42:52 +13:00
sam
8e122b3357 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-23 21:24:47 -08:00
Menithal
bdf241bafd Merge branch 'master' into grab-clone 2017-02-24 05:43:25 +02:00
David Kelly
4a4c914ca8 First cut at new styling 2017-02-23 18:53:22 -08:00
Brad Hefta-Gaub
60fd4afc4d don't count NoData avatars as having been broadcast, fix avatars slightly out of view from freezing 2017-02-23 18:52:10 -08:00
samcake
6d59144a4f Trying to fix the emissive for overlay in front ? 2017-02-23 17:42:02 -08:00
Andrew Meadows
faa272c67c don't blend animations for otherAvatars 2017-02-23 17:36:45 -08:00
Andrew Meadows
4bbbcb61be expand avatar update time budget 2017-02-23 17:36:45 -08:00
Andrew Meadows
14e7392a89 minor cleanup 2017-02-23 17:36:45 -08:00
Andrew Meadows
0657ca1e5e remove unnecessary context brackets 2017-02-23 17:36:45 -08:00
Andrew Meadows
92a32b4651 remove unused variable 2017-02-23 17:36:45 -08:00
Andrew Meadows
e54812430e avoid unnecessary copy of priority_queue 2017-02-23 17:36:45 -08:00
Andrew Meadows
ee5971c39e no need to calc length of normalized vector 2017-02-23 17:36:45 -08:00
Chris Collins
e723385df2 Merge pull request #9726 from ZappoMan/avatarBandwidthBudgetImprovements 
Avatar bandwidth budget improvements
 2017-02-23 17:12:18 -08:00
humbletim
3ad3fd472e * Inline / duplicate exception checking per CR feedback 
* Coding standards
 2017-02-23 19:46:28 -05:00
Ryan Huffman
efd1a5c600 Update parameter name in getPropertiesForEntities 2017-02-23 16:38:28 -08:00
humbletim
0b73cef252 Add stampede test. 2017-02-23 19:10:44 -05:00
humbletim
1eeb25a9eb Increase deferred batch processing. 2017-02-23 19:09:27 -05:00
Ryan Huffman
0da9f72c42 Update spawn position/rotation of bows in shortbow 2017-02-23 16:05:12 -08:00
Ryan Huffman
4c310e1048 Update shortbow to use spawner entities to specify position/rotation at runtime 2017-02-23 16:02:56 -08:00
Seth Alves
0a2a1b1637 include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet 2017-02-23 15:25:09 -08:00
humbletim
8ab7a8cad5 fix bracket 2017-02-23 18:16:41 -05:00
humbletim
e794b64c31 Add resolvePath and include characterization/unit tests 2017-02-23 18:13:24 -05:00
Seth Alves
a286c72b3b cleanups 2017-02-23 15:12:45 -08:00
humbletim
f82a0196a8 Always consume exceptions thrown by include's 2017-02-23 18:12:12 -05:00
Seth Alves
4600d546c0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-23 14:56:06 -08:00
Seth Alves
9c0104a060 don't use Entities.getEntityProperties on tablet when it's an overlay 2017-02-23 14:55:52 -08:00
Brad Hefta-Gaub
1b7ec7d61e Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2017-02-23 13:50:16 -08:00
Brad Hefta-Gaub
1e91f74ce7 clean up some uneedded nullptr checks, make them asserts 2017-02-23 13:32:35 -08:00
Seth Alves
2c42309aaa perfer tablet over other overlays for mouse-clicks 2017-02-23 13:32:24 -08:00
Andrew Meadows
ed932fead5 Merge pull request #9611 from kunalgosar/AvatarEntityMapMetaObj 
Add QMetaObject for AvatarEntityMap
 2017-02-23 13:27:55 -08:00
Menithal
4d98cc436b Finished up Edit.js 2017-02-23 23:20:21 +02:00
Ryan Huffman
c8ec5cbf5d Fix coding standard issues in shortbow 2017-02-23 13:15:14 -08:00