Creating an NRaas project Woohooer and the Eiffel Tower

Talk nerdy to us here.
User avatar
Chain_Reaction
Site Admin
Reactions:
Posts: 7568
Joined: December 30th, 2011, 6:00 pm
Answers: 81
Contact:

Post by Chain_Reaction » March 10th, 2014, 3:27 am

No problems. :) Did the original version not have the new English strings in it?

icarus_allsorts
Reactions:
Posts: 213
Joined: March 8th, 2012, 6:00 pm

Post by icarus_allsorts » March 10th, 2014, 8:08 am

You know, I could've sworn it did since I have it in my mind that the option appeared in game with already with the string I provided and I certainly didn't hardcode it... but it's been a while since I last had the mod in for testing (removed most of NRaas mods to test some personal ones lately) and the version I downloaded from here after you reminded me about it says otherwise, so I guess I must've forgotten about it after all.

icarus_allsorts
Reactions:
Posts: 213
Joined: March 8th, 2012, 6:00 pm

Post by icarus_allsorts » May 27th, 2015, 10:20 am

Sorry for not starting a new thread but I figured one less post to potentially sweep away later on...?

Was wondering what the current status of Woohooer is, reason being the Eiffel Tower module is needing some updating and if possible I'd like to implement minor changes to the main mod to accompany that (well it's not actually necessary per se, but it would save the amount of copy and pasted code if parts of VisitRabbitHoleEx were made into static methods that the module would then be able to use)

User avatar
Chain_Reaction
Site Admin
Reactions:
Posts: 7568
Joined: December 30th, 2011, 6:00 pm
Answers: 81
Contact:

Post by Chain_Reaction » May 28th, 2015, 12:35 am

Will sync the source with my locals shortly :)

User avatar
Chain_Reaction
Site Admin
Reactions:
Posts: 7568
Joined: December 30th, 2011, 6:00 pm
Answers: 81
Contact:

Post by Chain_Reaction » May 28th, 2015, 6:26 am

<!-- ws:start:WikiTextCodeRule:0:
<pre class="text"> Traveler 87, Woohooer 129, GoHere 44a/b, MC 133a/b/c, SP 267a, OW 120…<br/><br/>…/1, ET 100<br/><br/>Plus some (untested) upcoming<br/><br/> master <br/><br/>commit 584e0dca19ad9e93989f02cbf82eb5f61e288cd2 1 parent f892052<br/>@Chain-Reaction Chain-Reaction authored 6 minutes ago<br/>Showing with 2,236 additions and 255 deletions. </pre>
-->
<style type="text/css"><!--
/**
* GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann
* (http://qbnz.com/highlighter/ and http://geshi.org/)
*/
.text {font-family:monospace;}
.text .imp {font-weight: bold; color: red;}
.text span.xtra { display:block; }

-->
</style><pre class="text"> Traveler 87, Woohooer 129, GoHere 44a/b, MC 133a/b/c, SP 267a, OW 120…
&nbsp;
…/1, ET 100
&nbsp;
Plus some (untested) upcoming
&nbsp;
master
&nbsp;
commit 584e0dca19ad9e93989f02cbf82eb5f61e288cd2 1 parent f892052
@Chain-Reaction Chain-Reaction authored 6 minutes ago
Showing with 2,236 additions and 255 deletions. </pre>


Enjoy. My apologies if VS moans about missing files. It's a bit of a pain to maintain two sets of project files so I tend to just not commit the new (often untested) code rather than including it and it gets compiled. Just shoot me a query if you're unsure of an error. :)

icarus_allsorts
Reactions:
Posts: 213
Joined: March 8th, 2012, 6:00 pm

Post by icarus_allsorts » June 2nd, 2015, 3:35 am

Thanks! Though it might be that I'm incredibly rusty with how GitHub works, but though I can see your changes on the GitHub site, I can't seem to retrieve them with Git Shell (keep being told that I'm up to date)? In any case I submitted a pull request with the changes I've made, but do remind me of what step I think I'm missing here...

User avatar
Chain_Reaction
Site Admin
Reactions:
Posts: 7568
Joined: December 30th, 2011, 6:00 pm
Answers: 81
Contact:

Post by Chain_Reaction » June 6th, 2015, 7:38 am

I have merged your changes.

Are you opening the shell and typing cd NRaas and then git merge upstream/master and getting the message? Did you happen to manually copy the files before trying to merge?

icarus_allsorts
Reactions:
Posts: 213
Joined: March 8th, 2012, 6:00 pm

Post by icarus_allsorts » June 6th, 2015, 9:12 am

Hey Chain

Yeap, I've been doing those steps in the shell for a while now and it keeps informing me I'm up to date. The changes I see on the github site aren't reflected in the files I have in my GitHub folder either. I was considering just copying the changes manually since the shell wasn't doing it for me (nope, have not that previously) but decided to wait for your say

User avatar
Chain_Reaction
Site Admin
Reactions:
Posts: 7568
Joined: December 30th, 2011, 6:00 pm
Answers: 81
Contact:

Post by Chain_Reaction » June 6th, 2015, 5:32 pm

Try

<!-- ws:start:WikiTextCodeRule:0:
<pre class="text">git fetch &#45;-all<br/>git reset &#45;-hard origin/master</pre>
-->
<style type="text/css"><!--
/**
* GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann
* (http://qbnz.com/highlighter/ and http://geshi.org/)
*/
.text {font-family:monospace;}
.text .imp {font-weight: bold; color: red;}
.text span.xtra { display:block; }

-->
</style><pre class="text">git fetch --all
git reset --hard origin/master</pre>


icarus_allsorts
Reactions:
Posts: 213
Joined: March 8th, 2012, 6:00 pm

Post by icarus_allsorts » June 6th, 2015, 11:32 pm

Thanks, that seemed to do trick (ran git merge upstream/master after that as well for good measure) :)

Post Reply