Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 11:34:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
78843 commits 76 branches 59 tags 1.2 GiB
Commit graph

3982 commits

Author SHA1 Message Date
Howard Stearns
c9b79b24e3 track nonces by entity id instead of by cert 2019-03-26 15:23:13 -07:00
Howard Stearns
be74218d93 eliminate copy of hash table 2019-03-26 12:05:10 -07:00
Howard Stearns
91a165b4c3 separate out the certified entity map stuff (no-op refactor) 2019-03-26 11:49:08 -07:00
Howard Stearns
02129e0543 no-op refactor in prep for multiple entities per cert 2019-03-25 16:14:48 -07:00
Sam Gondelman
40f5a0263c
Merge pull request #15201 from SamGondelman/emit 
Case 21756: Entities.emitScriptEvent works now
 2019-03-21 18:05:17 -07:00
SamGondelman
3ff0770441 model emitters! 2019-03-20 21:25:14 -07:00
Andrew Meadows
9d11e44b4b update AvatarEntity trait when parentID changes 2019-03-20 11:37:16 -07:00
SamGondelman
194008c77a box shapeType 2019-03-19 14:14:37 -07:00
SamGondelman
432a3f1610 uniform sampling of ellipsoid points 2019-03-19 12:59:03 -07:00
SamGondelman
ea50133146 working on adding particle shape types 2019-03-18 12:05:17 -07:00
SamGondelman
d4e1ec9741 fix emitScriptEvent 2019-03-15 16:20:01 -07:00
SamGondelman
83bac723ef fix wearable duplication on domain switch 2019-03-15 13:38:25 -07:00
Shannon Romano
c0240d2431
Merge pull request #14932 from AndrewMeadows/allow-kinematic-mesh 
Case 21227: don't enforce MOTION_TYPE_STATIC on mesh shapes
 2019-03-11 15:33:32 -07:00
Roxanne Skelly
e94d248ac5
Merge pull request #15126 from howard-stearns/domainUnlimited 
unlimited certified copies in a domain
 2019-03-08 10:23:42 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo 
Case 21603: Tablet x button is nearly impossible to hit with stylus
 2019-03-07 16:03:13 -08:00
Howard Stearns
d309995aef spell domainUnlimited right, and track challenges so that we don't reap 2019-03-07 14:48:57 -08:00
John Conklin II
abb61b7e90
Merge pull request #15124 from SamGondelman/shapes 
Case 21605: Fix shapes app and debugAvatarMixer
 2019-03-07 11:07:45 -08:00
Shannon Romano
d11c04a19d
Merge pull request #15117 from SamGondelman/wearables 
Case 21596: Fix wearable scale on position change
 2019-03-07 10:29:47 -08:00
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -08:00
Sam Gondelman
dc4e2645da
even better! 2019-03-07 08:05:32 -08:00
SamGondelman
380df059ff fix shapes app 2019-03-06 18:18:39 -08:00
danteruiz
a0bd2f67ec fix stylus gizmo intersection 2019-03-06 17:20:36 -08:00
SamGondelman
0f3e1b9157 fix wearable scale on position change 2019-03-06 14:53:21 -08:00
Roxanne Skelly
a54171d60c
Merge pull request #15104 from roxanneskelly/79hero-master 
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
 2019-03-06 13:06:45 -08:00
Shannon Romano
4f3d593d90
Merge pull request #15072 from SamGondelman/clear 
Case 11775: Don't clear my avatar entities on domain switch
 2019-03-05 15:42:51 -08:00
Roxanne Skelly
fae6393663 Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42' 2019-03-05 15:11:25 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Sam Gondelman
94cc5b83ac
Merge pull request #15088 from SamGondelman/create 
Case 21541: Fix mouse on create in HMD
 2019-03-05 13:07:49 -08:00
