disable Enumerations.java until awk script is fixed for mawk
oops, remove debug target
test one hypothesis for 3387 (no '#')
Merge branch 'develop' of github.com:spring/spring into develop
fix init order
AAI: add safety checks / asserts
Fix crash caused by comparing strings with numbers
AAI: additional assert / fix param type
CollisionHandler: block transporter->transportee collisions & move most likely exit condition to top
transporter<-transportee was already handled, just added the other way around too
fix #3386
fix some logic errors in GMT::HandleStaticObjectCollision
fix #3387 (QTPFS memory corruption)
was only happening on 32-bit builds due to alignment differences
get rid of QTPFS_WEIGHTED_HEURISTIC_COST since it never worked

unrelated minor GMT change: make hovers with non-zero waterline transition into/out of water smoothly
Merge pull request #47 from DeadnightWarrior/DnW

Fix crash caused by comparing strings with numbers
replace f8c99edb's dynamic casts by just-as-ugly static casts

add TransportCAI::IsBusyLoading and call that instead of LoadStillValid
(which returns true when called outside of TransportCAI::ExecuteLoading
even if the transport just has a CMD_MOVE + CMD_SET_WANTED_MAX_SPEED in
its queue)

make TransportCAI 0.01% more readable
Merge branch 'develop' of github.com:spring/spring into develop
add mapgen
convert files to unix line ending (NLC)
remove broken tools/unitsync_cacher/
parameterize TransportCAI::IsBusyLoading
Try to improve the transport collision issue further