MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-12-26 06:45:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added conflicts page

Blixibon 2019-05-06 01:16:03 -05:00
parent ece0189c2d
commit 4a943b01f2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Entity-List.md

@ -339,7 +339,7 @@ There is most likely some information missing or miscellaneous stuff left out, b
| npc_advisor | <!---Stock--> :heavy_minus_sign: | | | npc_advisor | <!---Stock--> :heavy_minus_sign: | |
| npc_alyx | <!---Changed--> :twisted_rightwards_arrows: | Inherits all companion changes, see npc_citizen. | | npc_alyx | <!---Changed--> :twisted_rightwards_arrows: | Inherits all companion changes, see npc_citizen. |
| npc_antlion | <!---Changed--> :twisted_rightwards_arrows: | Dynamic interactions restored (set by mapper), new global state for disabling soldier insta-kill, attempted better bugbait support for workers | | npc_antlion | <!---Changed--> :twisted_rightwards_arrows: | Dynamic interactions restored (set by mapper), new global state for disabling soldier insta-kill, attempted better bugbait support for workers |
| npc_antlion_grub | <!---Changed--> :twisted_rightwards_arrows: | Now allows a damage filter which can control whether this entity is allowed to be squashed. | | npc_antlion_grub | <!---Changed--> :twisted_rightwards_arrows: | Now allows a damage filter which can control whether this grub is allowed to be squashed. |
| npc_antlion_template_maker | <!---Stock--> :heavy_minus_sign: | | | npc_antlion_template_maker | <!---Stock--> :heavy_minus_sign: | |
| npc_antlionguard | <!---Stock--> :heavy_minus_sign: | | | npc_antlionguard | <!---Stock--> :heavy_minus_sign: | |
| npc_apcdriver | <!---Stock--> :heavy_minus_sign: | | | npc_apcdriver | <!---Stock--> :heavy_minus_sign: | |

3
Merging/Conflicts.md Normal file

@ -0,0 +1,3 @@
Although we tried to make Mapbase easy to merge with Git, conflicts can occur.
(mention things like the VDC fixes and other common features that might be implemented in other mods, and just changes to places where mods can make their own changes)