Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 22:49:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
76389 commits 75 branches 59 tags 1.2 GiB
Commit graph

3883 commits

Author SHA1 Message Date
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
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
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
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
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
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