Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-28 20:10:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75029 commits 25 branches 28 tags 1.2 GiB
Commit graph

75029 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Conklin II
ed4f2d9c10
Merge pull request #14439 from AndrewMeadows/shaped-zones 
Case 15518: shaped zones
 2019-01-08 09:06:45 -08:00
Antonina Savinova
a9bec719d6
Merge pull request #14668 from SamGondelman/crashFix 
Fix crash
 2019-01-07 18:16:33 -08:00
SamGondelman
f60b272f11 fix crash 2019-01-07 17:24:07 -08:00
Sam Gondelman
2c0b2e13ab
Merge pull request #14665 from SamGondelman/exportFix 
Case 20533: Fix export entities
 2019-01-07 15:47:01 -08:00
Sam Gondelman
1fe62ecb10
Merge pull request #14657 from SamGondelman/propFix 
Case 20504: Trying to fix avatar entity issue
 2019-01-07 15:37:52 -08:00
John Conklin II
edd329c601
Merge pull request #14663 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch 
MS20142 - CreateApp - Fix active colorPicker to update on selection update
 2019-01-07 15:00:36 -08:00
Sam Gondelman
db3187ec6c
Merge branch 'master' into propFix 2019-01-07 14:57:38 -08:00
Adam Smith
7e75ed5daa
Merge pull request #14586 from SamGondelman/NOverlays8 
Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera
 2019-01-07 14:53:27 -08:00
SamGondelman
791257bd0a convert old created to quint 2019-01-07 14:17:01 -08:00
SamGondelman
62dbca6ce7 fix export entities 2019-01-07 14:08:52 -08:00
SamGondelman
4210d4a7cd write created as quint64 2019-01-07 13:24:38 -08:00
SamGondelman
fa66ed766d one more try 2019-01-07 12:31:52 -08:00
Thijs Wenker
7823b3d4a3 clarifying comments 2019-01-07 21:08:41 +01:00
SamGondelman
5cded6938b possible fix for texture path 2019-01-07 11:55:34 -08:00
Thijs Wenker
7d9cad3e8e CreateApp - Fix active colorPicker to update on selection update 2019-01-07 20:35:09 +01:00
SamGondelman
d57e3b57aa possible fix for created to/from string 2019-01-07 11:10:36 -08:00
Shannon Romano
8acae02203
Merge pull request #14660 from thoys/feat/create/newFirstClassImageProperties 
MS20170: Update Image/Text Entity properties in Create with new properties
 2019-01-07 10:45:15 -08:00
Shannon Romano
963bbbad19
Merge pull request #14661 from danteruiz/grabbing-web-entites 
allow mouse pointer to pick against collidable entities
 2019-01-07 10:24:48 -08:00
Shannon Romano
6eaec12df7
Merge pull request #14658 from Atlante45/feat/stats 
Only keep aggregated thread stats for Avatar Mixer
 2019-01-07 10:17:26 -08:00
Dante Ruiz
4b99a795dd code review changes 2019-01-07 09:09:35 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption 
Add menu checkbox to toggle collisions with other avatars
 2019-01-07 08:58:09 -08:00
NissimHadar
e134e0dd3f
Merge pull request #14644 from NissimHadar/20339_nitpick_v1.3 
Case 20339 - nitpick v1.3.1
 2019-01-07 08:53:37 -08:00
Andrew Meadows
5c750b40c9 fix copy-n-paste errors in EntityItem::contains() for cylinders 2019-01-05 08:03:29 -08:00
Dante Ruiz
0dc5e7743f allow mouse pointer to pick against collidable entities 2019-01-04 17:49:38 -08:00
Thijs Wenker
26f46e87a3 new property tooltips 2019-01-05 02:16:12 +01:00
luiscuenca
2a367509cd Fix warnings 2019-01-04 18:02:18 -07:00
Thijs Wenker
48dc7ee938 New color/text entity properties 2019-01-05 01:56:28 +01:00
SamGondelman
b5b7574c48 set created 2019-01-04 16:52:11 -08:00
Shannon Romano
4e5d275768
Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager 
MS19925: Avatar Packager
 2019-01-04 16:22:06 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Jamil Akram
81b770e9f2
Merge pull request #14641 from jherico/fix/android_build_master 
Fix version code for android APKs
 2019-01-04 15:28:34 -08:00
Thijs Wenker
b0db81b861 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-05 00:01:25 +01:00
Thijs Wenker
94146ab997 CR fixes 2019-01-04 23:59:22 +01:00
Clement
cfbb4e29d1 Only keep aggregated thread stats 2019-01-04 14:51:58 -08:00
Ryan Huffman
7433870c2f Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-04 14:43:46 -08:00
Thijs Wenker
5d40e1e480 - CR/style fixes 
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
 2019-01-04 23:39:04 +01:00
Shannon Romano
9855e9bee8
Merge pull request #14650 from NissimHadar/20301-addPlatformInfo 
Case 20301 - add platform info
 2019-01-04 14:37:17 -08:00
SamGondelman
1452d237e2 trying to fix avatar entity issue 2019-01-04 14:34:46 -08:00
Shannon Romano
10e969f790
Merge pull request #14653 from dback2/avatarExporterUpdates 
Avatar Exporter - reference thumb rotations
 2019-01-04 14:34:08 -08:00
Shannon Romano
3faf12b141
Merge pull request #14637 from howard-stearns/data-url-for-web-entity 
data url for web entity
 2019-01-04 14:21:55 -08:00
Ryan Huffman
63172ec87b Fix marketplace item update failing on submitted items 2019-01-04 14:21:10 -08:00
Andrew Meadows
3303bb7017 EntityServer now depends on ModelFormatRegistry 2019-01-04 12:38:32 -08:00
Andrew Meadows
13a3982b5a fix ZoneEntityItem::contains() for model shapes 2019-01-04 12:38:32 -08:00
Andrew Meadows
a642af23b7 enable shapeType=ellipsoid and expose zone shapeType to UI 2019-01-04 12:37:23 -08:00
Andrew Meadows
a656ea723e special handling of SPHERE case in EntityItem::contains() 2019-01-04 12:37:23 -08:00
Andrew Meadows
65e920039c cleaner return logic for EntityItem::contains() cylinder cases 2019-01-04 12:37:23 -08:00
Andrew Meadows
7625aebaa8 remove reduntant model-networking link dependency 2019-01-04 12:37:23 -08:00
Andrew Meadows
a8325b5c00 add ZoneEntityItem::contains() and support for shapes 2019-01-04 12:37:23 -08:00
Andrew Meadows
bb15b3a5d5 remove ShapeInfo::contains() which was a Bad Idea 2019-01-04 12:37:23 -08:00
Andrew Meadows
b480720409 proper shape support for EntityItem::contains(point) 2019-01-04 12:37:23 -08:00