rails-devel

[Rails-devel] Several master commits missing in release branches and rails_2_develop

[Frederick W. <fre...@go...>]

There is a range of old commits (dec'12) on master (3b8d47 - 70c082) that
has NOT been merged into the releases and rails2. These commits include:

* Background maps: new for 1851 and 18TN, fixes for 18AL and 1889
* Games: fix for 18TN
* UI: option for highlighting tiles (in tiles pane) to which hex under
mouse can be upgraded.
* Sound: fix for one trigger

Were they dropped for some reason or just forgotten?

-- Frederick

Re: [Rails-devel] Several master commits missing in release branches and rails_2_develop

[Stefan F. <ste...@we...>]

Hi Frederick,
welcome back too...

No I cannot imagine they got dropped for any reason, so most likely just 
forgotten. It has been around the time that the master branch emerged to 
be Eriks private branch ;-)

I will (try to) merge those tomorrow.

Stefan


On 11/22/2014 06:49 AM, Frederick Weld wrote:
> There is a range of old commits (dec'12) on master (3b8d47 - 70c082)
> that has NOT been merged into the releases and rails2. These commits
> include:
>
> * Background maps: new for 1851 and 18TN, fixes for 18AL and 1889
> * Games: fix for 18TN
> * UI: option for highlighting tiles (in tiles pane) to which hex under
> mouse can be upgraded.
> * Sound: fix for one trigger
>
> Were they dropped for some reason or just forgotten?
>
> -- Frederick
>
>
>
>
> ------------------------------------------------------------------------------
> Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> from Actuate! Instantly Supercharge Your Business Reports and Dashboards
> with Interactivity, Sharing, Native Excel Exports, App Integration & more
> Get technology previously reserved for billion-dollar corporations, FREE
> http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
>
>
>
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>

Re: [Rails-devel] Several master commits missing in release branches and rails_2_develop

[Stefan F. <ste...@we...>]

Frederick:
I have merged/picked all commits during that period into rails_2_develop.

However I excluded the remaining-tile highlighting, as I intend to do 
some rewrite of that panel in the not-so-far future and the merge would 
have required manual intervention. Feel free to merge it yourself as I 
like the idea.

I planned something similar, but would have preferred to use a pop-up 
box instead. (e.g. show possible future upgrade-paths for a given hex, 
given the current tile configuration.)

Stefan



On 11/22/2014 06:49 AM, Frederick Weld wrote:
> There is a range of old commits (dec'12) on master (3b8d47 - 70c082)
> that has NOT been merged into the releases and rails2. These commits
> include:
>
> * Background maps: new for 1851 and 18TN, fixes for 18AL and 1889
> * Games: fix for 18TN
> * UI: option for highlighting tiles (in tiles pane) to which hex under
> mouse can be upgraded.
> * Sound: fix for one trigger
>
> Were they dropped for some reason or just forgotten?
>
> -- Frederick
>
>
>
>
> ------------------------------------------------------------------------------
> Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> from Actuate! Instantly Supercharge Your Business Reports and Dashboards
> with Interactivity, Sharing, Native Excel Exports, App Integration & more
> Get technology previously reserved for billion-dollar corporations, FREE
> http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
>
>
>
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>

Re: [Rails-devel] Several master commits missing in release branches and rails_2_develop

[Frederick W. <fre...@go...>]

Stefan:
Displaying the upgrade tree would even be better than current master
solution.

But I guess an additional OR window panel updated on map hex mouseover is a
better option than a popup on hex click. I have seen some beginners (who
have not internalized the upgrade graph) use rails. They explore the map
with the mouse and want to see what the future of a hex would be without
having to grasp where a popup appears, potentially reposition it so that it
does not interfere with the visuals they require and to close it
afterwards. The additional panel would be highly customizable (location,
size, visibility) within the docking framework.

-- Frederick

On Wed, Nov 26, 2014 at 1:19 PM, Stefan Frey <ste...@we...> wrote:

> Frederick:
> I have merged/picked all commits during that period into rails_2_develop.
>
> However I excluded the remaining-tile highlighting, as I intend to do
> some rewrite of that panel in the not-so-far future and the merge would
> have required manual intervention. Feel free to merge it yourself as I
> like the idea.
>
> I planned something similar, but would have preferred to use a pop-up
> box instead. (e.g. show possible future upgrade-paths for a given hex,
> given the current tile configuration.)
>
> Stefan
>
>
>
> On 11/22/2014 06:49 AM, Frederick Weld wrote:
> > There is a range of old commits (dec'12) on master (3b8d47 - 70c082)
> > that has NOT been merged into the releases and rails2. These commits
> > include:
> >
> > * Background maps: new for 1851 and 18TN, fixes for 18AL and 1889
> > * Games: fix for 18TN
> > * UI: option for highlighting tiles (in tiles pane) to which hex under
> > mouse can be upgraded.
> > * Sound: fix for one trigger
> >
> > Were they dropped for some reason or just forgotten?
> >
> > -- Frederick
> >
> >
> >
> >
> >
> ------------------------------------------------------------------------------
> > Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> > from Actuate! Instantly Supercharge Your Business Reports and Dashboards
> > with Interactivity, Sharing, Native Excel Exports, App Integration & more
> > Get technology previously reserved for billion-dollar corporations, FREE
> >
> http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
> >
> >
> >
> > _______________________________________________
> > Rails-devel mailing list
> > Rai...@li...
> > https://lists.sourceforge.net/lists/listinfo/rails-devel
> >
>
>
> ------------------------------------------------------------------------------
> Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> from Actuate! Instantly Supercharge Your Business Reports and Dashboards
> with Interactivity, Sharing, Native Excel Exports, App Integration & more
> Get technology previously reserved for billion-dollar corporations, FREE
>
> http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>

Re: [Rails-devel] Several master commits missing in release branches and rails_2_develop

[Chris S. <chr...@gm...>]

Pop ups are also problematic on tablets and other touch devices.

On Thu Nov 27 2014 at 11:45:33 AM Frederick Weld <
fre...@go...> wrote:

> Stefan:
> Displaying the upgrade tree would even be better than current master
> solution.
>
> But I guess an additional OR window panel updated on map hex mouseover is
> a better option than a popup on hex click. I have seen some beginners (who
> have not internalized the upgrade graph) use rails. They explore the map
> with the mouse and want to see what the future of a hex would be without
> having to grasp where a popup appears, potentially reposition it so that it
> does not interfere with the visuals they require and to close it
> afterwards. The additional panel would be highly customizable (location,
> size, visibility) within the docking framework.
>
> -- Frederick
>
> On Wed, Nov 26, 2014 at 1:19 PM, Stefan Frey <ste...@we...> wrote:
>
>> Frederick:
>> I have merged/picked all commits during that period into rails_2_develop.
>>
>> However I excluded the remaining-tile highlighting, as I intend to do
>> some rewrite of that panel in the not-so-far future and the merge would
>> have required manual intervention. Feel free to merge it yourself as I
>> like the idea.
>>
>> I planned something similar, but would have preferred to use a pop-up
>> box instead. (e.g. show possible future upgrade-paths for a given hex,
>> given the current tile configuration.)
>>
>> Stefan
>>
>>
>>
>> On 11/22/2014 06:49 AM, Frederick Weld wrote:
>> > There is a range of old commits (dec'12) on master (3b8d47 - 70c082)
>> > that has NOT been merged into the releases and rails2. These commits
>> > include:
>> >
>> > * Background maps: new for 1851 and 18TN, fixes for 18AL and 1889
>> > * Games: fix for 18TN
>> > * UI: option for highlighting tiles (in tiles pane) to which hex under
>> > mouse can be upgraded.
>> > * Sound: fix for one trigger
>> >
>> > Were they dropped for some reason or just forgotten?
>> >
>> > -- Frederick
>> >
>> >
>> >
>> >
>> >
>> ------------------------------------------------------------------------------
>> > Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
>> > from Actuate! Instantly Supercharge Your Business Reports and Dashboards
>> > with Interactivity, Sharing, Native Excel Exports, App Integration &
>> more
>> > Get technology previously reserved for billion-dollar corporations, FREE
>> >
>> http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
>> >
>> >
>> >
>> > _______________________________________________
>> > Rails-devel mailing list
>> > Rai...@li...
>> > https://lists.sourceforge.net/lists/listinfo/rails-devel
>> >
>>
>>
>> ------------------------------------------------------------------------------
>> Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
>> from Actuate! Instantly Supercharge Your Business Reports and Dashboards
>> with Interactivity, Sharing, Native Excel Exports, App Integration & more
>> Get technology previously reserved for billion-dollar corporations, FREE
>>
>> http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
>> _______________________________________________
>> Rails-devel mailing list
>> Rai...@li...
>> https://lists.sourceforge.net/lists/listinfo/rails-devel
>>
>
> ------------------------------------------------------------
> ------------------
> Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> from Actuate! Instantly Supercharge Your Business Reports and Dashboards
> with Interactivity, Sharing, Native Excel Exports, App Integration & more
> Get technology previously reserved for billion-dollar corporations, FREE
> http://pubads.g.doubleclick.net/gampad/clk?id=157005751&
> iu=/4140/ostg.clktrk_______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>