Skip to content

Commit d929476

Browse files
WetwllyWetwlly
Wetwlly
authored and
Wetwlly
committed
Changes to text files by Raistlin.
Merge remote-tracking branch 'Master/master' Conflicts: CREDITS
2 parents 2557228 + 3f96a06 commit d929476

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

CREDITS

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ the development of the source base in one way or another (in un-ordered list):
55

66
* raistlinthewiz
77
* komiga
8+
* Egris
89
* fasbat
910
* Farmy
1011
* DarkLotus
1112
* BoyC
1213
* tehCm
14+
* mdz444
1315
* BackAndForward
1416
* Shadow^Dancer
1517
* dark0ne
16-
* Egris
1718
* dustinconrad
18-
* mdz444
1919
* [TOM_RUS]
2020
* Wetwlly
2121
* Cubido
@@ -40,5 +40,5 @@ the development of the source base in one way or another (in un-ordered list):
4040
* lb
4141
* Wesko
4242

43-
If you have contributed to the project and you are not on this list, please contact
44-
raistlinthewiz in order to have your name added.
43+
Please DO NOT update this file, if you want to see your or someone else's nick here (given that the party is a
44+
contributor), instead ask project maintainers (raistlinthewiz, komiga, egris) to do so.

Compatibility

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Currently supported:
66
* .NET Framework Version: .NET FX 4.0
77
* Microsoft Runtime: .NET 4.0
88
* Mono Runtime: 2.10.5
9-
* Game Version: Patch9 (8101)
9+
* Game Version: Patch10 (8392)
1010

1111
Requirements:
1212

README.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@
33
* Read the [FAQ](http://wiki.mooege.org/FAQ) and check the [wiki](http://wiki.mooege.org/) before asking!
44
* Read the [WARNING](https://github.com/mooege/mooege/blob/master/WARNING) before starting to use this software!
55
* Check out [mooege.org](http://www.mooege.org) and the [forums](http://www.mooege.org/index).
6-
* Status: Will get you ingame.. not much else.
76
* IRC (**irc.synirc.net**):
87
- **#mooege.chat** (general chat)
98
- **#mooege** (dev talk)
109
- **#mooege.announce** (_only_ announcements and the commit feed)
1110
* [Twitter](http://twitter.com/#!/mooege), [Commit Feed](http://twitter.com/#!/mooegelog)
1211

13-
Copyright (C) 2011 - 2012 mooege project
12+
# Welcome to mooege
13+
14+
mooege (multi-node object oriented educational game emulator) is an open source reference game-server implementation
15+
developed with C#. It can be compiled with Microsoft .NET or Mono, which means you can run it on Windows, MacOS,
16+
and Linux. Please see the file LICENSE for license details.
17+
18+
**Copyright (C) 2011 - 2012 mooege project**
1419

1520
This program is free software; you can redistribute it and/or
1621
modify it under the terms of the GNU General Public License

contrib/protocompiler/README.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
Field names in proto definitions may collide with default properties for objects in c#.
1+
Field names in proto definitions may collide with default properties for objects in C#.
22
This causes ProtoBuffer to crash because of ambigious names.
3+
34
An example is QuestReward, which has a field 'Item' that collides with the hidden (in c#) property
45
item for collections that is generated for .net languages that dont support indexers...
56

6-
easiest way to fix it is to just rename these fields.
7+
Easiest way to fix it is to just rename these fields.

0 commit comments

Comments
 (0)