Custom Train Tracks: Difference between revisions
Jump to navigation
Jump to search
m (update branch) |
m (finish remerge) |
||
| Line 12: | Line 12: | ||
|1.6 | |1.6 | ||
|}</onlyinclude> | |}</onlyinclude> | ||
= Functions = | = Functions = | ||
* [[createTrainTrack]] | * [[createTrainTrack]] | ||
| Line 27: | Line 28: | ||
None. | None. | ||
= | = Re-merge = | ||
{| class="wikitable" style="width: auto; table-layout: fixed;" | |||
|- | |||
|'''Status''' | |||
|<span style="color:red">Abandoned</span> | |||
|- | |||
|'''Branch''' | |||
|[https://github.com/multitheftauto/mtasa-blue/tree/custom-train-tracks-old custom-train-tracks-old] | |||
|- | |||
|'''Branch version''' | |||
|1.4 | |||
|} | |||
The old '''custom-train-tracks''' branch contains commits cherry-picked and other merges from the 1.4 branch. The first task in updating this branch is to distinguish between merge commits and actual branch commits: | The old '''custom-train-tracks''' branch contains commits cherry-picked and other merges from the 1.4 branch. The first task in updating this branch is to distinguish between merge commits and actual branch commits: | ||
Revision as of 17:47, 13 July 2016
This branch makes it possible to make your own train tracks.
| Status | Working in progress |
| Branch | custom-train-tracks |
| Branch version | 1.6 |
Functions
- createTrainTrack
- destroyTrainTrack
- setTrainTrackLength
- getTrainTrackLength
- setTrainTrackNumberOfNodes
- getTrainTrackNumberOfNodes
- getTrainTrackID
- getVehicleTrainTrack
- setVehicleTrainTrack
- getTrainTrackPosition
Media
None.
Re-merge
| Status | Abandoned |
| Branch | custom-train-tracks-old |
| Branch version | 1.4 |
The old custom-train-tracks branch contains commits cherry-picked and other merges from the 1.4 branch. The first task in updating this branch is to distinguish between merge commits and actual branch commits:
- new branch 45d1a266e8f3e50d9605610a32210a9a9a6e145a
- Added missing files and fixed compile errors e2c5fcb83fa7df633f040dc6b0c048e2cd72bbb3
- Small fix 76248682a3fdf8bf24c5d7e73f2bac4536f93069
- ... Fixed crash 0013368B, 00133606, a memory leak a… 88b64d51526b342e22c4581ad9c2fa6b1632c2e1
- ... Fixed a crash with applying upgrades to vehicle… 3dd27775c0d371339337a162e59ef8320a6c6bb5
- ... Fixed #5618 - "Heli Rotors are not in ghostmode… 38d4e2da33466fee7f199981db24056a086e3376
- ... Fixed #7801 - "warpPedIntoVehicle can cause des… 6a394e0dc265628ba328ab94ce00e40ff3409eff
- ... Addendum to previous commit 7489405bbe5d590a3b6a259c5f49784238d1b739
- ... Fixed a recently introduced server crash when u… 70fa16ea69c398487085ab46dd5970fa723b0e27
- ... Applied patch from DirtY_iCE - "vehicle upgrade… e521b274325f15fc9d2bb0f6830edb15680a9582
- ... Fixed peds being ejected from vehicles and warp… d0c6d1f8c4786c4f581ef5546f8ed7db60c401aa
- ... Fixed #7803 - "spoilers" 191491f2ccdc65157309c561d01c5920867f81c8
- ... Merged revisions(s) 5605-6091 from trunk dc8f3ca4316d5da9212e752841c65fe328d88cf6
- Fixed some crashes 92a1f4290625b07b651166cd333d3c43dad7ab0f
- ... Merged revision(s) 6092-6137 from trunk 61976a30a1edda6150d1840833ab8ac2d22ae59a
This means that there are only four commits that need to be merged into the new branch.