MergeToDoList: Difference between revisions
Jump to navigation
Jump to search
No edit summary |
No edit summary |
||
| Line 4: | Line 4: | ||
==Things that need merging from trunk to current release== | ==Things that need merging from trunk to current release== | ||
====Important bug fixes for 1.3.4==== | ====Important bug fixes for 1.3.4==== | ||
==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=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'') | ||
*[https://code.google.com/p/mtasa-blue/source/detail?r=5867 5867] Fixed #7413 (Damage proof boats still take collision damage) | *[https://code.google.com/p/mtasa-blue/source/detail?r=5867 5867] Fixed #7413 (Damage proof boats still take collision damage) | ||
teaEncode etc | * teaEncode etc | ||
* preg stuff | |||
==Reminders for 1.4== | ==Reminders for 1.4== | ||
http://code.google.com/p/mtasa-blue/source/detail?r=5324 | http://code.google.com/p/mtasa-blue/source/detail?r=5324 | ||
Revision as of 18:21, 25 October 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
- 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)
- teaEncode etc
- preg stuff