search

SpanishSurfer / becti_zerty_OFPS.Altis

OFPS flavoring of Benny/Zerty's work.
http://ofps.net/viewforum.php?f=6
Other
4 stars 6 forks source link

Interior Lighting #23

Closed MagnetAss closed 9 years ago

MagnetAss commented 9 years ago

Added interior lighting for rotary wing and IFV

SpanishSurfer commented 9 years ago

Ready for merge?

MagnetAss commented 9 years ago

Indeed! :D

On Fri, Sep 4, 2015 at 1:36 PM, SpanishSurfer notifications@github.com wrote:

Ready for merge?

— Reply to this email directly or view it on GitHub https://github.com/SpanishSurfer/becti_zerty_OFPS.Altis/pull/23#issuecomment-137814443 .

SpanishSurfer commented 9 years ago

Tested? No bugs? No script errors?

MagnetAss commented 9 years ago

Yeah, I was able to run the server as normal. No conflicts or strange errors, although I wouldn't mind getting rid of the initialization message.

SpanishSurfer commented 9 years ago

That should be easy, if you know what it says search for the text and delete. Let me know if it works and I'll merge.

MagnetAss commented 9 years ago

Nothing that I saw, no errors or conflicts, Ran the server and tested various vehicles.

On Fri, Sep 4, 2015 at 1:38 PM, SpanishSurfer notifications@github.com wrote:

Tested? No bugs? No script errors?

— Reply to this email directly or view it on GitHub https://github.com/SpanishSurfer/becti_zerty_OFPS.Altis/pull/23#issuecomment-137815073 .

MagnetAss commented 9 years ago

The fact that I was using the mission from 12 days ago won't matter, will it?

On Fri, Sep 4, 2015 at 1:43 PM, Alex Fox alexfox@gmail.com wrote:

Nothing that I saw, no errors or conflicts, Ran the server and tested various vehicles.

On Fri, Sep 4, 2015 at 1:38 PM, SpanishSurfer notifications@github.com wrote:

Tested? No bugs? No script errors?

— Reply to this email directly or view it on GitHub https://github.com/SpanishSurfer/becti_zerty_OFPS.Altis/pull/23#issuecomment-137815073 .

SpanishSurfer commented 9 years ago

Yes, mission has changed since...You can pull my changes into your fork by using this guy's instructions: https://www.youtube.com/watch?v=-zvHQXnBO6c&list=PLz1dFjnEAe7IJ9frqTC2lhVSoqocb-8CQ&index=6

MagnetAss commented 9 years ago

It's the last 3 lines

MagnetAss commented 9 years ago

I'll synch it up real fast

MagnetAss commented 9 years ago

testing removal of message

On Fri, Sep 4, 2015 at 1:46 PM, SpanishSurfer notifications@github.com wrote:

Yes, mission has changed since...You can pull my changes into your fork by using this guy's instructions: https://www.youtube.com/watch?v=-zvHQXnBO6c&list=PLz1dFjnEAe7IJ9frqTC2lhVSoqocb-8CQ&index=6

— Reply to this email directly or view it on GitHub https://github.com/SpanishSurfer/becti_zerty_OFPS.Altis/pull/23#issuecomment-137818334 .

MagnetAss commented 9 years ago

I merged everything in the desktop github, I'm pretty sure it's all on the same page and the pull request looks right.

On Fri, Sep 4, 2015 at 1:55 PM, Alex Fox alexfox@gmail.com wrote:

testing removal of message

On Fri, Sep 4, 2015 at 1:46 PM, SpanishSurfer notifications@github.com wrote:

Yes, mission has changed since...You can pull my changes into your fork by using this guy's instructions: https://www.youtube.com/watch?v=-zvHQXnBO6c&list=PLz1dFjnEAe7IJ9frqTC2lhVSoqocb-8CQ&index=6

— Reply to this email directly or view it on GitHub https://github.com/SpanishSurfer/becti_zerty_OFPS.Altis/pull/23#issuecomment-137818334 .

SpanishSurfer commented 9 years ago

Merged, thanks!

On 9/4/2015 3:19 PM, MagnetAss wrote:

I merged everything in the desktop github, I'm pretty sure it's all on the same page and the pull request looks right.

On Fri, Sep 4, 2015 at 1:55 PM, Alex Fox alexfox@gmail.com wrote:

testing removal of message

On Fri, Sep 4, 2015 at 1:46 PM, SpanishSurfer notifications@github.com wrote:

Yes, mission has changed since...You can pull my changes into your fork by using this guy's instructions:

https://www.youtube.com/watch?v=-zvHQXnBO6c&list=PLz1dFjnEAe7IJ9frqTC2lhVSoqocb-8CQ&index=6

— Reply to this email directly or view it on GitHub

https://github.com/SpanishSurfer/becti_zerty_OFPS.Altis/pull/23#issuecomment-137818334 .

— Reply to this email directly or view it on GitHub https://github.com/SpanishSurfer/becti_zerty_OFPS.Altis/pull/23#issuecomment-137830748.

MagnetAss commented 9 years ago

Was glad to get my feet wet in github with something simple :)

On Fri, Sep 4, 2015 at 2:22 PM, SpanishSurfer notifications@github.com wrote:

Merged #23 https://github.com/SpanishSurfer/becti_zerty_OFPS.Altis/pull/23.

— Reply to this email directly or view it on GitHub https://github.com/SpanishSurfer/becti_zerty_OFPS.Altis/pull/23#event-401494070 .