Skip to content

Commit

Permalink
Merge branch 'master' into changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jzkelter authored May 26, 2024
2 parents e476e86 + 973b5fc commit 5a12d4c
Show file tree
Hide file tree
Showing 587 changed files with 2,227 additions and 1,589 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ target/
/Sample Models/Biology/Evolution/Altruism.png
/Sample Models/Biology/Evolution/Anisogamy.png
/Sample Models/Biology/Evolution/Bacterial Infection.png
/Sample Models/Biology/Evolution/Baldwin Effect.png
/Sample Models/Biology/Evolution/Bug Hunt Camouflage.png
/Sample Models/Biology/Evolution/Bug Hunt Speeds.png
/Sample Models/Biology/Evolution/Cooperation.png
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Airplane Landing Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Bouncing Balls Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Hill Climbing Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Neighborhoods Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
paint-neighbors
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Network Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Shapes Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Spherical Path Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
repeat 75 [ go-distance ]
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Three Loops Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Trails Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Turtle Dance Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Code Examples/Turtle Perspective Example 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
@#$#@#$#@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup-uniform
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/DLA 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
set use-whole-world? false
setup
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Fireworks 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
set trails? true
set fireworks 30
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Flocking 3D Alternate.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
watch turtle 0
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Flocking 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
repeat 400 [ go ]
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Follower 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
follow one-of turtles
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/GasLab/GasLab Free Gas 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
set trace? false
setup
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/GasLab/GasLab Single Collision 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/GasLab/GasLab Two Gas 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Hydrogen Diffusion 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Life 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup-normal
repeat 20 [ go ]
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Mousetraps 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
set power 0.35
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Percolation 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
repeat world-depth - 1 [ go ]
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Preferential Attachment 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
set layout? false
setup repeat 175 [ go ]
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Raindrops 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Rope 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
set y-frequency-green 20
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Sand 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
repeat 200 [ go ]
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Sandpile 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
fill-world
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Sierpinski Simple 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup repeat 7 [ go ]
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Sunflower 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
repeat 350 [ go ]
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Surface Walking 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Termites 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Tree Simple 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion 3D/Sample Models/Wave Machine 3D.nlogo3d
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 3D 6.3.0
NetLogo 3D 6.4.0
@#$#@#$#@
setup
setxyz -2 -30 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 6.3.0
NetLogo 6.4.0
@#$#@#$#@
setup-full repeat 150 [ go ]
@#$#@#$#@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 6.3.0
NetLogo 6.4.0
@#$#@#$#@
set population 200
setup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 6.3.0
NetLogo 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 6.3.0
NetLogo 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 6.3.0
NetLogo 6.4.0
@#$#@#$#@
@#$#@#$#@
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion Code Examples/3D Shapes Example.nlogo
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 6.3.0
NetLogo 6.4.0
@#$#@#$#@
need-to-manually-make-preview-for-this-model
@#$#@#$#@
Expand Down
2 changes: 1 addition & 1 deletion Code Examples/Ask Ordering Example.nlogo
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ false
Polygon -7500403 true true 270 75 225 30 30 225 75 270
Polygon -7500403 true true 30 75 75 30 270 225 225 270
@#$#@#$#@
NetLogo 6.3.0
NetLogo 6.4.0
@#$#@#$#@
setup
@#$#@#$#@
Expand Down
Loading

0 comments on commit 5a12d4c

Please sign in to comment.