amer cerkic
fab343a1d4 correcting spacing 2019-03-05 10:52:54 -08:00
amer cerkic
36e9c604e9 fixed based on comment 2019-03-05 10:45:15 -08:00
amer cerkic
29a308dcaa adding modelScale initialization so that it does not fail the validScale check assert 2019-03-05 10:07:33 -08:00
SamGondelman
f2c248c0a2 disable href and entity script events when in edit mode 2019-03-04 17:10:20 -08:00
Simon Walton
83c9381575 Convert avatarPriority to trivalued (inherit, crowd, hero) 
Also tweaks from original reviewer comments.
 2019-03-01 17:25:46 -08:00
SamGondelman
3e6061e435 try to not clear my avatar entities on domain switch 2019-03-01 13:45:00 -08:00
Shannon Romano
33e061b09b
Merge pull request #15022 from danteruiz/fix-tablet-scaling 
Case 21424: Tablet does not properly resize when scaling avatar.
 2019-03-01 09:37:47 -08:00
Shannon Romano
d68f82eb7d
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities 
Case 21494: Avoid mem leaked entities
 2019-03-01 09:34:20 -08:00
Andrew Meadows
8a7853a701 remove crufty comment 2019-02-28 14:38:13 -08:00
Andrew Meadows
33d6e2ce3b avoid mem-leaked entities when clearing tree 2019-02-28 14:21:35 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
Simon Walton
17c0e40347 Add ability to filter on zone-type with JSON filter 2019-02-27 16:42:36 -08:00
SamGondelman
4d591e0624 fix web interaction and debug print filling logs 2019-02-26 16:30:31 -08:00
Simon Walton
d6f755955d Add _avatarPriorityChanged to EntityItemProperties::markAllChanged() 2019-02-25 16:24:12 -08:00
Simon Walton
e5091e7f59 Fixes for EntityItem contains test, add MixerAvatar class and use in sort 2019-02-25 15:44:52 -08:00
Simon Walton
16bc667b95 Looks like serialization order must be same a flag enum order!? 
Also resuscitate EntityItem debug dumps.
 2019-02-22 18:17:30 -08:00
Shannon Romano
5f99158c25
Merge pull request #14977 from SamGondelman/rot 
Case 21354: Add "modelScale" property to fix pal
 2019-02-22 16:36:17 -08:00
SamGondelman
6d6cd42adb fix bound scaling 2019-02-22 12:00:00 -08:00
SamGondelman
544f54e69a fix model scale 2019-02-21 14:10:36 -08:00
SamGondelman
4fdf556d5d fix billboard mode in secondary camera 2019-02-21 10:29:21 -08:00
SamGondelman
c8ffb130a3 only update sub items on change 2019-02-19 17:38:47 -08:00
Simon Walton
8033e93eda Add avatar-priority boolean to zone entities 
RC-79 version
 2019-02-19 17:38:37 -08:00
SamGondelman
6765268998 Merge remote-tracking branch 'upstream/master' into wearables 2019-02-19 16:52:00 -08:00
SamGondelman
06ac2b291b attachments and wearables cull with avatar parent 2019-02-17 17:52:10 -08:00
Andrew Meadows
2fdc9bce77 remove velocity restrictions on SHAPE_TYPE_STATIC_MESH 2019-02-15 16:59:18 -08:00
SamGondelman
c92b82e744 merge with master 2019-02-15 12:43:30 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
SamGondelman
25b31cfc72 merge with master 2019-02-15 11:08:24 -08:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode 
Case 20962: Billboard mode improvements
 2019-02-14 17:44:48 -08:00
Sam Gateau
6168001ad4
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80 
Case 21159: fixes for more grab bugs
 2019-02-14 16:52:03 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
SamGondelman
bed2732d34 start moving materials to rendering only 2019-02-14 12:59:16 -08:00
SamGondelman
dd0d7f0118 merge with master 2019-02-14 09:57:13 -08:00
Andrew Meadows
72b5fa1968
Merge pull request #14857 from Atlante45/fix/ess-parenting 
Case 15420: Fix ESS sometimes not getting the parents/children of entities with scripts.
 2019-02-13 17:26:57 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
