summaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #565 from mc-server/commandblockfixesMattes D2014-01-1911-5/+151
|\ | | | | Command block fixes
| * Removed unneeded paramtersTiger Wang2014-01-199-15/+23
| |
| * Changed SendBlockEntity format slightlyTiger Wang2014-01-199-42/+55
| | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug
| * Implemented MC|Brand responseTiger Wang2014-01-191-3/+9
| |
| * Improved command blocksTiger Wang2014-01-1911-5/+124
| | | | | | | | | | | | | | * 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
* | Rewritten SocketThreads for proper shutdown scenario.madmaxoft2014-01-198-178/+189
| | | | | | | | This fixes #560 and #390.
* | Merge pull request #551 from worktycho/schedularMattes D2014-01-191-6/+2
|\ \ | | | | | | Implemented xoft's suggestion for a saturating counter in the scheduler
| * | Fixed iterators bugTycho2014-01-181-2/+1
| | |
| * | switched to using m_WorldAge rather than m_TickIDTycho2014-01-182-9/+3
| | |
| * | Increased tick count to longTycho2014-01-172-3/+3
| | |
| * | Implemented xsofts suggestion for a saturating counter in the schedulerTycho2014-01-172-5/+8
| | |
* | | SocketThreads: Removed unused code.madmaxoft2014-01-192-53/+3
| | |
* | | Merge pull request #559 from mc-server/SpawnMobParticlesMattes D2014-01-191-3/+0
|\ \ \ | | | | | | | | Removed the particles when a mob spawns.
| * | | Removed the particles when a mob spawns.STRWarrior2014-01-181-3/+0
| | | |
* | | | Exported cFloater to the Lua API.STRWarrior2014-01-192-3/+8
| | | |
* | | | Fixed compiler error.STRWarrior2014-01-181-3/+3
| |_|/ |/| |
* | | Merge pull request #557 from xdot/masterMattes D2014-01-1819-62/+592
|\ \ \ | | | | | | | | Command blocks
| * | | Command block fixesandrew2014-01-183-43/+17
| | | |
| * | | Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-183-3/+150
| |\| |
| * | | Parse the MC|AdvCdm plugin messageandrew2014-01-184-1/+70
| | | |
| * | | Command blocks: Execute()andrew2014-01-185-18/+42
| | | |
| * | | Command block (de)serializationandrew2014-01-186-21/+122
| | | |
| * | | Basic command block implementationandrew2014-01-1811-33/+395
| | | |
* | | | HTTP connections aren't kept alive unless explicitly enabled.madmaxoft2014-01-184-37/+58
| |/ / |/| | | | | | | | | | | Only the client can decide that the connection can be kept alive, we must close the socket if the client doesn't indicate keepalive support. This will provide a fix for #390 when #560 is fixed; until then the issue remains, just it's no longer HTTPServer's fault.
* | | Alpha-sorted the finishers.madmaxoft2014-01-181-4/+4
| | |
* | | Merged branch 'NetherFinish'.madmaxoft2014-01-183-3/+150
|\ \ \ | |/ / |/| |
| * | Fixed errors.STRWarrior2014-01-182-2/+2
| | |
| * | Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo'sSTRWarrior2014-01-183-10/+10
| | |
| * | Some tweaks.STRWarrior2014-01-181-5/+18
| | | | | | | | | | | | | | | Everything generates more often. Fire can only spawn on ForeverBurning blocks.
| * | Fixed bug where only brown mushrooms would spawn.STRWarrior2014-01-181-3/+3
| | |
| * | It now actualy works.STRWarrior2014-01-181-20/+42
| | |
| * | First attempt at creating a clumb version NetherFinisher.STRWarrior2014-01-172-22/+63
| | |
| * | Added cFinishGenNetherSprinkleFoliage.STRWarrior2014-01-103-2/+73
| | |
* | | Merge pull request #552 from worktycho/c++11Mattes D2014-01-171-4/+0
|\ \ \ | | | | | | | | Changed std to c++11 in clang to fix va_copy issues
| * | | Changed std to c++11 in clang to fix va_copy issuesTycho2014-01-171-4/+0
| | |/ | |/|
* / | Added user setting compression factorTycho2014-01-1710-22/+33
|/ /
* | Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-177-11/+62
|\ \ | | | | | | Added cWorld::SpawnMinecart.
| * | Changed GetContent function.STRWarrior2014-01-161-1/+1
| | |
| * | Fixed server crash.STRWarrior2014-01-121-1/+1
| | |
| * | Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-127-17/+18
| | |
| * | EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-127-10/+33
| | |
| * | Added cWorld::SpawnMinecart.STRWarrior2014-01-122-0/+27
| | |
* | | Fixed SIGABRT_COMPAT on other architectures.madmaxoft2014-01-171-0/+2
| | |
* | | Removed internal cEntity::GetRot() usage.madmaxoft2014-01-1723-43/+43
| | |
* | | Merge remote-tracking branch 'origin/customnames'madmaxoft2014-01-1738-115/+201
|\ \ \
| * | | Changed newline character because of issuesTiger Wang2014-01-162-4/+13
| | | |
| * | | Removed CustomCopy()Tiger Wang2014-01-162-24/+1
| | | |
| * | | Really did what xoft wantedTiger Wang2014-01-161-5/+8
| | | |
| * | | Fixed #535Tiger Wang2014-01-161-1/+1
| | | |
| * | | Removed obsoleted functionsTiger Wang2014-01-1634-74/+67
| | | |
| * | | Possibly did what xoft wantedTiger Wang2014-01-163-10/+25
| | | |
| * | | Merge remote-tracking branch 'origin/master' into customnamesTiger Wang2014-01-169-75/+90
| |\ \ \
| * | | | OBSOLETE'd obsolete functionsTiger Wang2014-01-151-2/+2
| | | | |
| * | | | Implemented custom names and loreTiger Wang2014-01-154-35/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added custom names and lore + Added saving and loading + Added writing and parsing of NBT
| * | | | Implemented Ctrl-Q drop stackTiger Wang2014-01-153-3/+20
| | | | | | | | | | | | | | | | | | | | Also fixed an issue with TossItems not respecting count.
* | | | | 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
| | | | |
* | | | | Fixed #535Tiger Wang2014-01-161-1/+1
| | | | |
* | | | | Fixed SIGPIPE on cSocket::Send().madmaxoft2014-01-163-12/+13
| | | | |
* | | | | Protocol 1.7: Unknown packets are dumped to log in Debug mode.madmaxoft2014-01-161-1/+14
| | | | |
* | | | | Disabled excessive entity-related logging in Debug mode.madmaxoft2014-01-162-3/+26
| | | | |
* | | | | Fixed whitespace in previous commit.madmaxoft2014-01-161-1/+1
| | | | |
* | | | | Finished exporting cWorld:ScheduleTask() to Lua API.madmaxoft2014-01-161-1/+15
| |/ / / |/| | |
* | | | CMake: Fixed output paths for all MSVC versions.madmaxoft2014-01-161-7/+9
| | | |
* | | | 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.
* | | | Yet another attempt at VarArgs.madmaxoft2014-01-161-10/+15
| | | |
* | | | Another VarArgs fix.madmaxoft2014-01-166-39/+37
|/ / / | | | | | | | | | This time using va_copy() on platforms that have it and simple assignment on platforms that don't.
* | | Using a 2nd argument instead of va_copy().madmaxoft2014-01-156-30/+42
| | | | | | | | | | | | This seems to be the only reasonable C++03-only solution.
* | | Fixed varargs modification.madmaxoft2014-01-151-1/+5
| | | | | | | | | | | | Ref.: #541.
* | | Furnace minecarts now stop being active after a while.STRWarrior2014-01-152-2/+19
| | |
* | | First implementation for furnace minecarts.STRWarrior2014-01-152-1/+23
| | |
* | | Merge pull request #542 from worktycho/schedularMattes D2014-01-153-4/+121
|\ \ \ | | | | | | | | added cWorld::ScheduleTask Function
| * | | added cWorld::ScheduleTask FunctionTycho2014-01-143-4/+121
| | | | | | | | | | | | | | | | | | | | ScheduleTask schedules a SceduledTask object to be run x ticks in the future. In is exported to lua, fixes #150
* | | | Merge pull request #538 from mc-server/minecartsMattes D2014-01-159-176/+469
|\ \ \ \ | |/ / / |/| | | Minecarts
| * | | Yes newline at end of file :DTiger Wang2014-01-141-1/+5
| | | |
| * | | Final improvements to MinecartsTiger Wang2014-01-133-93/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed curved rails being a little broken + Implemented detector rails + Implemented block collisions on rails * Fixed snapping to rail - Removed minecart physics conditions in Entity.cpp as minecarts use their own simulator when on rails Fixes #148 and #217; partially implemented #215. This is Cave Johnson, and we're done here.
| * | | Detaching improvementsTiger Wang2014-01-134-4/+34
| | | | | | | | | | | | | | | | | | | | * Players now search for an area around themselves to teleport to when detaching from something
| * | | Fixed wire, rail, and pressure plate unpoweringTiger Wang2014-01-131-3/+4
| | | |
| * | | Fixed settings plugin generation after IniFileTiger Wang2014-01-121-3/+3
| | | |
| * | | Multiple enhancements and fixes to minecartsTiger Wang2014-01-124-132/+191
| | | | | | | | | | | | | | | | | | | | | | | | + They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails
* | | | CMake: Added postfix for profiled exemadmaxoft2014-01-141-0/+4
| | | |
* | | | Removed shutdown() from socket closing.madmaxoft2014-01-131-4/+0
| | | | | | | | | | | | | | | | | | | | It's not there for Windows and everything seems fine, the client doesn't shutdown either, so why should we be polite. Fixes #537.
* | | | Added handshake processing to protocol 1.7.madmaxoft2014-01-132-2/+29
| | | | | | | | | | | | | | | | This fixes #495
* | | | Generating the bindings outputs a message at the end.madmaxoft2014-01-131-0/+8
| | | |
* | | | cCreeper is no longer available in API.madmaxoft2014-01-133-14/+1
| | | | | | | | | | | | | | | | Has been replaced by cMonster.
* | | | CMake: Removed leftover debugging output.madmaxoft2014-01-131-1/+0
| | | |
* | | | CMake: Added resources to windows projects.madmaxoft2014-01-131-1/+14
| | | |
* | | | Added a generic .user file for MSVC.madmaxoft2014-01-131-0/+167
| | | | | | | | | | | | | | | | This brings in the default debugging settings for the MSVC project, when generated by CMake.
* | | | Moved the win resources into a separate subfolder.madmaxoft2014-01-125-0/+22
| | | | | | | | | | | | | | | | This will allow us to use them in CMake builds.
* | | | CMake generates Bindings when not existant (win)madmaxoft2014-01-121-0/+10
|/ / /
* | | Merge pull request #529 from mc-server/derpstonerefactorAlexander Harkness2014-01-1210-331/+265
|\ \ \ | |/ / |/| | Major refactoring of redstone
| * | Fixed rails poweringTiger Wang2014-01-111-0/+2
| | |
| * | Did some stuff with the vectorsTiger Wang2014-01-111-32/+17
| | |
| * | Fixed a door bug and reduced codeTiger Wang2014-01-111-19/+1
| | | | | | | | | | | | | | | Doors wouldn't get powered by repeaters, and some blocks, like glass, were viable middle blocks when they shouldn't have been.
| * | Renamed g_TorchPlaceable...Tiger Wang2014-01-116-71/+71
| | | | | | | | | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin
| * | Fixed doors, fixes #453Tiger Wang2014-01-101-38/+8
| | |
| * | Major refactoring of redstoneTiger Wang2014-01-104-186/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a refactoring of the redstone code, mainly the functions handling the removal of invalid blocks from power supplier data structures. Its aim is to improve performance and potentially reduce the memory footprint of the data structures. It works to reduce the amount of GetBlock()s triggered every tick. Before, a GetBlock() was requested for every single item in the data lists, as well as for every single redstone block in a chunk. Following these changes, the AddBlock() event is utilised more effectively to only update the lists when needed (a block is changed), as well as to insert the block type (and update it when needed) alongside the coordinates into the main redstone simulator chunkdata list. In short, a single GetBlock() is now cached, with this cache being updated when the simulator is awoken due to a block change. At least, I *hope* that this is what it does :P
* | | Disabled a useless MSVC warning in Bindings.cpp.madmaxoft2014-01-121-0/+6
| | |
* | | Merge pull request #532 from mc-server/LuaStateErrorHandlerMattes D2014-01-125-252/+130
|\ \ \ | | | | | | | | Lua state error handler
| * | | Lua errors display stack trace.madmaxoft2014-01-112-3/+27
| | | | | | | | | | | | | | | | Fixes #418.
| * | | Removed internal methods from public cLuaState interface.madmaxoft2014-01-113-119/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PushFunction(), CallFunction() and GetReturn() are not to be called independently, but rather only by using the Call() templated overrides. Push() needs to be left in the public part, it is used for pushing results in the ManualBindings. Preparation for #418.
| * | | Removed an unused file.madmaxoft2014-01-112-130/+0
| | | |
* | | | Merge pull request #527 from derouinw/biomessplitMattes D2014-01-118-222/+241
|\ \ \ \ | |/ / / |/| | | Biomessplit
| * | | Globals.h needs to be first includeBill Derouin2014-01-101-1/+1
| | | |
| * | | Include Biome enum in ChunkDefBill Derouin2014-01-101-2/+1
| | | | | | | | | | | | | | | | Can't forward declare an enum
| * | | Added newlines at ends of filesBill Derouin2014-01-102-2/+2
| | | |
| * | | Fixed missing externalsBill Derouin2014-01-101-1/+2
| | | | | | | | | | | | | | | | Turns out you actually have to include the .cpp in the project file
| * | | Move biome definition to separate filesBill Derouin2014-01-098-222/+241
| | | |
* | | | Removed unused variables.madmaxoft2014-01-111-2/+0
| | | | | | | | | | | | | | | | The Lua API calls had no side-effects, either.
* | | | Merge pull request #530 from mc-server/GeneratorDecoupleMattes D2014-01-1110-50/+188
|\ \ \ \ | | | | | | | | | | Decoupled cChunkGenerator from cWorld and cRoot.
| * | | | Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-1010-50/+188
| | | | | | | | | | | | | | | | | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
* | | | | Fixed glowstone drop countandrew2014-01-111-2/+2
|/ / / /
* | | | Fixed generator adding values to ini file.madmaxoft2014-01-102-1/+3
| | | |
* | | | Merge pull request #520 from mc-server/SoulSandMattes D2014-01-102-1/+17
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| NetherGen: Now generates SoulSand.
| * | Fixed recurring pattern.STRWarrior2014-01-101-1/+1
| | |
| * | Fixed chunk borders.STRWarrior2014-01-091-3/+3
| | |
| * | Speed-up. I got about 40 extra ch/sSTRWarrior2014-01-081-9/+14
| | |
| * | WormNestCaves now remove soul sand.STRWarrior2014-01-081-0/+1
| | |
| * | NetherGen: Now generates SoulSand.STRWarrior2014-01-081-1/+11
| |/
* | Exported cClientHandle::SendPluginMessage() to Lua.madmaxoft2014-01-091-0/+30
| |
* | Fixed wrong packet number for PluginMessage packet.madmaxoft2014-01-091-1/+1
| |
* | Added cClientHandle::SendPluginMessage().madmaxoft2014-01-099-0/+50
| | | | | | | | It is not yet exported in the API, though.
* | Composition generator creating moved to a separate function.madmaxoft2014-01-092-61/+83
| | | | | | | | Also it forces the defaults into the INI file.
* | Height generator creating moved info HeiGen.cpp.madmaxoft2014-01-093-54/+82
| | | | | | | | The generator also explicitly sets the default back into the INI file.
* | Merge pull request #517 from derouinw/masterMattes D2014-01-091-0/+13
|\ \ | |/ |/| Add missing plugin error
| * A couple touchupsBill Derouin2014-01-081-2/+3
| |
| * Add missing plugin errorBill Derouin2014-01-071-0/+12
| | | | | | | | | | | | | | | | | | | | | | Previously, if a plugin was included but the folder had no lua files, the error given was ambiguous. Now, it explicitly describes lack of lua files. See issue #512 P.S. This probably isn't the best way, but this is where the fix can be made.
* | Fixed AppendVPrintf() handling for large strings.madmaxoft2014-01-081-6/+4
| | | | | | | | This caused a failure in server favicons.
* | Graceful shutdown on SIGTERMTiger Wang2014-01-071-0/+5
|/
* Merge pull request #516 from mc-server/faviconAlexander Harkness2014-01-074-18/+8
|\ | | | | Fixed favicons
| * Fixed faviconsTiger Wang2014-01-074-18/+8
| |
* | Plugin messages are received and handed to plugins.madmaxoft2014-01-078-2/+68
|/ | | | Note that MCS doesn't currently handle any channel registrations, this will come later on.
* Merge pull request #514 from derouinw/masterMattes D2014-01-073-0/+20
|\ | | | | Implement favicon for 1.7.2
| * Avoid making copies of favicon stringBill Derouin2014-01-072-2/+2
| |
| * A few more touch upsBill Derouin2014-01-072-12/+2
| |
| * A few touch upsBill Derouin2014-01-072-2/+5
| |
| * Removed unused lineBill Derouin2014-01-071-1/+0
| |
| * Implement favicon for 1.7.2Bill Derouin2014-01-074-0/+28
| | | | | | | | | | Favicon data is a png encoded in base64 which is stored in the server and sent in the server response packet
* | Disabled an unneeded MSVC warning.madmaxoft2014-01-071-4/+7
| | | | | | | | Also sorted the enabled warnings by their numerical code for easier searching..
* | Removed a debugging log output in cPluginManager:AddHook().madmaxoft2014-01-071-1/+0
| |
* | More MSVC warning fixes.madmaxoft2014-01-079-11/+11
| |
* | LuaState can push strings with embedded NULs.madmaxoft2014-01-071-1/+1
| | | | | | | | This also marginally improves performance, since a strlen() isn't called (inside lua_pushstring()), the string length is stored in the AString object directly.
* | Fixed a few MSVC warnings.madmaxoft2014-01-078-18/+21
| |
* | Added Base64Encode().madmaxoft2014-01-072-0/+51
| |
* | Disabled the type conversion MSVC warning.madmaxoft2014-01-061-1/+3
| | | | | | | | It was hitting way too many false positives.
* | Fixed a few MSVC warnings.madmaxoft2014-01-0611-16/+12
|/
* Merge pull request #511 from mc-server/CmakeOutputMattes D2014-01-061-1/+1
|\ | | | | Output dir set to $/MCServer.
| * Output dir set to $/MCServer.madmaxoft2014-01-061-1/+1
| | | | | | | | Ref.: #510.
* | Merge pull request #509 from Diusrex/masterMattes D2014-01-067-5/+87
|\ \ | | | | | | Added #pragma for warnings in MSVC warnings
| * | Added fake functions into cCriticalSection because of the change to ASSERTDiusrex2014-01-051-0/+5
| | |
| * | Changed the release version of ASSERT.Diusrex2014-01-051-1/+1
| | | | | | | | | | | | This was so a variable only used in ASSERT statements will not give a warning about not being used.
| * | Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.hDiusrex2014-01-055-3/+68
| | | | | | | | | | | | | | | | | | 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.
| * | Making all of the useful level 4 warnings be active.Diusrex2014-01-051-1/+13
| | |
* | | Exported cWorld::BroadcastBlockAction().madmaxoft2014-01-061-1/+1
| |/ |/| | | | | As requested in #508; no guarantees about it.
* | Fixed wrong enqueueing.madmaxoft2014-01-061-2/+9
|/ | | | Fixes #505.
* Fixed cPluginManager:AddHook() binding.madmaxoft2014-01-051-6/+13
| | | | Fixes #401. Old formats are still accepted, for compatibility reasons.
* Fixed a race condition in the cQueue class.madmaxoft2014-01-051-59/+86
| | | | Fixes #505.
* Fixed DocumentationTycho2014-01-031-4/+2
|
* derpTycho2014-01-031-1/+1
|
* actual fixTycho2014-01-031-2/+9
|
* fixed failure to return a value from RemoveTycho2014-01-031-1/+1
|
* implement xsofts recommendationsTycho Bickerstaff2014-01-031-9/+15
|
* Merge branch 'master' into threadsafequeueTycho Bickerstaff2014-01-027-29/+80
|\
| * Merge pull request #479 from mc-server/cmake-winMattes D2014-01-022-18/+30
| |\ | | | | | | Cmake-win
| | * Added support for out-of-source builds.madmaxoft2013-12-282-18/+30
| | |
| * | More memory alignment fixes.madmaxoft2014-01-022-6/+6
| | | | | | | | | | | | Ref.: #420.
| * | Fixed unaligned memory access in FastNBT.madmaxoft2014-01-023-5/+44
| | | | | | | | | | | | This should fix #420.
* | | added documentationTycho Bickerstaff2014-01-021-7/+45
| | |
* | | fixed a few remaining issues with worldstorageTycho Bickerstaff2014-01-022-24/+6
| | |
* | | rewrote queue not to use promises for waitsTycho Bickerstaff2014-01-026-121/+24
| | |
* | | Merge branch 'master' into threadsafequeueTycho Bickerstaff2013-12-3110-3/+117
|\| | | | | | | | | | | | | | Conflicts: src/OSSupport/Queue.h
| * | merged changes from upstreamTycho Bickerstaff2013-12-319-3/+112
| |\ \
| | * \ Merge branch 'FishingHook'madmaxoft2014-01-018-1/+110
| | |\ \
| | | * | OnPlayerFishing doesn't have a const cItems anymoreSTRWarrior2014-01-015-5/+5
| | | | |
| | | * | implemented the recommendations Xoft gave.STRWarrior2013-12-317-12/+25
| | | | |
| | | * | Implented OnPlayerFishing and OnPlayerFished.STRWarrior2013-12-306-1/+97
| | | | |
| | * | | Fixed GetPhysicalRAMUsage on Linuxandrew2014-01-011-2/+2
| | | | |
| * | | | Merge branch 'master' into cmake-fixesTycho Bickerstaff2013-12-3114-16/+56
| |\| | |
| * | | | fixed bad mergeTycho Bickerstaff2013-12-221-4/+0
| | | | |
| * | | | merged in more warning fixesTycho Bickerstaff2013-12-222-3/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | merged in changesTycho Bickerstaff2013-12-223-2/+12
| |\ \ \ \
| * | | | | merged in warnings changesTycho Bickerstaff2013-12-2226-93/+94
| | | | | |
| * | | | | fixed accedental commitTycho Bickerstaff2013-12-221-2/+1
| | | | | |
| * | | | | fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker notTycho Bickerstaff2013-12-222-1/+33
| | | | | |
* | | | | | fogot to add promise classesTycho Bickerstaff2013-12-312-0/+92
| | | | | |
* | | | | | clean up code for patchingTycho Bickerstaff2013-12-313-3/+5
| | | | | |
* | | | | | Merge branch 'master' into threadsafequeueTycho Bickerstaff2013-12-3120-91/+69
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | removed unneccisary castTycho Bickerstaff2013-12-311-1/+2
| | | | | |
| * | | | | fixed warnings in LineBlockTracer.cppTycho Bickerstaff2013-12-311-1/+0
| | | | | |
| * | | | | fixed warnings in LightingThread.cppTycho Bickerstaff2013-12-311-0/+1
| | | | | |
| * | | | | take Z axis into account when calculating neighboors in LightingThread::ChunkReadyTycho Bickerstaff2013-12-311-1/+1
| | | | | |
| * | | | | fixed warnings in World.cppTycho Bickerstaff2013-12-314-6/+34
| | | | | |
| * | | | | fixxed warnings in Server.cppTycho Bickerstaff2013-12-311-0/+5
| | | | | |
| * | | | | fixed warnings in Inventory.cppTycho Bickerstaff2013-12-311-2/+2
| | | | | |
| * | | | | fixed warnings in bytebuffer.cppTycho Bickerstaff2013-12-312-4/+4
| | | | | |
| * | | | | fixed ClientHandle warningsTycho Bickerstaff2013-12-311-0/+1
| | | | | |
| * | | | | fixed warnings in webadmin.cppTycho Bickerstaff2013-12-311-0/+3
| | | | | |
| * | | | | fixed warnings in BlockArea.cppTycho Bickerstaff2013-12-311-0/+2
| | | | | |
| * | | | | Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure.Morgan Redshaw2013-12-311-2/+2
| | |_|/ / | |/| | |
| * | | | Fixed compilation in VC2008.madmaxoft2013-12-306-75/+13
| | |/ / | |/| | | | | | | | | | Also removed an unused inline header file (yuck).
* | | | refactored chunk Queue to seperate classTycho Bickerstaff2013-12-317-124/+162
| | | |
* | | | added link dependency between WorldStorage and OSSupportTycho Bickerstaff2013-12-221-0/+2
| | | |
* | | | Merge branch 'master' into threadsafequeueTycho Bickerstaff2013-12-2224-29/+92
|\| | |
| * | | converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-2216-39/+100
| | | |
| * | | Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-2260-233/+1990
| |\| |
| * | | Chunk is now warnings cleanTycho Bickerstaff2013-12-214-6/+5
| | | |
| * | | fixed hidden bug with furnaces ignoring time burntTycho Bickerstaff2013-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes this did not cause a problem as this function was only called with the same value as the one it was using for time burnt
| * | | Root is now warnings cleanTycho Bickerstaff2013-12-218-30/+32
| | | |
| * | | Piston is now warnings cleanTycho Bickerstaff2013-12-215-6/+6
| | | |
| * | | ChunkSender is now warnings cleanTycho Bickerstaff2013-12-216-9/+10
| | | |
* | | | Merge remote-tracking branch 'upstream/master' into threadsafequeueTycho Bickerstaff2013-12-2260-233/+1990
|\ \ \ \ | | |/ / | |/| |
| * | | Added HOOK_PLUGINS_LOADED.madmaxoft2013-12-296-3/+64
| | | | | | | | | | | | | | | | This fixes #482.
| * | | Merge pull request #481 from MikeHunsinger/masterMattes D2013-12-292-3/+49
| |\ \ \ | | | | | | | | | | Added function to create large birch tree images in birch forests
| | * | | Added function to create Tall Birch tree in BirchTreeForest biomesMike Hunsinger2013-12-292-3/+49
| | | |/ | | |/|
| * / | Fixed a (valid) warning in RCONServer.madmaxoft2013-12-281-0/+3
| |/ /
| * | Merge branch 'master' into cmake-winmadmaxoft2013-12-272-4/+56
| |\ \
| | * | Server now handles death messagesTiger Wang2013-12-261-0/+16
| | | |
| | * | Merge pull request #472 from mc-server/Extreme_Hills_MMattes D2013-12-261-4/+40
| | |\ \ | | | | | | | | | | Extreme hills
| | | * | Simplefied Extreme Hills M pattern select.STRWarrior2013-12-261-11/+3
| | | | |
| | | * | Extreme Hills M biomes now generate gravel, stone and grass patterns.STRWarrior2013-12-251-2/+10
| | | | |
| | | * | Changed tbGravel. Vanilla has 3 layers of gravel and then stone.STRWarrior2013-12-251-3/+3
| | | | |
| | | * | Normal extreme hills (plus) now generate a stone/grass pattern.STRWarrior2013-12-251-2/+20
| | | | |
| | | * | Re-added empty line.STRWarrior2013-12-251-0/+1
| | | | |
| | | * | This generates gravel in Extreme Hills M biomes.STRWarrior2013-12-252-3/+20
| | | | |
| * | | | Made cmake compilation possible on Windows.madmaxoft2013-12-274-21/+27
| | | | |
| * | | | Added proper precompiled headers for MSVC.madmaxoft2013-12-261-48/+47
| |/ / /
| * | | cBlockArea: Fixed writing full-height areas.madmaxoft2013-12-261-2/+2
| | | |
| * | | Merge pull request #461 from mc-server/repeatersMattes D2013-12-267-47/+314
| |\ \ \ | | |/ / | |/| | Repeaters, pressure plates, and others
| | * | Moved increment operator to back of variablesTiger Wang2013-12-261-9/+9
| | | |
| | * | Fixed rails not updating with diagonalsTiger Wang2013-12-251-0/+34
| | | |
| | * | Braced up some codeTiger Wang2013-12-251-0/+2
| | | |
| | * | Used IsGamemodeCreative() functionTiger Wang2013-12-251-1/+1
| | | |
| | * | Fixed comments in main.cpp and Player.cppTiger Wang2013-12-242-2/+2
| | | |
| | * | Implemented stone and wooden pressure platesTiger Wang2013-12-242-3/+105
| | | |
| | * | Improved knockback animationTiger Wang2013-12-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Critical hits now actually increase damage * Looking down at an entity and hitting them still produces upwards motion (as per Vanilla experience) * Reduced force to be more realistic
| | * | Improved player fall particle positionsTiger Wang2013-12-231-5/+2
| | | |
| | * | Provides an enhancement to daylight sensorsTiger Wang2013-12-231-2/+27
| | | |
| | * | Clarified some code in Player.cppTiger Wang2013-12-231-2/+5
| | | |
| | * | Fixed a comment in Entity.cppTiger Wang2013-12-231-1/+1
| | | |
| | * | Added some comments in main.cppTiger Wang2013-12-231-1/+1
| | | |
| | * | Daylight sensor sensing enhancementTiger Wang2013-12-231-9/+11
| | | |
| | * | A fix for daylight sensorsTiger Wang2013-12-221-2/+3
| | | |
| | * | Implemented knockback and critical hitTiger Wang2013-12-221-4/+21
| | | |
| | * | Added many event catchersTiger Wang2013-12-222-20/+78
| | | | | | | | | | | | | | | | | | | | | | | | * Window close * CTRL-C * etc.
| | * | Implemented fall particlesTiger Wang2013-12-221-3/+18
| | | |
| | * | Daylight sensorsTiger Wang2013-12-221-2/+1
| | | |
| | * | Fixed them again, confound itTiger Wang2013-12-221-9/+21
| | | |
| * | | Merge pull request #471 from mc-server/Fishing_CatapultMattes D2013-12-253-38/+206
| |\ \ \ | | | | | | | | | | You are now able to sweep mobs to your position using fishing rods.
| | * | | Fixed Parentheses.STRWarrior2013-12-251-2/+2
| | | | |
| | * | | You are now able to sweep mobs to your position using fishing rods.STRWarrior2013-12-253-38/+206
| | | | |
| * | | | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServermadmaxoft2013-12-252-9/+64
| |\ \ \ \
| | * | | | (Hopefully) fixed if conditionstonibm192013-12-251-4/+1
| | | | | |
| | * | | | Implemented xoft suggestion (partly)tonibm192013-12-251-25/+29
| | | | | | | | | | | | | | | | | | I only get it working in first condition. It seems it's not compatible with else if...
| | * | | | BLOCKTYPE...tonibm192013-12-241-2/+2
| | | | | |
| | * | | | Fixed compilationtonibm192013-12-241-29/+9
| | | | | |
| | * | | | Implemented xoft suggestiontonibm192013-12-241-7/+11
| | | | | |
| | * | | | Using BLOCKTYPE instead of inttonibm192013-12-241-2/+2
| | | | | |
| | * | | | Fixed commentstonibm192013-12-241-8/+8
| | | | | |
| | * | | | Changed a little how detection works and added comments.tonibm192013-12-241-28/+31
| | | | | |
| | * | | | Storing Y -1 and -2 blocks in a variabletonibm192013-12-241-5/+7
| | | | | |
| | * | | | Using parenthesistonibm192013-12-241-8/+8
| | | | | |
| | * | | | Fixed a possible crashtonibm192013-12-241-39/+42
| | | | | |
| | * | | | Improved iron golem detection algorithmtonibm192013-12-231-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | - You need to make it like in vanilla - Only used blocks are removed
| | * | | | Some fixes (SEE DESC)tonibm192013-12-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | -Added missing mobs (wither, enderdragon and iron golem) to type to string list. -Wither and iron golem can now spawn
| | * | | | You can now spawn iron golems.tonibm192013-12-231-3/+20
| | | | | | | | | | | | | | | | | | You can spawn them like in vanilla.
| * | | | | Fixed block area height check.madmaxoft2013-12-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The block area couldn't be read up to chunk height.
| * | | | | Preliminary mobile entity savingTiger Wang2013-12-254-13/+790
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs
| * | | | Merge pull request #469 from mc-server/Android_UpdateTiger Wang2013-12-242-3/+9
| |\ \ \ \ | | | | | | | | | | | | Android update
| | * | | | Fixed getting configure button going to port 0.STRWarrior2013-12-242-3/+9
| | |/ / /
| * | | | removed the function def alsoAlexander Harkness2013-12-241-1/+0
| | | | |
| * | | | Finally removed the function.Alexander Harkness2013-12-241-6/+0
| | | | |
| * | | | fixed compile?Alexander Harkness2013-12-241-1/+1
| | | | |
| * | | | finally removed them all?Alexander Harkness2013-12-241-1/+1
| | | | |
| * | | | updated another file...Alexander Harkness2013-12-241-4/+4
| | | | |
| * | | | Updated MakeColour's defenition in the header.Alexander Harkness2013-12-241-9/+9
| | | | |
| * | | | Update as per xoft's instructions.Alexander Harkness2013-12-241-1/+1
| | | | |
| * | | | Update chat coloursAlexander Harkness2013-12-241-3/+2
| | | | | | | | | | | | | | | @madmaxoft, is this right? fixes #467
| * | | | Replaced esCreeper with esMonster.madmaxoft2013-12-233-4/+7
| |/ / / | | | | | | | | | | | | Any monster will be able to explode, and also this fixes #425.
| * | | Fixed bug where snowgolems could replace non-solid blocks to snow blocks.STRWarrior2013-12-221-1/+3
| | | |
| * | | Snow golems die in hot biomes and leave a snow trail.STRWarrior2013-12-222-0/+18
| | | |
| * | | You can spawn snow golems with snow blocks and pumpkins.STRWarrior2013-12-221-0/+15
| | | |
| * | | EnderDragons and SnowGolems are able to spawn.STRWarrior2013-12-221-0/+2
| | | |
| * | | Fixed cacus breaking when next to any non-air block.STRWarrior2013-12-221-1/+1
| | | |
| * | | Made the lure enchantment work.STRWarrior2013-12-221-1/+1
| | | |
| * | | Fixed signedness warning in cItemGrid.madmaxoft2013-12-222-4/+4
| | | |
| * | | Fixed compiler warning.STRWarrior2013-12-221-1/+1
| | | |
| * | | Fishing underground is slower and fishing while raining is faster.STRWarrior2013-12-221-0/+15
| | | |
| * | | Fixed compiler warnings.STRWarrior2013-12-221-2/+2
| | | |
| * | | Countdown time is between 100 and 900 ticks.STRWarrior2013-12-221-1/+1
| | | |
| * | | Fishing now uses a countdown instead of a random number each tick.STRWarrior2013-12-222-12/+29
| | | |
| * | | Implented BroadcastParticleEffectSTRWarrior2013-12-2217-2/+122
| | | |
| * | | Using regular assignments.STRWarrior2013-12-211-6/+6
| | | |
| * | | Once again better Y direction for the items given when fishing.STRWarrior2013-12-211-2/+2
| | | |
| * | | You are now able to get different items from fishing.STRWarrior2013-12-211-2/+108
| | | |
| * | | Bindings regen script updated.madmaxoft2013-12-211-11/+6
| | | | | | | | | | | | | | | | The Bindings.cpp / .h files are no longer stored in the git repo.
| * | | Floater now dissapears when the player doesn't have an fishing rod equipped.STRWarrior2013-12-212-0/+32
| | |/ | |/|
* / | basic threadsafe queue interfaceTycho Bickerstaff2013-12-212-0/+34
|/ /
* | Merge branch 'cmake' of github.com:worktycho/MCServer into cmakeTycho Bickerstaff2013-12-212-5/+25
|\ \
| * | added precompiled headerstycho2013-12-201-13/+24
| | |
| * | fixed include of math on windowstycho2013-12-202-1/+10
| | |
* | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-2126-174/+221
|\ \ \ | |/ / |/| |
| * | You could now only get fish from non-source blocks. Fixed it.STRWarrior2013-12-211-1/+1
| | |
| * | Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around.STRWarrior2013-12-211-0/+5
| | |
| * | Fixed bug where you could get fish from non-source blocks.STRWarrior2013-12-211-1/+1
| |/
| * Fixed repeaters delay, maybeTiger Wang2013-12-203-12/+41
| | | | | | | | | | Also added basic daylight sensors, though because GetBlockSkylight always is 15, it doesn't work.
| * Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2013-12-209-97/+92
| |\
| | * Fixed the rest of constructor reorders.madmaxoft2013-12-209-97/+92
| | |
| * | Increased the range an Floater can shoot to.STRWarrior2013-12-201-1/+1
| |/
| * Fish now actualy jumps to the player instead of a few block bellow them.STRWarrior2013-12-201-1/+1
| |
| * Fixed bug where the floater could pop in the water while you could already get a fish.STRWarrior2013-12-201-2/+2
| |
| * More reordering fixes.madmaxoft2013-12-203-7/+16
| |
| * Fixed a typo in cBlockArea merging code.madmaxoft2013-12-201-2/+1
| |
| * Sorted a few constructors to remove warnings.madmaxoft2013-12-2010-49/+57
| |
| * Fixed minor warnings.madmaxoft2013-12-202-5/+7
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-2039-97/+114
|\|
| * Fixed warnings in HTTP parser.madmaxoft2013-12-204-5/+15
| |
| * Attempt at fixing cChunkDef::Height signedness.madmaxoft2013-12-204-21/+24
| |
| * Properly fixed warnings in cFastRandom.madmaxoft2013-12-201-4/+4
| |
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-2028-62/+66
| |
| * Fixed melon and pumpkin growing.madmaxoft2013-12-201-1/+1
| |
| * Fixed missing parenthesis.madmaxoft2013-12-201-4/+4
| |
* | Merge branch 'cmake' of github.com:worktycho/MCServer into cmakeTycho Bickerstaff2013-12-191-6/+16
|\ \
| * | fixed include paths on windows and added build dir to gitignoretycho2013-12-201-0/+2
| | |
| * | fixed compile errors with headers and math librarytycho2013-12-201-6/+15
| | |
| * | Merge branch 'master' into cmaketycho2013-12-2012-26/+276
| |\ \
| * | | fixed multiprocessing on windows and removed redundend compile of headerstycho2013-12-201-1/+0
| | | |
* | | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-192-21/+21
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed clang warnings in Noise.cpp.madmaxoft2013-12-201-20/+20
| | | | | | | | | | | | | | | | Fix-a-random-warning-per-day :)
| * | | Fixed assertion during dirt block OnUpdate()Tiger Wang2013-12-201-1/+1
| | |/ | |/|
* | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1912-26/+276
|\| | | |/ |/|
| * Merge pull request #450 from mc-server/redstonefixesMattes D2013-12-196-26/+94
| |\ | | | | | | Multiple fixes
| | * Fixed PlayerAbilities and creativeTiger Wang2013-12-193-13/+24
| | |
| | * Fixed 1.7 arm swing animationTiger Wang2013-12-191-1/+23
| | |
| | * Fixed dust from being placed on nonsolidsTiger Wang2013-12-192-1/+6
| | |
| | * Fixed repeaters not updating powerTiger Wang2013-12-191-11/+41
| | |
| * | Fixed #include in Floater.cpp.STRWarrior2013-12-191-1/+1
| | |
| * | The floater now actualy dives under water.STRWarrior2013-12-191-1/+1
| | |
| * | You can get fish from fishing :D. Only one type of fish though.STRWarrior2013-12-191-12/+27
| | |
| * | Implented cItemFishingRodHandler.STRWarrior2013-12-192-0/+65
| | |
| * | Implented IsFishing, SetIsFishing and GetFloaterID().STRWarrior2013-12-192-0/+12
| | |
| * | Added cFloater class.STRWarrior2013-12-193-0/+90
| | |
* | | fixed a number of windows issuestycho2013-12-191-13/+28
| | |
* | | added md5 as a dependency for bindingsTycho Bickerstaff2013-12-191-1/+2
| | |
* | | added expat as lua bindings dependincyTycho Bickerstaff2013-12-192-2/+2
| | |
* | | added all cpp files to bindingsTycho Bickerstaff2013-12-191-1/+4
| | |
* | | moved HTTPServer to globsTycho Bickerstaff2013-12-191-1/+5
| | |
* | | added pthread linking code to OSSupportTycho Bickerstaff2013-12-191-0/+4
| | |
* | | moved protocol to globTycho Bickerstaff2013-12-191-1/+5
| | |
* | | added blocks and blockentitiesTycho Bickerstaff2013-12-193-2/+18
| | |
* | | linked in luaTycho Bickerstaff2013-12-191-1/+1
| | |
* | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-193-14/+41
|\| |
| * | Disconnection message no longer shown if pingTiger Wang2013-12-181-5/+8
| | |
| * | Prettified command error messagesTiger Wang2013-12-182-9/+23
| | | | | | | | | | | | Using the magic of overlords (overloads) and standards compliance.
| * | The "<>" of a player name is now colouredTiger Wang2013-12-181-1/+1
| | |
| * | Fixed 1.7 player disconnection not calling hookTiger Wang2013-12-181-4/+14
| |/ | | | | | | This fixes #357
* | fixed bindings generationTycho Bickerstaff2013-12-191-8/+2
| |
* | bindings regenration logicTycho Bickerstaff2013-12-193-32240/+8
| |
* | added zlib and UITycho Bickerstaff2013-12-181-0/+11
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1850-306/+1327
|\|
| * Merge pull request #440 from mc-server/repeaterfixesMattes D2013-12-182-84/+77
| |\ | | | | | | Fixed redstone wire and certain repeater scenarios
| | * Fixed wire powering blocks beneathTiger Wang2013-12-181-1/+1
| | |
| | * Fixed bad repeater power queuing in corner caseTiger Wang2013-12-182-83/+76
| | | | | | | | | | | | | | | Repeaters remain queued to power even if their original source has since unpowered. Also functionised and cleaned up code.
| * | Merge pull request #442 from mc-server/Nether_WartMattes D2013-12-184-0/+110
| |\ \ | | | | | | | | Implented Nether Wart.
| | * | Implented Nether Wart.STRWarrior2013-12-184-0/+110
| | | |
| * | | Renamed back EntityAnimation to PlayerAnimationTiger Wang2013-12-188-15/+51
| |/ / | | | | | | | | | | | | This fixes #411 and partially reverts 30ead790490f04248b861db79fddde9148b552f4
| * / Removed offending tr1/memory header inclusion.madmaxoft2013-12-181-3/+0
| |/ | | | | | | We already use <memory> at line 160, this was a double include, additionally causing problems (#424).
| * 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.
| * cBlockArea: origin is initialized in the constructor and the loader.madmaxoft2013-12-171-0/+6
| |
| * Fixed naming and initialization.madmaxoft2013-12-171-4/+12
| |
| * Forgot to change one Vector3d to Vector3i.STRWarrior2013-12-171-1/+1
| |
| * Renamed Pos to m_Pos.STRWarrior2013-12-171-3/+3
| |
| * Using Recommendations.STRWarrior2013-12-171-10/+23
| |
| * Made buckets work when the player does not 'look' at a block. This fixes #265STRWarrior2013-12-171-32/+53
| |
| * Merge pull request #438 from mc-server/BoatsTiger Wang2013-12-165-14/+80
| |\ | | | | | | Implemented boating functionality.
| | * Boats spawn on top of a block. not between 4 blocks.STRWarrior2013-12-161-1/+1
| | |
| | * Using suggestions for Boat placing.STRWarrior2013-12-161-1/+1
| | |
| | * Boats drop a boat pickup when destroyed by hand. You can now actualy use boats.STRWarrior2013-12-162-3/+33
| | |
| | * Added HandleSpeedFromAttachee so an entity can override the function.STRWarrior2013-12-162-4/+15
| | |
| | * You can spawn boats on water.STRWarrior2013-12-161-7/+32
| | |
| * | Fixed multiple inheritance in ToLua++.madmaxoft2013-12-168-36/+127
| | | | | | | | | | | | This fixes #422.
| * | Removed some old cRedstone remnantsTiger Wang2013-12-163-30/+0
| |/
| * Fixed cClientHandle::Tick() being called from two threads.madmaxoft2013-12-165-31/+48
| | | | | | | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187.
| * Fixed multiple player spawn broadcasts.madmaxoft2013-12-161-3/+0
| |
| * Server saves if a player is flying.STRWarrior2013-12-151-1/+3
| |
| * Merge pull request #437 from mc-server/ShootTo_functionSTRWarrior2013-12-155-4/+49
| |\ | | | | | | Shoot to function
| | * Exported to LuaSTRWarrior2013-12-152-10/+10
| | |
| | * Renamed ShootTo function to ForceSetSpeed.STRWarrior2013-12-152-3/+3
| | |
| | * This adds a function that allows you to 'shoot' a player towards a direction.STRWarrior2013-12-155-4/+49
| | |
| * | Fixed player spawning packet.madmaxoft2013-12-151-1/+1
| | | | | | | | | | | | The player was spawned 1.62 blocks below their pos. This fixes #323.
| * | Fixed calling OnPlayerJoined() in the wrong place.madmaxoft2013-12-151-6/+1
| | | | | | | | | | | | This is the first part of a fix for #187.
| * | Merge pull request #433 from mc-server/redstoneimprovementsMattes D2013-12-151-1/+33
| |\ \ | | | | | | | | Fixed more wire bugs
| | * | Implemented xoft's suggestionsTiger Wang2013-12-151-3/+16
| | | |
| | * | Fixed wire repeater checkingTiger Wang2013-12-151-1/+1
| | | |
| | * | Wires now power repeaters properlyTiger Wang2013-12-151-0/+7
| | | |
| | * | Fixed the hopefully final wire self-powering bugTiger Wang2013-12-151-1/+13
| | | |
| * | | Fixed indentation.madmaxoft2013-12-151-1/+1
| | |/ | |/|
| * | Moved reading flags to the protocol.STRWarrior2013-12-153-19/+23
| | |
| * | Exported Set and Get functions to Lua.STRWarrior2013-12-152-2/+136
| | |
| * | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-155-3/+90
| | |
| * | Merge pull request #432 from mc-server/Broadcast_EffectsMattes D2013-12-157-3/+92
| |\ \ | | | | | | | | Broadcast effects
| | * | cPlayer is using the broadcast functions.STRWarrior2013-12-151-3/+3
| | | |
| | * | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-156-0/+89
| | | |
| * | | Fixed pre 1.7 clients crashing.STRWarrior2013-12-151-2/+2
| |/ /
| * | Merge pull request #431 from mc-server/Entity_EffectsMattes D2013-12-1415-4/+170
| |\ \ | | | | | | | | Entity Effects
| | * | Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h.STRWarrior2013-12-145-4/+31
| | | |
| | * | Added E_EFFECT_<Effect>STRWarrior2013-12-142-3/+32
| | | |
| | * | Forgot to commit the ClientHandle.STRWarrior2013-12-142-0/+20
| | | |
| | * | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-148-1/+91
| | | |
| * | | Added tolua++ redirection include.madmaxoft2013-12-141-0/+13
| | | | | | | | | | | | | | | | | | | | This is needed because ToLua++ regenerates the Bindings file with bad #include, and it would be too difficult to fix ToLua++; this is an easier solution. Should fix PR #431.
| * | | Removed leftover debugging messages from cProtocol172.madmaxoft2013-12-141-4/+0
| | | |
| * | | Merge pull request #430 from mc-server/redstoneimprovementsMattes D2013-12-149-33/+162
| |\ \ \ | | |/ / | |/| / | | |/ Implemented note block playing and fixed wire
| | * Potentially fixed debug assertsTiger Wang2013-12-141-5/+5
| | |
| | * Wires no longer power if a block cuts them offTiger Wang2013-12-141-23/+32
| | | | | | | | | | | | Also reduced more unneeded code.
| | * Implemented note block playing and fixed wireTiger Wang2013-12-149-5/+125
| | | | | | | | | | | | Game of Thrones music in Minecraft, here I come!
* | | added zlibTycho Bickerstaff2013-12-111-1/+1
| | |
* | | moved generating to globsTycho Bickerstaff2013-12-111-1/+5
| | |
* | | added UI folderTycho Bickerstaff2013-12-111-1/+3
| | |
* | | moved Worldstorage to globsTycho Bickerstaff2013-12-111-1/+5
| | |
* | | Merge branch 'master' of github.com:mc-server/MCServer into cmakeTycho Bickerstaff2013-12-112-8/+7
|\| |
| * | Merge branch 'master' into quickfixsTycho Bickerstaff2013-12-1127-514/+603
| |\ \
| * | | fixed unused expression warnings in blockFireTycho Bickerstaff2013-12-101-7/+6
| | | |
| * | | fixed comparison of thread handle to Null point rather than null handleTycho Bickerstaff2013-12-101-1/+1
| | | |
* | | | moved entities to globsTycho Bickerstaff2013-12-111-1/+5
| | | |
* | | | moved mobs to globsTycho Bickerstaff2013-12-111-1/+5
| | | |
* | | | moved simulor to globsTycho Bickerstaff2013-12-111-1/+5
| | | |
* | | | removed leakfinder form buildTycho Bickerstaff2013-12-111-1/+1
| | | |
* | | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1127-514/+603
|\ \ \ \ | | |/ / | |/| |
| * | | Exported the cTNTEntitySTRWarrior2013-12-144-9/+85
| | | |
| * | | Merge pull request #423 from mc-server/redstoneimprovementsMattes D2013-12-144-290/+158
| |\ \ \ | | | |/ | | |/| Redstone and configuration improvements
| | * | Fixed compilating!Tiger Wang2013-12-141-5/+5
| | | |
| | * | Improved player permissions loggingTiger Wang2013-12-141-1/+1
| | | |
| | * | Fixes to redstone wire and torchesTiger Wang2013-12-143-21/+37
| | | | | | | | | | | | | | | | | | | | | | | | + Wires now power blocks around the block beneath * Torches no longer power off if it is on a linked powered block * Enhanced code, split functions, etc.
| | * | Groups.ini and Users.ini are now generatedTiger Wang2013-12-142-3/+25
| | | |
| | * | Removed loads of unneeded code againTiger Wang2013-12-141-86/+60
| | | |
| | * | Reduced loads of unneeded codeTiger Wang2013-12-141-188/+44
| | | | | | | | | | | | | | | | Merged wire powering detection code into a single function.
| * | | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2013-12-146-194/+236
| |\| |
| | * | Merge pull request #419 from mc-server/redstoneloadingMattes D2013-12-132-3/+17
| | |\ \ | | | | | | | | | | Redstone data is now loaded on chunk load
| | | * | Improved redstone loading performanceTiger Wang2013-12-131-2/+10
| | | | |
| | | * | Fixed QueueSetBlock not sending to client changesTiger Wang2013-12-131-2/+1
| | | | |
| | | * | Redstone data is now loaded on chunk loadTiger Wang2013-12-132-0/+7
| | | | |
| | * | | Fixed threading issues affecting cProtocol172.madmaxoft2013-12-134-191/+219
| | | | |
| * | | | Fixed not getting XP from mobs.STRWarrior2013-12-142-1/+7
| |/ / /
| * / / Using "a_ClosestPlayer != NULL" in cExpOrb.STRWarrior2013-12-131-1/+1
| |/ /
| * | Unknown packet type extended to 32 bits.madmaxoft2013-12-122-4/+4
| | |
| * | Fixed protocol 1.7 recovery after unknown packet.madmaxoft2013-12-121-4/+0
| | |
| * | Fixed pistons being viable middle blockTiger Wang2013-12-111-0/+3
| | | | | | | | | | | | Also an excuse to update submodules
| * | Merge pull request #417 from mc-server/WorldUpdateMattes D2013-12-119-2/+99
| |\ \ | | | | | | | | World update
| | * | HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used.STRWarrior2013-12-111-0/+1
| | | |
| | * | Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins.STRWarrior2013-12-119-2/+98
| | | |
| * | | ExpOrbs now move.STRWarrior2013-12-111-4/+8
| | | |
| * | | Provides a possible fix for repeater timingsTiger Wang2013-12-102-2/+2
| | | | | | | | | | | | | | | | Not completely reliable, but at least some types of clock work.
| * | | added abort to DeadlockDetector to generate core dumps on failureTycho Bickerstaff2013-12-101-5/+2
| | |/ | |/|
* | | added tolua++ command and removed stackwalker from buildTycho Bickerstaff2013-12-103-6/+8
| | |
* | | more cmake changesTycho Bickerstaff2013-12-103-6/+15
| | |
* | | removed more accedentailly commited object filesTycho Bickerstaff2013-12-109-3985/+0
| | |
* | | removed accedentailly commited object filesTycho Bickerstaff2013-12-1027-0/+0
| | |
* | | more cmakeTycho Bickerstaff2013-12-1046-6/+4051
| | |
* | | more cmake stuffTycho Bickerstaff2013-12-103-2/+18
| | |
* | | started work on cmakeTycho Bickerstaff2013-12-104-0/+36
|/ /
* | Merge remote-tracking branch 'upstream/master'Tycho Bickerstaff2013-12-105-13/+96
|\|
| * Merge pull request #412 from mc-server/fixesMattes D2013-12-105-13/+96
| |\ | | | | | | Main feature: repeater delays!
| | * Readded initial lineTiger Wang2013-12-101-0/+1
| | |
| | * Fixed compile (alas, no more goto)Tiger Wang2013-12-101-11/+14
| | |
| | * Fixed Floody lava to stone fizzleTiger Wang2013-12-101-2/+16
| | |
| | * Added repeater delaysTiger Wang2013-12-102-1/+62
| | | | | | | | | | | | They DO sometimes get stuck though :P
| | * Slight redstone wire performance improvementTiger Wang2013-12-101-1/+6
| | |
| | * Changed more FastSetBlocks to SetBlocksTiger Wang2013-12-101-3/+3
| | | | | | | | | | | | Fixes duplication bugs.
| | * Improved pickups spawning speed againTiger Wang2013-12-102-7/+6
| | |
* | | moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741Tycho Bickerstaff2013-12-081-2/+4
| | |
* | | reordered initalisation order at src/Generating/Cave.h line 73Tycho Bickerstaff2013-12-081-2/+2
|/ /
* | fixed warnings in src/Generating/BioGen.cppTycho Bickerstaff2013-12-081-1/+1
| | | | | | | | | | | | removed unused variable at src/Generating/BioGen.cpp line 379 and added default fallthrough clause to switch at src/Generating/BioGen.cpp line 725
* | added default fallthrough clause to switch at line 178 of src/UI/Window.cppTycho Bickerstaff2013-12-081-0/+4
| |
* | Reordered Listed Initalisation order in src/UI/Window.cppTycho Bickerstaff2013-12-081-2/+2
| | | | | | | | | | | | | | Reordered the Listed Initalisation order for CWindow to the executed initalisation order. The compiler initalises values in the order the fields are declared not the initalisations listed
* | Removed unused variable ResultSlotTycho Bickerstaff2013-12-081-1/+0
| |
* | Fix Undefined behavior at Bindings/LuaWindow line 32worktycho2013-12-091-1/+4
| |
* | Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176worktycho2013-12-091-4/+3
| |
* | Fixed warning unchecked enum value at Chunk.cpp line 841worktycho2013-12-091-2/+4
| |
* | Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54worktycho2013-12-091-1/+4
|/
* Fixed angle normalization typo.madmaxoft2013-12-081-1/+1
|
* Fixed tolua++ compilation.madmaxoft2013-12-087-192/+5
| | | | Duplicate files, wrong includes, const-incorrect code...
* Fixed VS2008 compilation after those huge changes.madmaxoft2013-12-082-5/+7
|
* Merge pull request #408 from mc-server/SpawnPoint_FixMattes D2013-12-081-1/+1
|\ | | | | Now spawn points will not be in deep oceans or rivers etc.
| * Now spawn points will not be in deep oceans or rivers etc.STRWarrior2013-12-081-1/+1
| |
* | Readded redstone lamp handlerTiger Wang2013-12-081-0/+2
| |
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-0843-1251/+1348
|\| | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Fixed normalizing large angles.madmaxoft2013-12-084-8/+51
| |
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-0841-1238/+1237
| | | | | | | | Ref.: #407
| * Fixed stationary water starting fires and flowing lava not.madmaxoft2013-12-081-2/+2
| |
| * Added a SpawnFallingBlock function so plugins can make other blocks fall.STRWarrior2013-12-074-2/+93
| |
* | Fixed tabcompletion packet, fixes #356Tiger Wang2013-12-081-8/+4
| |
* | Fixed falling block metas, fixes #406Tiger Wang2013-12-081-1/+1
| |
* | Bonemeal has particles, fixes #393Tiger Wang2013-12-082-3/+8
| |
* | Console trims its commands before executing 'emTiger Wang2013-12-071-3/+3
| |
* | Fixed water starting firesTiger Wang2013-12-071-1/+0
| |
* | Improved piston animationsTiger Wang2013-12-071-4/+4
| |
* | Fixed some new 1.7 client crash bugsTiger Wang2013-12-074-1/+37
| | | | | | | | | | Some technical blocks were removed; trying to render them as items caused a crash.
* | Changed some FastSetBlocks to SetBlockTiger Wang2013-12-071-3/+3
| | | | | | | | Should fix some duplication glitches.
* | Fixed trapdoors not togglingTiger Wang2013-12-073-17/+103
| | | | | | | | The redstone simulator kept on resetting them.
* | Added basic ender chestsTiger Wang2013-12-0710-14/+355
| | | | | | | | Note that they just mirror chests now, so no per player inventory.
* | Renamed animation functionTiger Wang2013-12-0723-47/+82
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Fixed bed leave animationTiger Wang2013-12-061-1/+1
| |
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-067-16/+38
| | | | | | | | | | | | | | If a coordinate was queued, and then the block there was broken, it would reappear: double items! Also now just sets meta if previous and current blocktypes matched.
* | Added trapdoor cursor Y detectionTiger Wang2013-12-061-2/+0
| |
* | Puking now uses GetEyeHeight()Tiger Wang2013-12-061-1/+1
| |
* | Added pickup invalid item checkTiger Wang2013-12-061-0/+11
| | | | | | | | | | They aren't spawned at all if their itemtype isn't valid; possibly fixes the client crashing with bad pickups.
* | Re-implemented redstone duplicate checkingTiger Wang2013-12-061-0/+29
| |
* | Fixed eating using wrong animationTiger Wang2013-12-061-1/+1
| |
* | Fixed trapdoors not overriding OnUseTiger Wang2013-12-061-1/+1
| |
* | Spawn eggs use IsGameMode()Tiger Wang2013-12-061-2/+2
| | | | | | | | Possible fix for #316.
* | Tools make a sound when breaking, fixes #266Tiger Wang2013-12-062-2/+5
| |
* | Cleaned up torch code and added commentsTiger Wang2013-12-061-31/+7
| |
* | Removed another export and inline'd stuffTiger Wang2013-12-061-5/+5
| |
* | Removed exporting of a torch functionTiger Wang2013-12-061-3/+3
| |
* | Updated comments for slabsTiger Wang2013-12-061-5/+6
| |
* | Fixed pickups spawning for BlockEntitiesTiger Wang2013-12-061-1/+1
|/
* Merge pull request #394 from SamJBarney/masterMattes D2013-12-062-4/+8
|\ | | | | Fire no longer goes out when on top of nether rack
| * Merged if statements.Samuel Barney2013-12-051-7/+1
| |
| * Finished MergeSamuel Barney2013-12-051-2/+2
| |
| * Merge branch 'master' of https://github.com/mc-server/MCServerSamuel Barney2013-12-057-10/+97
| |\ | | | | | | | | | | | | Conflicts: src/Simulator/FireSimulator.h
| * | Made suggested changesSamuel Barney2013-12-042-6/+11
| | |
| * | Fire no longer goes out when on top of nether rackSamuel Barney2013-12-021-1/+6
| | |
* | | Added cPluginManager:GetCurrentPlugin() to Lua API.madmaxoft2013-12-051-7/+22
| |/ |/|
* | ByteBuffer: Fixed optimization failures with threading checks.madmaxoft2013-12-051-1/+1
| |
* | Hopefully fixed the sparc not being detectedAlexander Harkness2013-12-041-1/+3
| |
* | Lava can spawn fire.madmaxoft2013-12-045-8/+93
| | | | | | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
* | Fixed an error in cChunk's block ticking.madmaxoft2013-12-041-2/+2
|/ | | | Absolute coords were passed to a handler expecting relative coords.
* Removed stray printf, again.Samuel Barney2013-12-021-1/+0
|
* Switched to using provided ReadItem function.Samuel Barney2013-12-022-17/+12
| | | | 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 compiler warnings in LightingThread.cpp.madmaxoft2013-12-011-2/+2
|
* Fixed linux compile errors and formatting in RedstoneSimulator.cppmadmaxoft2013-12-011-14/+26
|
* DeadlockDetect is configurable now.madmaxoft2013-11-303-7/+15
| | | | This is needed when debugging Lua plugins.
* Fixed compiler warnings in IsBiomeNoDownfall().madmaxoft2013-11-301-1/+4
|
* Merge pull request #387 from mc-server/trapdoorsMattes D2013-11-3020-330/+431
|\ | | | | Trapdoors, redstone fixes, and snow
| * Fixed pistons extendingTiger Wang2013-11-301-0/+10
| | | | | | | | They didn't when a source was in front, but now they do! Yay!
| * Removed redstone duplicate power checkingTiger Wang2013-11-301-2/+0
| | | | | | | | There was no need for it, and it introduced some bugs.
| * Improved piston direction checkingTiger Wang2013-11-301-62/+8
| | | | | | | | Now uses AddFaceDirection, as suggested by xoft.
| * Pistons no longer accept power through front faceTiger Wang2013-11-302-3/+96
| | | | | | | | This fixes #60.
| * Fixed thin snow CanBeAt checkingTiger Wang2013-11-301-1/+13
| | | | | | | | | | Now takes into account the possibility that thin snow can be on top of full thin snow.
| * Properly fixed snow height, fixes #98 and #264Tiger Wang2013-11-303-25/+53
| |
| * Improved redstone speed and fixed a wire bugTiger Wang2013-11-301-73/+83
| | | | | | | | | | | | | | | | The redstone simulator no longer goes through the Powered and LinkedPowered blocks lists for EVERY item in the chunk data, instead, only at every tick. Also, wires powering each other that had the same data value is now fixed.
| * Stairs reset meta when dropped, fixes #269Tiger Wang2013-11-291-2/+22
| | | | | | | | Additionally, they now have walking sounds.
| * Implemented trapdoors, fixes #43 and #105Tiger Wang2013-11-295-3/+131
| | | | | | | | Also updated redstone simulator to support it
| * Removed unneeded CPP filesTiger Wang2013-11-2911-221/+77
| | | | | | | | Also removed unneeded #include in BlockStems
* | Changed cBlockHandler->OnUpdate() to use cChunk directly.madmaxoft2013-11-3015-63/+117
| |
* | Added IsBiomeNoDownfall() function.madmaxoft2013-11-303-103/+164
| |
* | Explicitly set spawnpoint fixes.madmaxoft2013-11-301-20/+11
| | | | | | | | | | The value names are case-insensitive. The debug message is printed only once.
* | Added the real tick duration to the OnWorldTick hook.madmaxoft2013-11-308-17/+34
| |
* | Grass doesn't spread to podzol or grassless dirt blocks.madmaxoft2013-11-301-2/+3
| |
* | Added floor pattern for MegaTaiga biomes.madmaxoft2013-11-301-1/+10
| |
* | Implemented mesa biomes in DistortedHeightmap CompoGen.madmaxoft2013-11-293-21/+106
| |
* | Fixed CheckerboardBiomeGen in negative coords.madmaxoft2013-11-291-2/+3
| |
* | DistortedHeightmap: Improved speed, prepared for mesa biomes.madmaxoft2013-11-292-157/+424
| | | | | | | | This generates the rainbow-mesa as seen on the first mesa screenshot in the forum.
* | Fixed an off-by-one error in cByteBuffer.madmaxoft2013-11-291-1/+1
| | | | | | | | Could have caused random protocol errors and maybe even crashes.
* | Alpha-sorted BlockMetas, added red sand.madmaxoft2013-11-291-125/+128
| |
* | Trees will generate in the new biomes.madmaxoft2013-11-282-14/+101
| | | | | | | | Only the generic trees, the special variants haven't yet been implemented.
* | Added new biomes to old composition generator.madmaxoft2013-11-284-0/+145
| | | | | | | | Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators.
* | Added new biomes to old height generators.madmaxoft2013-11-284-39/+179
| | | | | | | | Now Biomal and DistortedHeight generators will work with new biomes.
* | Moved BiomeGen creation from INI file data to BioGen.cpp.madmaxoft2013-11-283-48/+74
| | | | | | | | This way it can be shared between MCServer and BiomeVisualiser.
* | Moved json includes to where they are really needed.madmaxoft2013-11-283-1/+2
| |
* | BiomeVisualiser: Added the TwoLevel biome generator.madmaxoft2013-11-282-0/+229
|/
* Fixed a bug with TNT waking simulatorsTiger Wang2013-11-281-2/+2
|
* Improved TNT pickup randomisationTiger Wang2013-11-281-1/+1
|
* Made TNT pickups spawning chance 25%Tiger Wang2013-11-272-3/+3
|
* Merged master into redstonefixesTiger Wang2013-11-27465-0/+138834
|\
| * Voronoi-related biomegens use the new cVoronoiMap class.madmaxoft2013-11-273-54/+29
| |
| * Fixed a load of issues, clang autodetection works now.Alexander Harkness2013-11-271-1/+0
| | | | | | | | | | | | | | | | This fixes issue #210. This also removes the disableasm option, so it would be wise to remove it from any scripts that use it. I also removed a random line in the middle of globals.h, why was it there?
| * Added missing files for Voronoi map generation.madmaxoft2013-11-272-0/+140
| |
| * Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-2712-12/+12
| |
| * Fixed the remaining derpsAlexander Harkness2013-11-2726-30/+30
| |
| * Fixed some of tiger's derpyness.Alexander Harkness2013-11-279-11/+11
| |
| * ANOTHER compile fixTiger Wang2013-11-261-1/+1
| | | | | | | | This one was broken by bear. :P
| * Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-265-5/+5
| |
| * Compile fix againTiger Wang2013-11-261-1/+1
| |
| * Fixed Linux compile againTiger Wang2013-11-261-1/+1
| |
| * Fixed tolua++ filesTiger Wang2013-11-263-4/+4
| |
| * Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-2618-6/+268
| |\ | |/ |/| | | | | Conflicts: VC2008/MCServer.vcproj
| * Merge branch 'master' into foldermove2Alexander Harkness2013-11-261-3/+0
| |\ | |/ |/|
| * Fixed loads more of them.Alexander Harkness2013-11-2611-13/+13
| |
| * AnotherAlexander Harkness2013-11-261-1/+1
| |
| * And another.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed another.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed another one.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed a mis-includeAlexander Harkness2013-11-261-1/+1
| |
| * Further attempts to fix compileTiger Wang2013-11-2524-27/+27
| |
| * Attempt to fix compilationTiger Wang2013-11-2448-59/+58
| |
| * Moved SQLite, LuaExpat, and MD5 to /libTiger Wang2013-11-248-148557/+0
| |
| * Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-2466-1497/+2365
| |\ | |/ |/| | | | | Conflicts: GNUmakefile
| * Moved source to srcAlexander Harkness2013-11-24469-0/+285880
|/
* Android: Moved Android stuff to the ~/trunk/Android/ folder!faketruth2012-08-191-267/+0
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: Finally a log! :Dfaketruth2012-08-191-32/+44
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@754 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: Showing last MCServer related logcat messagefaketruth2012-08-191-13/+63
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@753 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: I'm probably using a lot of bad practices, but the app looks somewhat better now and polls the server statusfaketruth2012-08-181-9/+146
| | | | | | Android: Put quite some testing code in ToJava.h and app-android.cpp ... I still can't send log messages to Java. The issue is threads, I can't use JNI stuff from threads that were not created by Java (at least not easily) git-svn-id: http://mc-server.googlecode.com/svn/trunk@752 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: Pressing back button sends stop command to serverfaketruth2012-08-181-9/+30
| | | | | | | | Android: ToJava can call functions on Java by using JNI Android: Plugins work Android: Added android specific files to VS2008 project, but they are excluded from compiling git-svn-id: http://mc-server.googlecode.com/svn/trunk@747 0a769ca7-a7f5-676a-18bf-c427514a06d6
* MCServer should run just fine on Android now :Dfaketruth2012-08-161-3/+13
| | | | | | The server is also stoppable from Android git-svn-id: http://mc-server.googlecode.com/svn/trunk@743 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android!faketruth2012-08-151-0/+37
Disabled Squirrel for Android cLog now logs to Android LogCat as well Fixed Lua so it compiles on Android Removed/commented out exceptions in JsonCpp so it compiles on Android git-svn-id: http://mc-server.googlecode.com/svn/trunk@741 0a769ca7-a7f5-676a-18bf-c427514a06d6