summaryrefslogtreecommitdiffstats
path: root/src/Protocol (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Function renameTiger Wang2014-07-162-3/+3
|
* Unified functionsTiger Wang2014-07-162-34/+28
| | | | Thanks @Howaner!
* Store properties as Json::ValueTiger Wang2014-07-163-12/+20
|
* Player properties are now retrievedTiger Wang2014-07-143-102/+198
|
* Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-2/+2
|\ | | | | Implemented trapped chests & others
| * Implemented trapped chests & othersTiger Wang2014-07-071-2/+2
| | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
* | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-091-1/+1
|\ \ | |/ |/| Fixes to projectiles and the undead
| * Crash and compile fixTiger Wang2014-07-041-1/+1
| |
* | Fixed respawningTiger Wang2014-06-299-15/+15
| | | | | | | | * Fixes #1103
* | Send statistics to the player, when he logged in.Howaner2014-06-291-2/+1
| |
* | Added generic entity-collecting.Mattes D2014-06-279-15/+15
|/ | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* Nullify deleted pointers.archshift2014-06-191-0/+1
|
* Fixed deadlock when moving players to other worlds.Mattes D2014-06-0810-16/+42
| | | | Fixes #1039, fixes #851
* Fixed a crash in message formatter.madmaxoft2014-05-281-1/+2
| | | | The code would fail if a message is sent to a player not yet added to a world.
* cCompositeChat message type is now formattedTiger Wang2014-05-191-1/+1
|
* Added client translation to achievementsTiger Wang2014-05-191-0/+29
|
* cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-121-5/+1
|
* Statistic Managerandrew2014-05-117-7/+84
|
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-092-11/+11
|
* Change m_RepairCost to int.Howaner2014-05-071-2/+2
|
* Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner2014-05-071-0/+11
|
* Hotfixed Chunked transfer encoding in Yggdrasil.madmaxoft2014-05-031-1/+1
| | | | By using HTTP/1.0, we're disabling the support for the Chunked encoding on the server. This is a hotfix for #979, a proper parser implementation is still needed.
* Fixed connection encryption.madmaxoft2014-05-031-1/+1
| | | | Fixes #975.
* Fixed warnings in ClientHandle.madmaxoft2014-05-017-7/+7
|
* Removed the unused cBlockingTCPLink class.madmaxoft2014-04-301-1/+0
|
* Removed unneeded #includes.madmaxoft2014-04-291-6/+0
|
* Moved the rest of the Crypto objects into their own respective files.madmaxoft2014-04-294-23/+14
|
* Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects.madmaxoft2014-04-292-2/+2
|
* Merged branch 'master' into SslWrappers.madmaxoft2014-04-283-6/+11
|\
| * Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-282-2/+2
| |\ | | | | | | Add entity invulnerable
| | * Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-282-16/+2
| | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34.
| | * Changed the old invulnerable methods from the wither to the new.Howaner2014-04-262-2/+16
| | |
| | * FixesHowaner2014-04-262-2/+2
| | |
| * | Merge pull request #954 from mc-server/projectiles-splitMattes D2014-04-282-1/+3
| |\ \ | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files.
| | * | Fixed projectile source filenames, indentationsarchshift2014-04-282-3/+3
| | | |
| | * | Moved cFireworkEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| | | |
| | * | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-272-1/+2
| | |/
| * | Another attempt at #889.madmaxoft2014-04-271-3/+5
| | | | | | | | | | | | The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime.
| * | Merge pull request #948 from jfhumann/staticFixesMattes D2014-04-271-0/+33
| |\ \ | | |/ | |/| Fixes motivated by Coverity #1
| | * Fixes resource leaks in the yggdrasil authenticator. (CID 43617)jfhumann2014-04-261-0/+33
| | |
| * | Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
| |/
* | Added the G1 root cert.madmaxoft2014-04-281-2/+29
| | | | | | | | Now the authenticator finally works.
* | Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes.madmaxoft2014-04-271-91/+45
| |
* | Authenticator uses some C++ SSL objects.madmaxoft2014-04-241-19/+40
|/
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-227-80/+104
|\ | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
| * Small style changesjfhumann2014-04-182-7/+7
| |
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-189-43/+719
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp
| * | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-186-77/+100
| | |
* | | Allow 1.6.4 Forge clients to log in.Mattes D2014-04-212-0/+20
| | | | | | | | | | | | Fixes #913.
* | | Merge branch 'master' into Enchantingdaniel09162014-04-181-5/+131
|\ \ \ | | |/ | |/|
| * | Added asserts for proper game state.madmaxoft2014-04-161-5/+131
| | | | | | | | | | | | This is to help hunt #889.
* | | Modified many thingsdaniel09162014-04-171-2/+0
| | |
* | | Merge branch 'master' into Enchantingdaniel09162014-04-169-38/+587
|\| |
| * | Attempted fix for the client crash with the new protocols.madmaxoft2014-04-151-0/+7
| | |
| * | Implemented the 1.7.6 protocol and authenticator.madmaxoft2014-04-148-119/+169
| | | | | | | | | | | | Server works both in online and offline modes with 1.7.9.
| * | A client UUID is generated when the server is in offline mode.madmaxoft2014-04-141-4/+10
| | | | | | | | | | | | 1.7.9 client works with these changes in offline mode.
| * | Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176madmaxoft2014-04-143-1/+420
| |\ \
| | * | Fixed mistakedaniel09162014-04-132-2/+2
| | | |
| | * | Fixed Error?daniel09162014-04-131-2/+2
| | | |
| | * | Code Updatedaniel09162014-04-131-4/+5
| | | |
| | * | Added Yggdrasil Authentication Systemdaniel09162014-04-132-0/+418
| | |/ | | | | | | | | | Code by Howaner. Fixes/Changes by me.
| * / Initial 1.7.6 protocol support.madmaxoft2014-04-144-2/+69
| |/ | | | | | | Doesn't work yet because of missing UUIDs.
* | Bug fixesdaniel09162014-04-141-3/+0
| |
* | Fixed Errorsdaniel09162014-04-071-2/+2
| |
* | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-0715-366/+1139
|\|
| * Fixed 1.6.4 client crash on composite chat messages.madmaxoft2014-04-062-0/+14
| |
| * Fixed crash in protocols sending 64-bit ints.madmaxoft2014-04-061-1/+1
| | | | | | | | Fixes #855.
| * Explicit change record size.madmaxoft2014-04-041-1/+1
| |
| * Fixed format string mismatch.madmaxoft2014-04-041-1/+1
| |
| * More Clang warning fixes in the protocols.madmaxoft2014-04-046-81/+82
| |
| * Fixed CreateHexDump's signedness.madmaxoft2014-04-041-1/+1
| |
| * More Clang warning fixes in the protocols.madmaxoft2014-04-041-28/+37
| |
| * Fixed some Clang warnings in protocols.madmaxoft2014-04-0410-26/+31
| |
| * Merge pull request #831 from mc-server/WitherMattes D2014-04-022-0/+18
| |\ | | | | | | Wither
| | * Protocol: Wither metadataandrew2014-03-252-0/+18
| | |
| * | Console logging supports cCompositeChat as its parameters.madmaxoft2014-03-311-22/+1
| |/
| * Plugins can set flying speed.madmaxoft2014-03-201-2/+1
| |
| * Rewritten player speeds to be relative unit-less.madmaxoft2014-03-202-5/+6
| | | | | | | | Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
| * Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-122-7/+7
| |
| * Fixed a load of format string errorsTycho2014-03-112-4/+4
| |
| * Fixed format errors in protocolTycho2014-03-111-3/+3
| |
| * Removed unused macroTycho2014-03-101-13/+0
| |
| * Merge pull request #731 from mc-server/ballisticmissilesTiger Wang2014-03-091-25/+52
| |\ | | | | | | Ballistic firework missiles
| | * Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-1/+15
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| | * | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-25/+52
| | | | | | | | | | | | | | | | + Added fireworks
| * | | Hotfix for MSVC compilation.madmaxoft2014-03-091-0/+1
| | | |
| * | | Merge pull request #777 from jfhumann/issue317Mattes D2014-03-093-3/+29
| |\ \ \ | | | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
| | * | | Adjusted style of switch/caseJan-Fabian Humann2014-03-093-45/+15
| | | | |
| | * | | Changed if-else to switch-caseJan-Fabian Humann2014-03-083-39/+33
| | | | |
| | * | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.Jan-Fabian Humann2014-03-083-3/+65
| | | |/ | | |/|
| * | | Fixed issues with int vs size_t and a few other warningsTycho2014-03-081-2/+2
| | | |
| * | | WarningsTycho2014-03-079-12/+25
| |/ /
| * / Add Flower PotsHowaner2014-03-071-1/+15
| |/
| * Manual merge (Fixed conflicts)andrew2014-02-209-17/+291
| |\
| | * Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+15
| | |\ | | | | | | | | Add Skulls/Heads to MCServer
| | | * Rename SkullEntity to MobHeadEntityHowaner2014-02-191-9/+9
| | | |
| | | * Add break to Protocol17x.cpp and use new comment delimiterHowaner2014-02-191-0/+1
| | | |
| | | * Add Skulls/HeadsHowaner2014-02-171-0/+14
| | | |
| | * | Merge branch 'master' into itemframesTiger Wang2014-02-186-0/+28
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp
| | | * | Implemented paintings, fixes #689Tiger Wang2014-02-186-0/+28
| | | |/ | | | | | | | | | | | | + Implemented paintings
| | * | De-breaked stuffTiger Wang2014-02-181-2/+0
| | | |
| | * | Implemented item frames, a part of #689Tiger Wang2014-02-181-2/+14
| | |/ | | | | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
| | * Add Locale to ClientHandleHowaner2014-02-163-2/+4
| | |
| | * Set max. Players in the Tablist to 60Howaner2014-02-161-1/+1
| | |
| | * Implemented cCompositeChat.madmaxoft2014-02-157-12/+231
| | | | | | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
| * | Map decorators; Map clientsandrew2014-02-187-1/+60
| | |
| * | Implementation of in-game mapsandrew2014-02-137-0/+91
| |/
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| | * Improved the signedness conversion.madmaxoft2014-02-051-2/+2
| | |
| | * Protocol 1.7: Fixed a signed / unsigned comparison warning.madmaxoft2014-02-041-2/+2
| | |
| * | Merge branch 'master' into playerimprovementsTiger Wang2014-02-093-7/+7
| |\| | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| | * Protocol 1.7 uses char for blockface.madmaxoft2014-02-041-2/+2
| | | | | | | | | | | | That should fix #644 on RasPi.
| | * Improved Type safety of eBlockFaceTycho2014-02-043-5/+5
| | | | | | | | | | | | May Fix #640
| * | Fixed a bunch of MSVS warningsTiger Wang2014-02-051-1/+2
| |/ | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely
| * Limited sign lines to 15 chars.madmaxoft2014-01-291-4/+5
| | | | | | | | Fixes #598.
| * Added 1.7.4 to the list of supported protocols.madmaxoft2014-01-291-1/+1
| |
| * Protocol 1.7: Encryption is enabled only with auth.madmaxoft2014-01-291-1/+1
| |
| * Protocol 1.7: Forced encryption on all connections.madmaxoft2014-01-282-3/+101
| | | | | | | | This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication.
| * Fixed client packet parsing.madmaxoft2014-01-261-12/+33
| | | | | | | | | | When the packet wouldn't fit the current buffer, the server would mis-parse the next packet. This was the cause for #541. Also modified comm logging, now each direction can be turned on separately.
| * Merged branch 'master' into ChangeToPolarSSL.madmaxoft2014-01-252-0/+87
| |\
| | * Comm logging is available in both Debug and Release modes.madmaxoft2014-01-252-12/+16
| | |
| | * Protocol17: Comm logging shows the data left over from previous parse.madmaxoft2014-01-251-2/+15
| | |
| | * Added per-connection comm logging in debug mode.madmaxoft2014-01-242-0/+69
| | | | | | | | | | | | It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter.
| * | Merge branch 'master' into ChangeToPolarSSL.madmaxoft2014-01-231-3/+3
| |\|
| | * Fixed 1.5.x scoreboard packet IDsandrew2014-01-231-3/+3
| | |
| * | PolarSSL is fully used for 1.3.2 protocol encryption.madmaxoft2014-01-236-139/+51
| |/
| * Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-217-6/+90
| |\
| | * Fix a crash but somewhere...Alexander Harkness2014-01-201-2/+1
| | |
| * | Scoreboard SendTo()andrew2014-01-211-3/+3
| | |
| * | Scoreboard protocol supportandrew2014-01-218-5/+141
| | |
* | | added EnchantItemPacket to older Protocolsdaniel09162014-02-011-1/+4
| | |
* | | Some updates for enchanting (2)daniel09162014-01-314-14/+21
| | |
* | | removed hook from enchanting commitdaniel09162014-01-241-1/+1
| | |
* | | Some updates for enchantingdaniel09162014-01-242-4/+12
| | |
* | | first changes for enchanting (not finished)daniel09162014-01-202-0/+18
| |/ |/| | | | | | | | | | | | | - added enchanting table block handler and added it to the blockhandler - added enchanting window - drop item in the slot 0 when the player close the window - added enchanting packet (1.7 only) - some more...
* | Merge pull request #569 from worktycho/EnchantmentsFixMattes D2014-01-192-4/+6
|\ \ | | | | | | Enchantments fix
| * | Switched EnchantmentSerilizer to namespaceTycho2014-01-192-4/+4
| | |
| * | Spilt Writing of Enchantments to seperate classTycho2014-01-192-4/+6
| |/ | | | | | | | | | | | | Created a new class cEnchantmentSerializer to serilize Enchantments to NBT. This breaks a dependecy chain between cChunkGenerator and cWorld. cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments so having it seperate reduces the spread of the frein modifier
* | Removed unneeded paramtersTiger Wang2014-01-196-11/+19
| |
* | Changed SendBlockEntity format slightlyTiger Wang2014-01-196-13/+46
| | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug
* | Improved command blocksTiger Wang2014-01-196-0/+42
|/ | | | | | | * Their command and previous output are displayed on the client * They have a BlockHandler implementation, so you can't place blocks on them anymore + As a side effect, implemented UpdateBlockEntity
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-2/+17
|\ | | | | Added cWorld::SpawnMinecart.
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-6/+6
| |
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-1/+16
| |
* | Removed internal cEntity::GetRot() usage.madmaxoft2014-01-173-14/+14
| |
* | Merge remote-tracking branch 'origin/customnames'madmaxoft2014-01-174-12/+62
|\ \
| * | Changed newline character because of issuesTiger Wang2014-01-161-3/+3
| | |
| * | Removed obsoleted functionsTiger Wang2014-01-163-7/+7
| | |
| * | Merge remote-tracking branch 'origin/master' into customnamesTiger Wang2014-01-162-30/+40
| |\ \
| * | | Implemented custom names and loreTiger Wang2014-01-151-5/+55
| | | | | | | | | | | | | | | | | | | | | | | | + Added custom names and lore + Added saving and loading + Added writing and parsing of NBT
* | | | Protocol 1.7: More output on unknown packets / protocol states.madmaxoft2014-01-171-4/+21
| | | |
* | | | Fixed block break packet numberTiger Wang2014-01-161-1/+1
| | | |
* | | | Protocol 1.7: Unknown packets are dumped to log in Debug mode.madmaxoft2014-01-161-1/+14
| |/ / |/| |
* | | Added packet diagnostics to 1.7 protocol.madmaxoft2014-01-162-30/+40
|/ / | | | | | | When the packet is mis-interpreted, a log message is output about the packet type and lengths.
* / Added handshake processing to protocol 1.7.madmaxoft2014-01-131-2/+23
|/ | | | This fixes #495
* Fixed wrong packet number for PluginMessage packet.madmaxoft2014-01-091-1/+1
|
* Added cClientHandle::SendPluginMessage().madmaxoft2014-01-097-0/+40
| | | | It is not yet exported in the API, though.
* Merge pull request #516 from mc-server/faviconAlexander Harkness2014-01-071-1/+1
|\ | | | | Fixed favicons
| * Fixed faviconsTiger Wang2014-01-071-1/+1
| |
* | Plugin messages are received and handed to plugins.madmaxoft2014-01-071-1/+1
|/ | | | Note that MCS doesn't currently handle any channel registrations, this will come later on.
* Merge pull request #514 from derouinw/masterMattes D2014-01-071-0/+3
|\ | | | | Implement favicon for 1.7.2
| * A few more touch upsBill Derouin2014-01-071-11/+1
| |
| * Removed unused lineBill Derouin2014-01-071-1/+0
| |
| * Implement favicon for 1.7.2Bill Derouin2014-01-072-0/+14
| | | | | | | | | | Favicon data is a png encoded in base64 which is stored in the server and sent in the server response packet
* | Fixed a few MSVC warnings.madmaxoft2014-01-072-3/+3
| |
* | Fixed a few MSVC warnings.madmaxoft2014-01-064-5/+4
|/
* Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.hDiusrex2014-01-054-2/+52
| | | | | | I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings. So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function.
* More memory alignment fixes.madmaxoft2014-01-021-3/+3
| | | | Ref.: #420.
* Implented BroadcastParticleEffectSTRWarrior2013-12-229-2/+65
|
* Merge branch 'master' into cmakeTycho Bickerstaff2013-12-211-2/+2
|\
| * Fixed minor warnings.madmaxoft2013-12-201-2/+2
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-191-10/+3
|\|
| * Fixed PlayerAbilities and creativeTiger Wang2013-12-191-10/+3
| |
* | moved protocol to globTycho Bickerstaff2013-12-191-1/+5
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-187-7/+115
|\|
| * Fixed player falling through the floor on spawn.madmaxoft2013-12-171-1/+5
| | | | | | | | The 1.7 client seems to have math issues with exact coords. Adding 0.001 to the Y coord fixed the problem.
| * Fixed player spawning packet.madmaxoft2013-12-151-1/+1
| | | | | | | | The player was spawned 1.62 blocks below their pos. This fixes #323.
| * Moved reading flags to the protocol.STRWarrior2013-12-151-1/+19
| |
| * Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-151-2/+10
| |
| * Fixed pre 1.7 clients crashing.STRWarrior2013-12-151-2/+2
| |
| * Merge pull request #431 from mc-server/Entity_EffectsMattes D2013-12-147-0/+82
| |\ | | | | | | Entity Effects
| | * Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-147-0/+82
| | |
| * | Removed leftover debugging messages from cProtocol172.madmaxoft2013-12-141-4/+0
| |/
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-112-195/+191
|\|
| * Fixed threading issues affecting cProtocol172.madmaxoft2013-12-132-191/+191
| |
| * Fixed protocol 1.7 recovery after unknown packet.madmaxoft2013-12-121-4/+0
| |
* | more cmakeTycho Bickerstaff2013-12-101-0/+7
|/
* Fixed tabcompletion packet, fixes #356Tiger Wang2013-12-081-8/+4
|
* Fixed falling block metas, fixes #406Tiger Wang2013-12-081-1/+1
|
* Renamed animation functionTiger Wang2013-12-077-10/+10
| | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* Removed stray printf, again.Samuel Barney2013-12-021-1/+0
|
* Switched to using provided ReadItem function.Samuel Barney2013-12-021-17/+3
| | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
* Removed stray printf.Samuel Barney2013-12-021-1/+0
|
* Fixed 1.7 slab and stair placement.Samuel Barney2013-12-021-0/+19
|
* Fixed the remaining derpsAlexander Harkness2013-11-274-5/+5
|
* Fixed some of tiger's derpyness.Alexander Harkness2013-11-271-2/+2
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-267-0/+48
| | | | | Conflicts: VC2008/MCServer.vcproj
* Further attempts to fix compileTiger Wang2013-11-255-7/+7
|
* Attempt to fix compilationTiger Wang2013-11-245-8/+8
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-247-1/+42
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-2417-0/+7588
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 13:26:44 +0100