SamGondelman
3f8bfc5475 CR and fix deadlock 2019-02-13 16:19:39 -08:00
Andrew Meadows
ed8481ead9 fix grab bugs 2019-02-12 14:04:56 -08:00
Andrew Meadows
9f9f512c59 undoing markDirty() overhead because _flags is atomic 2019-02-12 13:22:22 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
Andrew Meadows
ff746c3141 flag collision group/mask dirty after grab 2019-02-11 12:19:33 -08:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
John Conklin II
851b968501
Merge pull request #14737 from SamGondelman/zone 
Case 19291: Fix zone bugs
 2019-02-08 14:07:26 -08:00
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08:00
Jeff Clinton
54109deab9
Merge pull request #14825 from SamGondelman/fall 
Case 20829: Always fall when flying is not allowed
 2019-02-07 14:39:46 -08:00
John Conklin II
dda310c0b9
Merge pull request #14835 from SamGondelman/textures 
Case 20944: Fix Model textures property
 2019-02-07 14:19:01 -08:00
SamGondelman
e74ff18bef Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:48:13 -08:00
Jeff Clinton
2c666aed5e
Merge pull request #14821 from SamGondelman/owningAvatarID 
Case 20932: Fix getEntityProperties
 2019-02-06 14:43:31 -08:00
Sam Gateau
9ff9117a34
Merge pull request #14811 from jherico/feature/quest_frame_player 
Case 20884: Quest frame player and Oculus libraries
 2019-02-06 13:15:39 -08:00
Clement
8b32a62e2f Simplify filter check 2019-02-05 17:03:19 -08:00
Clement
5945823606 Honor full scene resends 2019-02-05 17:03:19 -08:00
SamGondelman
31cf623252 fix keyboard focus 2019-02-04 12:44:04 -08:00
SamGondelman
17cafe7cce fix getEntityProperties 
(cherry picked from commit 6e61c02d04)
 2019-02-04 10:41:10 -08:00
SamGondelman
4b406bf41c fix getEntityObject and tablet highlighting (Overlays.findOverlays) 2019-02-01 16:23:06 -08:00
SamGondelman
50bfe84aa7 fix keyboard intersection, laser alpha 2019-02-01 12:11:00 -08:00
SamGondelman
0955512a80 add billboard mode to web entities and fix picking/culling 2019-01-31 15:45:10 -08:00
SamGondelman
ee1552661c fix textures 2019-01-31 12:04:46 -08:00
SamGondelman
2d0c1184e4 only domain zone entities control flying and ghosting 2019-01-30 18:27:17 -08:00
SamGondelman
6e61c02d04 fix getEntityProperties 2019-01-30 17:17:39 -08:00
Brad Davis
8a1a55189a CMake cleanup and modernization 2019-01-30 16:23:14 -08:00
Seth Alves
3ab2db96b6 deactivate grab action when grab is released 2019-01-30 14:43:11 -08:00
SamGondelman
57ee9786af fix picks vs. local entities 2019-01-30 11:42:05 -08:00
SamGondelman
a8dbe5e761 working on build errors 2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a showKeyboardFocusHighlight + fixes 2019-01-28 20:43:47 -08:00
SamGondelman
7b88efa42c trying to fix web surfaces?? 2019-01-28 18:29:09 -08:00
SamGondelman
0d1e4bed66 merge with master 2019-01-28 18:13:05 -08:00
Sam Gondelman
faeb5b36dc
Merge pull request #14764 from SamGondelman/NOverlays12 
Case 20722: Ring Gizmo Entities to replace Circle Overlays
 2019-01-28 18:09:23 -08:00
Shannon Romano
607ce00713
Merge pull request #14766 from AndrewMeadows/grab-it 
case 20701: fixes for grab
 2019-01-28 15:57:36 -08:00
SamGondelman
445608e163 fix entity selection tool 2019-01-28 15:30:19 -08:00
SamGondelman
2db45b3ec9 dante's keyboard changes + getProperty + some fixes 2019-01-28 14:03:43 -08:00
SamGondelman
13cb70a6a5 Merge remote-tracking branch 'upstream/master' into NOverlays12 2019-01-28 11:37:15 -08:00