[Ohrrpgce] SVN: james/9067 Merge branch 'FEATURE_pathfinding_obstruction_mode' into wip

[James Paige]

Nah, I already threw away the branch.

It's okay, I'll just learn for next time

On Monday, July 24, 2017, Ralph Versteegen <teeemcee at gmail.com> wrote:

> Do you still have that branch? I see it's not on your github. I could
> easily patch it into git history (using git graft) even if it doesn't
> appear in svn.
>
> On 25 July 2017 at 09:31, James Paige <Bob at hamsterrepublic.com
> <javascript:_e(%7B%7D,'cvml','Bob at hamsterrepublic.com');>> wrote:
>
>> Ah! Good to know. I don't care about re-doing this one, I'll just
>> remember the right way to do it next time.
>>
>>
>> On Mon, Jul 24, 2017 at 2:21 PM, Ralph Versteegen <teeemcee at gmail.com
>> <javascript:_e(%7B%7D,'cvml','teeemcee at gmail.com');>> wrote:
>>
>>> Use git rebase (which is equivalent to cherry-picking each individual
>>> commit), like "git rebase master featurebranch" to rebase onto master (or
>>> onto svn/wip instead).
>>> Or you can skip that entirely and just git checkout featurebranch and
>>> then do "git svn dcommit". (Note that this does a rebase automatically)
>>>
>>> I guess you could revert this squashed commit and then rebase the
>>> commits properly to keep the full history. At least, I think that won't
>>> cause conflicts when rebasing.
>>>
>>>
>>>
>>>
>>> On 25 July 2017 at 09:02, James Paige <Bob at hamsterrepublic.com
>>> <javascript:_e(%7B%7D,'cvml','Bob at hamsterrepublic.com');>> wrote:
>>>
>>>> Ah, well I can see that I didn't merge that branch in the correct way.
>>>> Looks like it works fine, I just lost my git commit messages. I am thinking
>>>> I should have done something with cherry-pick rather than just merging the
>>>> branch (?)
>>>>
>>>> For posterity, here are the commit messages:
>>>>
>>>> commit 91c3f59e82157bb6a473bc28b48d18a75ac222af
>>>> Author: Bob the Hamster <Bob at HamsterRepublic.com>
>>>> Date:   Sun Jul 16 14:32:46 2017 -0700
>>>>
>>>>     Add NPCType.pathfinding_obstruction_mode and support for editing
>>>> it in the NPC Editor.
>>>>     (only visible when movement type is "Chase You (Pathfinding)")
>>>>
>>>> commit 145f08141682b35d0a0c88609e9a01121ce6a492
>>>> Author: Bob the Hamster <Bob at HamsterRepublic.com>
>>>> Date:   Wed Jul 19 21:04:46 2017 -0700
>>>>
>>>>     Add a per-map default for NPC pathfinding rules
>>>>     Update the per-NPC option to support the default
>>>>     (this is just the editor implementation, these are not respected
>>>> in-game yet)
>>>>
>>>>
>>>> commit 537311118a9aae286156dcf4f49ef701241b2659
>>>> Author: Bob the Hamster <Bob at HamsterRepublic.com>
>>>> Date:   Wed Jul 19 21:12:28 2017 -0700
>>>>
>>>>     Add a scrollbar to the General Map Data editor screen
>>>>
>>>>
>>>> commit d09bf3eb0a8b481cb1bf6b5978e81c76414065cb
>>>> Author: Bob the Hamster <Bob at HamsterRepublic.com>
>>>> Date:   Mon Jul 24 13:51:09 2017 -0700
>>>>
>>>>     Add support for changing the NPCs pathfinding collision rule with
>>>> other NPCs
>>>>     Add a test map to a-star.rpg with Cyan slimes who follow the
>>>> "Ignore NPCs" rule
>>>>
>>>>     Also add a workaround for a bug where NPCCollisionCache.populate()
>>>> was crashing
>>>>     with an out-of-bounds error. I think this is a wrapping map bug.
>>>> The case is
>>>>     not fixed yet, it just writes a debug message rather than crashing
>>>>
>>>>
>>>> On Mon, Jul 24, 2017 at 1:56 PM, <subversion at hamsterrepublic.com
>>>> <javascript:_e(%7B%7D,'cvml','subversion at hamsterrepublic.com');>>
>>>> wrote:
>>>>
>>>>> james
>>>>> 2017-07-24 13:56:03 -0700 (Mon, 24 Jul 2017)
>>>>> 60
>>>>> Merge branch 'FEATURE_pathfinding_obstruction_mode' into wip
>>>>> ---
>>>>> U   wip/common.rbas
>>>>> U   wip/game.bas
>>>>> U   wip/loading.rbas
>>>>> U   wip/mapsubs.bas
>>>>> U   wip/pathfinding.bas
>>>>> U   wip/pathfinding.bi
>>>>> U   wip/testgame/a-star.hss
>>>>> U   wip/testgame/a-star.rpg
>>>>> U   wip/udts.bi
>>>>> _______________________________________________
>>>>> Ohrrpgce mailing list
>>>>> ohrrpgce at lists.motherhamster.org
>>>>> <javascript:_e(%7B%7D,'cvml','ohrrpgce at lists.motherhamster.org');>
>>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>>
>>>>
>>>>
>>>> _______________________________________________
>>>> Ohrrpgce mailing list
>>>> ohrrpgce at lists.motherhamster.org
>>>> <javascript:_e(%7B%7D,'cvml','ohrrpgce at lists.motherhamster.org');>
>>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>>
>>>>
>>>
>>> _______________________________________________
>>> Ohrrpgce mailing list
>>> ohrrpgce at lists.motherhamster.org
>>> <javascript:_e(%7B%7D,'cvml','ohrrpgce at lists.motherhamster.org');>
>>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>>
>>>
>>
>> _______________________________________________
>> Ohrrpgce mailing list
>> ohrrpgce at lists.motherhamster.org
>> <javascript:_e(%7B%7D,'cvml','ohrrpgce at lists.motherhamster.org');>
>> http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.motherhamster.org/pipermail/ohrrpgce-motherhamster.org/attachments/20170725/8ec6c61e/attachment-0001.htm>