Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nanna to main #1093

Merged
merged 940 commits into from
Oct 17, 2022
Merged

Nanna to main #1093

merged 940 commits into from
Oct 17, 2022

Conversation

AlvaroHG
Copy link
Collaborator

💣

AlvaroHG and others added 30 commits July 14, 2022 14:11
@AlvaroHG
Remove comments from inputfield
1274a9d
@AlvaroHG
Merge
4c3dcda
@AlvaroHG
Merge branch 'nanna' into nanna-testing
694c586
@AlvaroHG
Testing debug
1a1e5ad
@AlvaroHG
Tests
21b9fe6
@AlvaroHG
Remove camera from Gripper camera
61e4547
@AlvaroHG
removes comments
c30a4fe
@mattdeitke
teleport the agent by default
8087439
@mattdeitke
Merge pull request #1042 from allenai/nanna-teleport
7756157 
teleport the agent by default
@AlvaroHG
Merge pull request #1041 from allenai/nanna-arm-camera-remove
1e6c70b 
Nanna arm camera remove
@mattdeitke
support passing a house into reset
0c426c3
@mattdeitke
createhouse after initialize
391b3fa
@Lucaweihs
Fixing minor merge conflicts related to import order.
ebf9519
@mattdeitke
support gridSize parameter on GetReachablePositions
5f65f63
@winthos
tweaks to stretch prefab to make read/write true for NavMesh compatib…
7d8a1af 
…ility
@winthos
add autoSyncTransform to agent repositioning logic
f44c798
@AlvaroHG
Working python rendering tests
3b05547
@AlvaroHG
Merge branch 'nanna' into nanna-testing
4ebd45f
@AlvaroHG
PR feedback
21d0693
@AlvaroHG
Removed more comments formated ProceduralTemplates
21b5450
@AlvaroHG
Merge
bedfc54
@Lucaweihs
Addressing pr comments.
6303e01
@Lucaweihs
Merge pull request #1043 from allenai/nanna-timeout
79e92c5 
Improvements to how timeouts are handled.
@AlvaroHG
LGTM fix
593676d
@AlvaroHG
LGTM remove
c658efd
@Lucaweihs @winthos
Removing agentControllerType initialization parameter.
ae80ccb 
Co-authored-by: Winson Han <winson.whan@gmail.com>
@AlvaroHG
Merge pull request #1040 from allenai/nanna-testing
243aa90 
Procedural testing
@Lucaweihs
Formatting change to restart build.
076bed1
@AlvaroHG
Api change holes
452f564
@Lucaweihs
Fixes.
def80ab
winthos and others added 28 commits September 27, 2022 16:48
@winthos
Update floorplan28-fixed-obj-poses.json
7c5976d
@AlvaroHG
Updated test rgb
cbdb065
@Lucaweihs
Addressing PR comments.
5676b78
@Lucaweihs
Merge branch 'nanna' of github.com:allenai/ai2thor into nanna-bboxdist
34489ea
@Lucaweihs
Fixing wrong comment character.
55ccf96
@mattdeitke
make tv and stand kinematic
f01960c
@elimvb
Merge pull request #1086 from allenai/nanna-release-api
b9b4e55 
Nanna release api
@winthos
uhhhh
a4b749a 
whitespace change to trigger build
@winthos
Merge branch 'naive-scale' into naive-scale-light
47845d1
@AlvaroHG
Fixes chair position in test
3fbd1a5
@AlvaroHG
Removed reference to missing script
51871f8
@winthos
Merge pull request #1085 from allenai/naive-scale-light
281b26a 
Prep for Light Manager (and other updates)
@mattdeitke
merge nanna-release-api to naive-scale
c9833a5
@Lucaweihs
Merge pull request #1060 from allenai/nanna-bboxdist
8aa4d9a 
New distance functions and improvements to bbox / magnet sphere code.
@mattdeitke
bug fix
64520fc
@elimvb
Merge pull request #1087 from allenai/nanna_chair_007_update
a7333c3 
Nanna chair 007 update
@mattdeitke
pass schema in metadata
50f40ca
@winthos
Update FloorPlan401_physics.unity
abb2dcc 
fix to incorrectly tagged lightray mesh causing it to show up and block visibility when in instance segmentation mode. This fixes issue #1089
@winthos
fix to some receptacle surface meshes
f357daf 
Addresses some inconsistencies noticed via issue #1088, where some receptacle trigger boxes were overlapping oddly with some objects.
@mattdeitke
support randomized smoothness
b760177
@AlvaroHG
Merge branch 'naive-scale' into nanna
95df853
@AlvaroHG
Blank change
52b1250
@winthos
Merge branch 'main' into nanna-main-mergeconflicts
ae2ba80
@winthos
more fixes to merge
378b521
@winthos
fix to test-dev2 dresser
fb4c292
@winthos
Update MirrorMaterial.mat
90afe0f
@winthos
get outa here
fc7e280 
I thought we removed this alreadyyyyyyyyyyy
@winthos
Merge pull request #1094 from allenai/nanna-main-mergeconflicts
fdb56f1 
fixes merge conflicts between nanna and main
@lgtm-com
Copy link

lgtm-com bot commented Oct 14, 2022

This pull request introduces 152 alerts and fixes 19 when merging fdb56f1 into d2b2b54 - view on LGTM.com

new alerts:

  • 50 for Use of default ToString()
  • 42 for Useless assignment to local variable
  • 31 for Dereferenced variable may be null
  • 14 for Module is imported more than once
  • 7 for Unused local variable
  • 3 for Module is imported with 'import' and 'import from'
  • 2 for Variable defined multiple times
  • 2 for Container contents are never accessed
  • 1 for Dereferenced variable is always null

fixed alerts:

  • 9 for Dereferenced variable may be null
  • 8 for Use of default ToString()
  • 2 for Useless assignment to local variable

@winthos winthos merged commit e129a2b into main Oct 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@AlvaroHG @winthos @mattdeitke @Lucaweihs @elimvb