[epiar-devel] IRC Meeting for 0.5.0 (was: Re: Notice about spam filtering)
Matthew Zweig
thezweig at gmail.com
Wed Oct 27 14:14:30 PDT 2010
I think that I can make these times:
> Saturday 1030 GMT-7
> Saturday 1200 GMT-7
> Saturday 1500 GMT-7
> Sunday 1030 GMT-7
This ends up being about 6PM, 8PM, 11PM Ireland time.
Thanks,
~Matt
On Oct 25, 2010, at 5:36 PM, Christopher Thielen wrote:
> Alright, I can probably work weekends.
>
> Matt, are you out of the country right now? When works best for you?
>
> I'm going to propose a few times and I'd appreciate it if everybody on the list and mail me off the list (chris at epiar.net) with your preferred times: number them 1, 2, 3, 4, and mark them with an "X" if you can at least make it, even if it's not your preferred time:
>
> Thursday 1830 GMT-7
> Thursday 2030 GMT-7
> Thursday 2130 GMT-7
> Saturday 1030 GMT-7
> Saturday 1200 GMT-7
> Saturday 1500 GMT-7
> Sunday 1030 GMT-7
> Sunday 2030 GMT-7
>
> I think that about covers a range of weekday and weekend days including times both early and late for me. I've left out the specific dates (e.g. 'which Thursday') as we can decide that later. If everybody replies promptly, we could make it for this week (e.g. 3 days from now), else we can push it back to next.
>
> I'd like to hold the meeting even if we can't get everybody in attendance: the meeting notes will then be posted to the list for further discussion, and then we can start dividing up tasks.
>
> Thanks guys!
> -topher
>
> On 10/24/10 3:05 PM, Димитър Станчев wrote:
>> I get a conflict with my last push. Some little thing but I don`t know how to merge it right. Matt, I hope it`s not a bother for you to merge them, should have pulled before I pushed.
>>
>> An IRC meeting would be great. I personaly can only check mails[not so often] during the week, so would appreciate it if it`s on the weekend.
>>
>> -Dido
>>
>> >-------- Оригинално писмо --------
>> >От: Christopher Thielen
>> >Относно: Re: [epiar-devel] Notice about spam filtering
>> >До: epiar-devel at epiar.net
>> >Изпратено на: Понеделник, 2010, Октомври 25 00:04:50 EEST
>>
>> >Works fine here. I took out some of the couts and made the huge warning
>> >and pushed it.
>> >
>> >Time to define and have us all collectively hack out a new set of work
>> >yes? Should we IRC meet?
>> >
>> >On 10/23/10 4:16 PM, Matthew Zweig wrote:
>> >> I've pushed both changes to my repo, but I've only done minimal testing to show that everything still works.
>> >>
>> >> Can everyone build Epiar and test that it still works for you?
>> >>
>> >> Can someone change the debug cout lines to LogMsg lines? Also, please add a giant red arrow of a comment to the memory leak that we introduced to 'solve' the MSVC crash. We commented out the delete in the UIContainer destructor. In correct code this shouldn't be necessary, so we shouldn't leave an intentional bug like uncommented.
>> >>
>> >> Thanks everyone. If this finally solves the MSVC bug, then we should be able to continue with normal development again. But I don't want to break anything else until this is resolved.
>> >>
>> >> ~Matt
>> >>
>> >> On Oct 22, 2010, at 10:24 AM, Christopher Thielen wrote:
>> >>
>> >>> Thanks Matt, I think I've done it. It looks like there were only trivial
>> >>> differences between 0.4.1 MSVS_FIX and the latest head, so it should all
>> >>> be pushed.
>> >>>
>> >>> DuMu mentioned he suspects the corruption could be coming from a way an
>> >>> iterator is used in input and pushed the changes to his repo for the
>> >>> rest of us to check out too.
>> >>>
>> >>> -topher
>> >>>
>> >>> On 10/21/10 9:15 PM, Matthew Zweig wrote:
>> >>>> I would commit those changes based on the 0.4.1 branch, not the current tip.
>> >>>>
>> >>>> Reset to a clean state with:
>> >>>> git reset --hard
>> >>>>
>> >>>> Checkout the 0.4.1 code:
>> >>>> git checkout 0.4.1
>> >>>>
>> >>>> Mark this as a named Branch (for documentation's sake)
>> >>>> git checkout -b MSVS_FIX
>> >>>>
>> >>>> Apply your changes by overwriting the files or by
>> >>>> git stash pop
>> >>>> (git stash pop might not work depending on how different the code is.)
>> >>>>
>> >>>> Commit your changes piecemeal into the different changes that you made:
>> >>>> git add -p
>> >>>> git commit
>> >>>>
>> >>>> Then, go back to the tip,
>> >>>> git checkout master
>> >>>>
>> >>>> And merge the branch into the master:
>> >>>> git merge MSVS_FIX
>> >>>>
>> >>>> Then push your stuff.
>> >>>>
>> >>>> Let me know if that doesn't work. I haven't worked with git in a while (sorry, I've been busy), but this looks correct to me.
>> >>>> ~Matt
>> >>>>
>> >>>> On Oct 21, 2010, at 8:50 PM, Christopher Thielen wrote:
>> >>>>
>> >>>>> Do you have any advice on merging them? The Win32 changes/fixes/tweaks
>> >>>>> were built off the 0.4.1 branch. I updated my git repo to your latest
>> >>>>> (as of 10/21/10) and tried simply copying the 0.4.1-win32 code on top of
>> >>>>> yours and using 'git status' to compare differences, but there's
>> >>>>> actually a lot of them and I don't want to cause reversions:
>> >>>>>
>> >>>>> Chriss-MacBook-Pro:Epiar cthielen$ git status
>> >>>>> # On branch master
>> >>>>> # Changed but not updated:
>> >>>>> # (use "git add..." to update what will be committed)
>> >>>>> # (use "git checkout --..." to discard changes in working
>> >>>>> directory)
>> >>>>> #
>> >>>>> # modified: Source/AI/ai.cpp
>> >>>>> # modified: Source/AI/ai_lua.cpp
>> >>>>> # modified: Source/AI/ai_lua.h
>> >>>>> # modified: Source/Audio/audio.cpp
>> >>>>> # modified: Source/Audio/audio.h
>> >>>>> # modified: Source/Audio/audio_lua.cpp
>> >>>>> # modified: Source/Audio/audio_lua.h
>> >>>>> # modified: Source/Engine/console.cpp
>> >>>>> # modified: Source/Engine/console.h
>> >>>>> # modified: Source/Engine/hud.cpp
>> >>>>> # modified: Source/Engine/hud.h
>> >>>>> # modified: Source/Engine/models.cpp
>> >>>>> # modified: Source/Engine/models.h
>> >>>>> # modified: Source/Engine/outfit.cpp
>> >>>>> # modified: Source/Engine/simulation.cpp
>> >>>>> # modified: Source/Engine/simulation.h
>> >>>>> # modified: Source/Graphics/animation.cpp
>> >>>>> # modified: Source/Graphics/animation.h
>> >>>>> # modified: Source/Graphics/image.cpp
>> >>>>> # modified: Source/Graphics/image.h
>> >>>>> # modified: Source/Graphics/video.cpp
>> >>>>> # modified: Source/Graphics/video.h
>> >>>>> # modified: Source/Input/input.cpp
>> >>>>> # modified: Source/Input/input.h
>> >>>>> # modified: Source/Sprites/effects.cpp
>> >>>>> # modified: Source/Sprites/effects.h
>> >>>>> # modified: Source/Sprites/gate.cpp
>> >>>>> # modified: Source/Sprites/gate.h
>> >>>>> # modified: Source/Sprites/planets.cpp
>> >>>>> # modified: Source/Sprites/planets.h
>> >>>>> # modified: Source/Sprites/player.cpp
>> >>>>> # modified: Source/Sprites/player.h
>> >>>>> # modified: Source/Sprites/projectile.cpp
>> >>>>> # modified: Source/Sprites/projectile.h
>> >>>>> # modified: Source/Sprites/ship.cpp
>> >>>>> # modified: Source/Sprites/ship.h
>> >>>>> # modified: Source/Sprites/spritemanager.cpp
>> >>>>> # modified: Source/Sprites/spritemanager.h
>> >>>>> # modified: Source/UI/ui.cpp
>> >>>>> # modified: Source/UI/ui.h
>> >>>>> # modified: Source/UI/ui_button.cpp
>> >>>>> # modified: Source/UI/ui_button.h
>> >>>>> # modified: Source/UI/ui_checkbox.h
>> >>>>> # modified: Source/UI/ui_container.cpp
>> >>>>> # modified: Source/UI/ui_container.h
>> >>>>> # modified: Source/UI/ui_label.h
>> >>>>> # modified: Source/UI/ui_lua.cpp
>> >>>>> # modified: Source/UI/ui_lua.h
>> >>>>> # modified: Source/UI/ui_picture.cpp
>> >>>>> # modified: Source/UI/ui_picture.h
>> >>>>> # modified: Source/UI/ui_scrollbar.cpp
>> >>>>> # modified: Source/UI/ui_scrollbar.h
>> >>>>> # modified: Source/UI/ui_slider.cpp
>> >>>>> # modified: Source/UI/ui_slider.h
>> >>>>> # modified: Source/UI/ui_tabs.cpp
>> >>>>> # modified: Source/UI/ui_widget.h
>> >>>>> # modified: Source/UI/ui_window.cpp
>> >>>>> # modified: Source/UI/ui_window.h
>> >>>>> # modified: Source/Utilities/camera.cpp
>> >>>>> # modified: Source/Utilities/components.cpp
>> >>>>> # modified: Source/Utilities/components.h
>> >>>>> # modified: Source/Utilities/lua.cpp
>> >>>>> # modified: Source/Utilities/lua.h
>> >>>>> # modified: Source/Utilities/timer.cpp
>> >>>>> # modified: Source/Utilities/timer.h
>> >>>>> # modified: Source/main.cpp
>> >>>>> # modified: aclocal.m4
>> >>>>> #
>> >>>>> # Untracked files:
>> >>>>> # (use "git add..." to include in what will be committed)
>> >>>>> #
>> >>>>> # Master_UI.xml
>> >>>>> # QUESTIONS
>> >>>>> # Source/Engine/calendar.cpp
>> >>>>> # Source/Engine/calendar.h
>> >>>>> # Source/Engine/navwidget.cpp
>> >>>>> # Source/Engine/navwidget.h
>> >>>>> # Source/Tests/Utilities_File.cpp
>> >>>>> # Source/Tests/lua_test.cpp
>> >>>>> # Source/Tests/lua_test.h
>> >>>>> # Source/Tests/navwindow.cpp
>> >>>>> # Source/Tests/navwindow.h
>> >>>>> # Source/Utilities/rcfilter.h
>> >>>>> # Sprites.xml
>> >>>>> no changes added to commit (use "git add" and/or "git commit -a")
>> >>>>>
>> >>>>> Taking a specific look at the differences (just what I could fit in
>> >>>>> 100-line terminal):
>> >>>>>
>> >>>>> diff --git a/Source/main.cpp b/Source/main.cpp
>> >>>>> index 8d4890d..0a538a3 100644
>> >>>>> --- a/Source/main.cpp
>> >>>>> +++ b/Source/main.cpp
>> >>>>> @@ -2,6 +2,7 @@
>> >>>>> * \author Chris Thielen (chris at epiar.net)
>> >>>>> * \author and others.
>> >>>>> * \date Created: Sunday, June 4, 2006
>> >>>>> + * \date Modified: Thursday, November 19, 2009
>> >>>>> * \brief Main entry point of Epiar codebase
>> >>>>> * \details
>> >>>>> * This file performs two functions:
>> >>>>> @@ -21,7 +22,6 @@
>> >>>>> #include "Utilities/filesystem.h"
>> >>>>> #include "Utilities/log.h"
>> >>>>> #include "Utilities/xml.h"
>> >>>>> -#include "Utilities/timer.h"
>> >>>>>
>> >>>>> #ifdef EPIAR_COMPILE_TESTS
>> >>>>> #include "Tests/tests.h"
>> >>>>> @@ -177,40 +177,25 @@ int main( int argc, char **argv ) {
>> >>>>> Audio::Instance().SetSoundVol (
>> >>>>> OPTION(float,"options/sound/soundvolume") );
>> >>>>>
>> >>>>> LogMsg(INFO,"Using Font Engine: FreeType");
>> >>>>> -
>> >>>>> + //******** FreeType Rendering ********
>> >>>>> SansSerif = new Font( "Resources/Fonts/FreeSans.ttf" );
>> >>>>> BitType = new Font( "Resources/Fonts/visitor2.ttf" );
>> >>>>> Serif = new Font( "Resources/Fonts/FreeSerif.ttf" );
>> >>>>> Mono = new Font( "Resources/Fonts/FreeMono.ttf" );
>> >>>>>
>> >>>>> - Timer::Initialize();
>> >>>>> Video::Initialize();
>> >>>>> -
>> >>>>> - string splashScreen[] = {
>> >>>>> + Video::SetWindow( OPTION( int, "options/video/w" ), OPTION( int,
>> >>>>> "options/video/h"
>> >>>>> + string splashScreen[6] = {
>> >>>>> "Resources/Art/EpiarFleetbig.png",
>> >>>>> "Resources/Art/gatescene.png",
>> >>>>> "Resources/Art/fight1.png",
>> >>>>> "Resources/Art/fight2.png",
>> >>>>> "Resources/Art/uberdone.png",
>> >>>>>
>> >>>>> Any ideas on merging them?
>> >>>>>
>> >>>>> On 10/21/10 6:11 PM, Matthew Zweig wrote:
>> >>>>>> Chris,
>> >>>>>>
>> >>>>>> Please push the changes to your repo. I'll merge them into my branch asap.
>> >>>>>>
>> >>>>>> On Oct 17, 2010, at 10:37 PM, Christopher Thielen wrote:
>> >>>>>>
>> >>>>>>> Hey guys,
>> >>>>>>>
>> >>>>>>> epiar-devel is currently not filtered for spam, but only accepts
>> >>>>>>> messages from subscribed members (you folks reading this e-mail). When
>> >>>>>>> we get spam, I get an admin notice and have to go in there and mark
>> >>>>>>> "don't send". This originally happened a few times a month but now it
>> >>>>>>> happens about 7-10 times a week.
>> >>>>>>>
>> >>>>>>> This has nothing to do with members on the list (you) sending spam, but
>> >>>>>>> with random spam attempts from other hosts. @epiar.net accounts are
>> >>>>>>> filtered, but the lists are not.
>> >>>>>>>
>> >>>>>>> I wanted to send this e-mail out as a warning that I'm going to try
>> >>>>>>> installing basic spamassassin-based spam filtering on epiar-devel to
>> >>>>>>> avoid this problem; I'll test it, but if you find your own messages not
>> >>>>>>> getting through, please let me know and I'll ensure you're on the
>> >>>>>>> whitelist. If possible, I'll ensure all subscribers are put on
>> >>>>>>> spamassassin's whitelist.
>> >>>>>>>
>> >>>>>>> -- Also, random note, the Epiar 0.4.1 Windows binary is finally ready to
>> >>>>>>> go according to our Windows beta tester, so I'll be posting that soon.
>> >>>>>>> github activity has slowed because our main coder knowknowledge is in
>> >>>>>>> Ireland for a few weeks on business. Please feel free to continue your
>> >>>>>>> own github activity, as I've been meaning to do.
>> >>>>>>>
>> >>>>>>> Hope you're all well,
>> >>>>>>> -topher
>> >>>>>>> _______________________________________________
>> >>>>>>> epiar-devel mailing list
>> >>>>>>> epiar-devel at epiar.net
>> >>>>>>> http://epiar.net/mailman/listinfo/epiar-devel
>> >>>>> _______________________________________________
>> >>>>> epiar-devel mailing list
>> >>>>> epiar-devel at epiar.net
>> >>>>> http://epiar.net/mailman/listinfo/epiar-devel
>> >>>> _______________________________________________
>> >>>> epiar-devel mailing list
>> >>>> epiar-devel at epiar.net
>> >>>> http://epiar.net/mailman/listinfo/epiar-devel
>> >>> _______________________________________________
>> >>> epiar-devel mailing list
>> >>> epiar-devel at epiar.net
>> >>> http://epiar.net/mailman/listinfo/epiar-devel
>> >> _______________________________________________
>> >> epiar-devel mailing list
>> >> epiar-devel at epiar.net
>> >> http://epiar.net/mailman/listinfo/epiar-devel
>> >
>> >_______________________________________________
>> >epiar-devel mailing list
>> >epiar-devel at epiar.net
>> >http://epiar.net/mailman/listinfo/epiar-devel
>> >
>>
>> -----------------------------------------------------------------
>> Вижте последните новини във Vesti.bg!
>>
>> _______________________________________________
>> epiar-devel mailing list
>>
>> epiar-devel at epiar.net
>> http://epiar.net/mailman/listinfo/epiar-devel
>
> _______________________________________________
> epiar-devel mailing list
> epiar-devel at epiar.net
> http://epiar.net/mailman/listinfo/epiar-devel
More information about the epiar-devel
mailing list