Search found 5285 matches
Surely the conflicts still exist between C2 and B' and can, therefore, be detected? No, they can't. Conflict means both C1 and C2 modify the same record. With B' the original state of records in B (that got overwritten by C1) are lost. Therefore the conflict doesn't exist anymore and C2 would simpl...
Can't do that, because after the merge B isn't B anymore. It is a new content file (B'). To do it in order, you would have to port C2 to B' first. There are no benefits to this approach, especially since you lose the ability to aromatically detect conflicts.
A plugin isn't really an option. We would require an extensive API, way more than I expect to have ready in the early post-1.0 phase. Considering that a better merge tool is essential for projects like TR, I really want this to be ready for 1.0 or at least not far after 1.0. Besides if we do integra...
I pretty much abandoned this approach. I think the whole problem needs a complete rethink. I was trying to force the merge function on the existing OpenMW-CS data structure. It would have worked, but it was also becoming increasingly clear that this is a suboptimal way of doing it. Anyway, the code ...
- 08 Jul 2018, 13:42
- Forum: Organisation and Planning
- Topic: My thoughts on the design document (post 1.0)
- Replies: 13
- Views: 1300
That's the ref variable type. Mentioned in the description off oldscript+. Will make it into the specs of newscript, one way or another.
- 08 Jul 2018, 09:38
- Forum: Development
- Topic: Beginners' questions: Understanding OpenMW/OpenCS code
- Replies: 21
- Views: 1819
Fully qualified names. Period. Being able to clearly see at the first glance what you are dealing with is more important than brevity (at least in C++). btw. we probably should remove the section about using declarations at some point. That was a nod towards people who preferred this feature, done a...
Sorry, I have a hard time understanding what you are asking. I'll try to guess and answer anyway. Feel free to ask again if I have misunderstood you. GetPcTarget/GetTargetRef: Was the question what the difference between these two is? The former checks what the player is looking at. The later return...