(blank)  a merged and compilable version
Merge pull request #15 from rangerofthewest/rangerofthewest

Rangerofthewest
Merge remote-tracking branch 'origin/master' into Justp03_testDirtyCacheAgain

Conflicts:
	Pangeo/PangeoClient/src/pangeo/main/Main.java
	Pangeo/PangeoClient/src/pangeo/main/World.java
Make it compilable
eliminate an exception
change back from Chunk to simple Array

Eliminate the Concurrent Exception.

Map come back to finite.   So sad.

After we would change the game to run only on 1 thread, I will implement Chunk again.
Physic engine ver1.00
Physic engine v1.01
(blank)
Files
Files
Phy v1.02 box constructor, more debug info
Phy v1.03 add beveling
Phy v1.04 convert BufferedImage(sprite) to Contour(concave Polygon)
Phy v1.05 simplify polygon
Adding stuff
Merge remote-tracking branch 'origin/rangerofthewest'

Conflicts:

.metadata/.plugins/org.eclipse.core.resources/.projects/PangeoClient/.ma
rkers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/PangeoClient/.sy
ncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	Pangeo/.metadata/.log

Pangeo/.metadata/.plugins/org.eclipse.core.resources/.history/6c/60fa017
027b8001311cfd993b76e95ae

Pangeo/.metadata/.plugins/org.eclipse.core.resources/.projects/PangeoCli
ent/.indexes/e4/6c/73/history.index

Pangeo/.metadata/.plugins/org.eclipse.core.resources/.projects/PangeoCli
ent/.indexes/e4/6c/b9/history.index

Pangeo/.metadata/.plugins/org.eclipse.core.resources/.projects/PangeoCli
ent/.markers

Pangeo/.metadata/.plugins/org.eclipse.core.resources/.projects/PangeoCli
ent/.markers.snap

Pangeo/.metadata/.plugins/org.eclipse.core.resources/.projects/PangeoCli
ent/.syncinfo.snap

Pangeo/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/prop
erties.index

Pangeo/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

Pangeo/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.ecli
pse.core.resources
	Pangeo/.metadata/.plugins/org.eclipse.core.resources/.snap

Pangeo/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse
.ui.ide.prefs
	Pangeo/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Pangeo/.metadata/.plugins/org.eclipse.jdt.core/272178059.index
	Pangeo/.metadata/.plugins/org.eclipse.jdt.core/3000285004.index
	Pangeo/.metadata/.plugins/org.eclipse.jdt.core/3004609673.index
	Pangeo/.metadata/.plugins/org.eclipse.jdt.core/3954040986.index
	Pangeo/.metadata/.plugins/org.eclipse.jdt.core/4249315662.index
	Pangeo/.metadata/.plugins/org.eclipse.jdt.core/765977872.index
	Pangeo/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Pangeo/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	Pangeo/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

Pangeo/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_set
tings.xml
	Pangeo/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	Pangeo/PangeoClient/bin/pangeo/main/Account.class
	Pangeo/PangeoClient/bin/pangeo/main/Main.class
	Pangeo/PangeoClient/bin/pangeo/main/Main.java.orig
	Pangeo/PangeoClient/bin/pangeo/main/MobLoki.java~HEAD

Pangeo/PangeoClient/bin/pangeo/main/MobLoki.java~origin_Justp03_testDirt
yCacheAgain
	Pangeo/PangeoClient/bin/pangeo/main/MobLokiTurret.java~HEAD

Pangeo/PangeoClient/bin/pangeo/main/MobLokiTurret.java~origin_Justp03_te
stDirtyCacheAgain
	Pangeo/PangeoClient/bin/pangeo/main/MobVillager.java~HEAD

Pangeo/PangeoClient/bin/pangeo/main/MobVillager.java~origin_Justp03_test
DirtyCacheAgain
	Pangeo/PangeoClient/bin/pangeo/main/MobXerxon.java~HEAD

Pangeo/PangeoClient/bin/pangeo/main/MobXerxon.java~origin_Justp03_testDi
rtyCacheAgain
	Pangeo/PangeoClient/bin/pangeo/main/Vector2.class
	Pangeo/PangeoClient/bin/pangeo/main/World$Tuple.class
	Pangeo/PangeoClient/bin/pangeo/main/World$WorldChunk.class
	Pangeo/PangeoClient/bin/pangeo/main/World.class
	Pangeo/PangeoClient/bin/pangeo/main/World.java.orig
	Pangeo/PangeoClient/bin/pangeo/main/WorldBlock.class
	Pangeo/PangeoClient/src/pangeo/main/Account.java
	Pangeo/PangeoClient/src/pangeo/main/FTPHandler.java
	Pangeo/PangeoClient/src/pangeo/main/Main.java
	Pangeo/PangeoClient/src/pangeo/main/Main.java.orig
	Pangeo/PangeoClient/src/pangeo/main/MobLoki.java~HEAD
	Pangeo/PangeoClient/src/pangeo/main/MobLokiTurret.java~HEAD

Pangeo/PangeoClient/src/pangeo/main/MobVillager.java~origin_Justp03_test
DirtyCacheAgain

Pangeo/PangeoClient/src/pangeo/main/MobXerxon.java~origin_Justp03_testDi
rtyCacheAgain
	Pangeo/PangeoClient/src/pangeo/main/Util.java
	Pangeo/PangeoClient/src/pangeo/main/Vector2.java
	Pangeo/PangeoClient/src/pangeo/main/World.java
	Pangeo/PangeoClient/src/pangeo/main/World.java.orig
Merge remote-tracking branch 'origin/Justp03_testDirtyCacheAgain'
Merge pull request #17 from rangerofthewest/master

Merge Time