Skip to content

Commit

Permalink
Changes to text files by Raistlin.
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'Master/master'

Conflicts:
	CREDITS
  • Loading branch information
Wetwlly authored and Wetwlly committed Feb 11, 2012
2 parents 2557228 + 3f96a06 commit d929476
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
8 changes: 4 additions & 4 deletions CREDITS
Expand Up @@ -5,17 +5,17 @@ the development of the source base in one way or another (in un-ordered list):

* raistlinthewiz
* komiga
* Egris
* fasbat
* Farmy
* DarkLotus
* BoyC
* tehCm
* mdz444
* BackAndForward
* Shadow^Dancer
* dark0ne
* Egris
* dustinconrad
* mdz444
* [TOM_RUS]
* Wetwlly
* Cubido
Expand All @@ -40,5 +40,5 @@ the development of the source base in one way or another (in un-ordered list):
* lb
* Wesko

If you have contributed to the project and you are not on this list, please contact
raistlinthewiz in order to have your name added.
Please DO NOT update this file, if you want to see your or someone else's nick here (given that the party is a
contributor), instead ask project maintainers (raistlinthewiz, komiga, egris) to do so.
2 changes: 1 addition & 1 deletion Compatibility
Expand Up @@ -6,7 +6,7 @@ Currently supported:
* .NET Framework Version: .NET FX 4.0
* Microsoft Runtime: .NET 4.0
* Mono Runtime: 2.10.5
* Game Version: Patch9 (8101)
* Game Version: Patch10 (8392)

Requirements:

Expand Down
9 changes: 7 additions & 2 deletions README.md
Expand Up @@ -3,14 +3,19 @@
* Read the [FAQ](http://wiki.mooege.org/FAQ) and check the [wiki](http://wiki.mooege.org/) before asking!
* Read the [WARNING](https://github.com/mooege/mooege/blob/master/WARNING) before starting to use this software!
* Check out [mooege.org](http://www.mooege.org) and the [forums](http://www.mooege.org/index).
* Status: Will get you ingame.. not much else.
* IRC (**irc.synirc.net**):
- **#mooege.chat** (general chat)
- **#mooege** (dev talk)
- **#mooege.announce** (_only_ announcements and the commit feed)
* [Twitter](http://twitter.com/#!/mooege), [Commit Feed](http://twitter.com/#!/mooegelog)

Copyright (C) 2011 - 2012 mooege project
# Welcome to mooege

mooege (multi-node object oriented educational game emulator) is an open source reference game-server implementation
developed with C#. It can be compiled with Microsoft .NET or Mono, which means you can run it on Windows, MacOS,
and Linux. Please see the file LICENSE for license details.

**Copyright (C) 2011 - 2012 mooege project**

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down
5 changes: 3 additions & 2 deletions contrib/protocompiler/README.txt
@@ -1,6 +1,7 @@
Field names in proto definitions may collide with default properties for objects in c#.
Field names in proto definitions may collide with default properties for objects in C#.
This causes ProtoBuffer to crash because of ambigious names.

An example is QuestReward, which has a field 'Item' that collides with the hidden (in c#) property
item for collections that is generated for .net languages that dont support indexers...

easiest way to fix it is to just rename these fields.
Easiest way to fix it is to just rename these fields.

0 comments on commit d929476

Please sign in to comment.