MergeToDoList

Merge/SVN things that need doing

All devs with commit access should add stuff to these lists so it doesn't get lost

Things that need merging from trunk to current release

Important bug fixes for 1.5.1

• None

Things that need merging from trunk for next point release

New features for next update

• 6220 * Renamed CFxManager.cpp to CFxManagerSA.cpp for consistency with existing code
• 6214 * Update for r6208 Fixed a crash when an effect is destroyed while deathmatch is not loaded
• 6209 * Update for r6208 Added missing code for 1.4's OOP
• 6208 * Fixed #5902 (Not all FX are supported by MTA)
• 6137 TODO * Fixed possible train hopping (added optional train track parameter to CPools::AddTrain)
• 6133 TODO * Partially reverted r6081 (Temp fix for train position desync and missing collision.)
• 6132 TODO * Update for r5934 - Fixed setElementPosition for trains
• 6081 TODO * Temp fix for train position desync and missing collision.
• 6061 TODO * Update for r5934 - Some fixes
• 6032 TODO * Update for r5934 - See below. Fixed some streaming issues if train chain is...
• 5969 TODO * Update for r5934 - Fixed some streaming issues (It's nearly finished)
• 5967 TODO * Update for r5934 - Fixed a desync (train will be teleported when driving from...
• 5935 TODO * Update for r5934 - Some/more fixes
• 5934 TODO * Fixed train carriages and re-enabled the Brownstreak Carriage (ID: 570)
• 5318 TODO * Fixed train spawning
• 5289 TODO * Added train rail position, rail speed, rail track and direction to sync should make trains smoother