MergeToDoList: Difference between revisions

From Multi Theft Auto: Wiki
Jump to navigation Jump to search
No edit summary
No edit summary
Line 7: Line 7:
==Things that need merging from trunk for next point release==
==Things that need merging from trunk for next point release==
====New features for 1.3.5====
====New features for 1.3.5====
*[https://code.google.com/p/mtasa-blue/source/detail?r=5963 5963] Fixed onClientSoundStopped sometimes being late
*[https://code.google.com/p/mtasa-blue/source/detail?r=5962 5962] Fixed includes failing when a resource changes.
*[https://code.google.com/p/mtasa-blue/source/detail?r=5935 5935] Update for r5934 - Some/more fixes
*[https://code.google.com/p/mtasa-blue/source/detail?r=5934 5934] Fixed train carriages and re-enabled the Brownstreak Carriage (ID: 570)
*[https://code.google.com/p/mtasa-blue/source/detail?r=5924 5924] Added guiEditGetCaretIndex and guiMemoGetCaretIndex
*[https://code.google.com/p/mtasa-blue/source/detail?r=5889 5889] Added onClientVehicleDamage event
*[https://code.google.com/p/mtasa-blue/source/detail?r=5889 5889] Added onClientVehicleDamage event
*[https://code.google.com/p/mtasa-blue/source/detail?r=5882 5882] Added dxSetTextureEdge (allows you to set the texture edge for other texture types such as renderTargets + setting the border color) ('''NOTE:''' ''This commit needs to be partially merged since it contains a compile fix for 1.4'')
*[https://code.google.com/p/mtasa-blue/source/detail?r=5882 5882] Added dxSetTextureEdge (allows you to set the texture edge for other texture types such as renderTargets + setting the border color) ('''NOTE:''' ''This commit needs to be partially merged since it contains a compile fix for 1.4'')

Revision as of 22:12, 3 December 2013

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.3.4

Things that need merging from trunk for next point release

New features for 1.3.5

  • 5963 Fixed onClientSoundStopped sometimes being late
  • 5962 Fixed includes failing when a resource changes.
  • 5935 Update for r5934 - Some/more fixes
  • 5934 Fixed train carriages and re-enabled the Brownstreak Carriage (ID: 570)
  • 5924 Added guiEditGetCaretIndex and guiMemoGetCaretIndex
  • 5889 Added onClientVehicleDamage event
  • 5882 Added dxSetTextureEdge (allows you to set the texture edge for other texture types such as renderTargets + setting the border color) (NOTE: This commit needs to be partially merged since it contains a compile fix for 1.4)
  • 5867 Fixed #7413 (Damage proof boats still take collision damage)
  • 5924 Added guiEditGetCaretIndex and guiMemoGetCaretIndex, ...
  • 5852 + 5853 Fixed an inconsistence (isPedDead is server-only; isPlayerDead available on the

client, but on the server deprecated)

  • teaEncode etc
  • preg stuff

Reminders for 1.4

http://code.google.com/p/mtasa-blue/source/detail?r=5324