summaryrefslogtreecommitdiffstats
path: root/src/World.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Exported boatLukas Pioch2017-05-241-1/+2
| | | | | | | - NBT: Added saving / loading of material - Added the material in the item handler of the boat - Drop the correct boat if destroyed - APIDoc: Added desc and functions
* Clang 5.0 fixesLukas Pioch2017-05-211-1/+1
| | | | | - Added override keyword - Removed inherited member variables
* Added some blocks and items (#3503)mathiascode2017-02-141-0/+1
|
* World: Remember the age persistently. (#3556)Mattes D2017-01-191-2/+5
|
* DeadlockDetect now lists some tracked CS's stats.Mattes D2017-01-181-5/+7
|
* Initial support for the 1.11 protocol.Mattes D2016-12-161-1/+1
|
* Removed ClientHandle.h dependencies from common headers.Mattes D2016-11-181-6/+3
|
* Spectators added (#2852)bibo382016-10-121-0/+4
|
* APIDump: Reformatted the docs to include type information.Mattes D2016-09-121-1/+2
| | | | Also fixed a bit of documentation in the CPP source.
* Configurable dirty unused chunk cap to avoid RAM overuse (#3359)LogicParrot2016-09-031-2/+10
| | | Configurable dirty unused chunk cap to avoid RAM overuse
* Delay EntityChangedWorld players' callback until Entity fully linked to world (#3330)ElNounch2016-08-221-3/+5
| | | | Otherwise, some API calls just don't seem to happen .gitignore tweak for test executables
* Added cWorld:SetSpawn() API and Lua binding (#3316)ElNounch2016-08-151-0/+3
|
* Updated API documentation.Mattes D2016-07-181-1/+1
|
* removed cast from BlockTrapdoor.h (#3256)gaurav sehgal2016-07-071-1/+1
|
* Makes tall grass and large flowers bonemealableQUSpilPrgm2016-06-031-0/+2
| | | | Adds the bonemeal particle effect to some more places
* Update Dispensers and let them act more like in VanillaQUSpilPrgm2016-06-031-6/+10
| | | | | | | | - Added code to make bonemeal, potions, minecarts, XP bottles and boats work inside dispensers - Dispensers are now able to place TNT if the block is transparent but not air - Added return value that indicates the success of pumpkin, melon, sugarcane and cactus growing functions - Changed return value of "GrowRipePlant" so that it actually indicates if the block was able to grow - Fixed "GrowSugarcane" and "GrowCactus" in "GrowRipePlant" so that it only grows them a single block
* 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135)Pokechu222016-05-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Semistable update to 15w31a I'm going through snapshots in a sequential order since it should make things easier, and since protocol version history is written. * Update to 15w34b protocol Also, fix an issue with the Entity Equipment packet from the past version. Clients are able to connect and do stuff! * Partially update to 15w35e Chunk data doesn't work, but the client joins. I'm waiting to do chunk data because chunk data has an incomplete format until 15w36d. * Add '/blk' debug command This command lets one see what block they are looking at, and makes figuring out what's supposed to be where in a highly broken chunk possible. * Fix CRLF normalization in CheckBasicStyle.lua Normally, this doesn't cause an issue, but when running from cygwin, it detects the CR as whitespace and creates thousands of violations for every single line. Lua, when run on windows, will normalize automatically, but when run via cygwin, it won't. The bug was simply that gsub was returning a replaced version, but not changing the parameter, so the replaced version was ignored. * Update to 15w40b This includes chunk serialization. Fully functional chunk serialization for 1.9. I'm not completely happy with the chunk serialization as-is (correct use of palettes would be great), but cuberite also doesn't skip sending empty chunks so this performance optimization should probably come later. The creation of a full buffer is suboptimal, but it's the easiest way to implement this code. * Write long-by-long rather than creating a buffer This is a bit faster and should be equivalent. However, the code still doesn't look too good. * Update to 15w41a protocol This includes the new set passengers packet, which works off of the ridden entity, not the rider. That means, among other things, that information about the previously ridden vehicle is needed when detaching. So a new method with that info was added. * Update to 15w45a * 15w51b protocol * Update to 1.9.0 protocol Closes #3067. There are still a few things that need to be worked out (picking up items, effects, particles, and most importantly inventory), but in general this should work. I'll make a few more changes tomorrow to get the rest of the protocol set up, along with 1.9.1/1.9.2 (which did make a few changes). Chunks, however, _are_ working, along with most other parts of the game (placing/breaking blocks). * Fix item pickup packet not working That was a silly mistake, but at least it was an easy one. * 1.9.2 protocol support * Fix version info found in server list ping Thus, the client reports that it can connect rather than saying that the server is out of date. This required creating separate classes for 1.9.1 and 1.9.2, unfortunately. * Fix build errors generated by clang These didn't happen in MSVC. * Add protocol19x.cpp and protocol19x.h to CMakeLists * Ignore warnings in protocol19x that are ignored in protocol18x * Document BLOCK_FACE and DIG_STATUS constants * Fix BLOCK_FACE links and add separate section for DIG_STATUS * Fix bat animation and object spawning The causes of both of these are explained in #3135, but the gist is that both were typos. * Implement Use Item packet This means that buckets, bows, fishing rods, and several other similar items now work when not looking at a block. * Handle DIG_STATUS_SWAP_ITEM_IN_HAND * Add support for spawn eggs and potions The items are transformed from the 1.9 version to the 1.8 version when reading and transformed back when sending. * Remove spammy potion debug logging * Fix wolf collar color metadata The wrong type was being used, causing several clientside issues (including the screen going black). * Fix 1.9 chunk sending in the nether The nether and the end don't send skylight. * Fix clang build errors * Fix water bottles becoming mundane potions This happened because the can become splash potion bit got set incorrectly. Water bottles and mundane potions are only differentiated by the fact that water bottles have a metadata of 0, so setting that bit made it a mundane potion. Also add missing break statements to the read item NBT switch, which would otherwise break items with custom names and also cause incorrect "Unimplemented NBT data when parsing!" logging. * Copy Protocol18x as Protocol19x Aditionally, method and class names have been swapped to clean up other diffs. This commit is only added to make the following diffs more readable; it doesn't make any other changes (beyond class names). * Make thrown potions use the correct appearence This was caused by potions now using metadata. * Add missing api doc for cSplashPotionEntity::GetItem * Fix compile error in SplashPotionEntity.cpp * Fix fix of cSplashPotionEntity API doc * Temporarilly disable fall damage particles These were causing issues in 1.9 due to the changed effect ID. * Properly send a kick packet when connecting with an invalid version This means that the client no longer waits on the server screen with no indication whatsoever. However, right now the server list ping isn't implemented for unknown versions, so it'll only load "Old" on the ping. I also added a GetVarIntSize method to cByteBuffer. This helps clean up part of the code here (and I think it could clean up other parts), but it may make sense for it to be moved elsewhere (or declared in a different way). * Handle server list pings from unrecognized versions This isn't the cleanest way of writing it (it feels odd to use ProtocolRecognizer to send packets, and the addition of m_InPingForUnrecognizedVersion feels like the wrong technique), but it works and I can't think of a better way (apart from creating a full separate protocol class to handle only the ping... which would be worse). * Use cPacketizer for the disconnect packet This also should fix clang build errors. * Add 1.9.3 / 1.9.4 support * Fix incorrect indentation in APIDesc
* Reduced unnecessary block updatesLogicParrot2016-04-221-2/+1
|
* Updated cChunk::SetMeta, fixed grass growth, reduced markDirty/setMeta usageLogicParrot2016-04-161-1/+2
|
* Proper entity destruction in non-ticking chunksLogicParrot2016-02-191-1/+0
|
* Bulk clearing of whitespaceLogicParrot2016-02-051-127/+127
|
* Exported GetSeed to lua and added file extension opendb to .gitignore.Lukas Pioch2016-01-121-0/+3
|
* Merge pull request #2542 from Haxi52/pinkstoneTiger Wang2015-12-191-8/+0
|\ | | | | Reorganised the redstone simulator
| * Reorganised the redstone simulatorTiger Wang2015-12-181-8/+0
| | | | | | | | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved
* | Revised the explosion-related Lua API and docs.Mattes D2015-12-181-14/+5
|/ | | | Fixes #2746.
* Add enum for Sound and Particle EffectsDave Tucker2015-11-241-1/+2
| | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
* Improved spawn location calculations.samoatesgames2015-11-131-1/+5
| | | | | | | | | | - Supports Overworld and Nether spawns. - Supports spawning under objects, but still above ground (e.g. under the leaves of a tree). - Protects against spawning in oceans. - Protects against spawning in water. - Uses a radial search about the origin, rather than a linear. - Correctly calculates Nether spawn on spawn world generation (fixes: cuberite#2548) - Fixes a bug in CheckPlayerSpawnPoint() where the X offset was used in both the X and Z coords (BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);)
* Implemented brewingLukas Pioch2015-11-031-0/+8
|
* Added weather intervals to world.ini settings.Mattes D2015-09-281-0/+3
|
* Prepared ScheduleTask for threading refactorTiger Wang2015-09-251-103/+4
| | | | | * Llama-ified and condensed Schedule/QueueTask - Removed hackery done with piston animations
* Add new "ForEach" function: ForEachLoadedChunk.tycho2015-09-241-1/+4
|
* Unified the doxy-comment format.Mattes D2015-07-311-7/+8
|
* Merge pull request #2363 from scribblemaniac/improve-spider-aiTiger Wang2015-07-161-0/+1
|\ | | | | Improved spider AI
| * Improved spider AIscribblemaniac2015-07-161-0/+1
| | | | | | | | Fixes #2335
* | Spawn baby mobshallucino2015-07-161-1/+1
|/
* Merge pull request #2224 from cuberite/ChunkQueueCollapsingworktycho2015-07-041-1/+1
|\ | | | | Chunk queue collapsing: MK II
| * Reinstate "Chunk queue collapsing"Tiger Wang2015-06-101-1/+1
| | | | | | | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18.
* | Added a size check for portals.STRWarrior2015-06-281-0/+18
| | | | | | | | | | | | Made the portal size configurable Alpha-sorted SetXYZNetherPortalXYZ functions
* | Buttons no longer click on when already on. Buttons now play sound when clicking off.Hax522015-06-241-0/+22
|/
* Revert "Chunk queue collapsing"worktycho2015-06-071-1/+1
|
* Moved Chunk Broadcasts over to the regular queuetycho2015-06-051-1/+1
|
* Made cLightingThread own its callbackstycho2015-05-301-2/+2
|
* Made -Weverything an error.tycho2015-05-241-1/+1
|
* Merge branch 'master' into PreventNewWarningstycho2015-05-231-4/+4
|\
| * Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2015-05-231-4/+4
| |
* | Fixed a lot of warningstycho2015-05-191-1/+1
|/
* More style checking.Mattes D2015-05-091-3/+3
| | | | Spaces around some operators are checked.
* Added support for additional data in the ParticleEffect Packettycho2015-05-071-1/+6
| | | | Also started refactoring how broadcasts are handled
* Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-241-20/+28
|\ | | | | Unify packetizer
| * Changed cEntity::m_UniqueID to UInt32.Mattes D2015-03-211-20/+28
| |
* | Changed linked world name variables and setters / getters.Mattes D2015-03-211-15/+16
| | | | | | | | | | Ref.: #1792 Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707
* | Added cPluginLua::cResettable interface, used for scheduled tasks.Mattes D2015-03-201-12/+8
|/ | | | | This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data. Fixes #1556.
* Monsters will now attack. Additional checks have been added when generating spawn.tumultenrx2015-03-131-0/+3
| | | | Monsters will now attack. Additional checks have been added when generating spawn.
* Converted cServer to use the cNetwork API.Mattes D2015-01-271-3/+6
|
* cWorld: Fixed a type warning.Mattes D2015-01-181-1/+1
|
* Fix trailing whitespaceTycho2015-01-111-1/+1
|
* Initial convertion of a_Dt to std::chronoTycho2015-01-111-15/+13
| | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
* Refactored all player block placing to go through hooks.Mattes D2014-12-241-0/+5
| | | | Fixes #1618.
* Merge branch 'master' into redstoneTiger Wang2014-12-131-7/+26
|\
| * Merge pull request #1657 from mc-server/PrepareChunkMattes D2014-12-111-0/+6
| |\ | | | | | | Prepare chunk
| | * Added a cWorld:PrepareChunk function.Mattes D2014-12-101-0/+6
| | | | | | | | | | | | | | | It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function.
| * | Merge pull request #1623 from p-mcgowan/issue_1253Mattes D2014-12-101-1/+1
| |\ \ | | |/ | |/| Prevent multiple logins with same username, unless allowed in settings
| | * removed GetUsernames() from WorldVincent2014-11-301-3/+0
| | |
| | * fixed naming of strings and changed from i to IVincent2014-11-291-1/+2
| | |
| | * issue 1253 - prevent multiple logins with same usernameVincent2014-11-291-0/+2
| | |
| * | Merged branch 'origin/master' into c++11.Mattes D2014-12-041-1/+2
| |\ \
| | * | Improved comments for cWorld::DoWithPlayer().Mattes D2014-11-301-1/+2
| | |/
| | * cWorld: Rewritten spawn preparation.Mattes D2014-11-221-0/+2
| | | | | | | | | | | | | | | It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting). Fixes #1597.
| * | Merge remote-tracking branch 'origin-master' into c++11Tiger Wang2014-11-261-0/+2
| | |
| * | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-231-4/+14
| |\| | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h
| | * Merge pull request #1598 from mc-server/SignEditorMattes D2014-11-181-4/+1
| | |\ | | | | | | | | Fixed a security problem with signs.
| | | * Fixed a security problem with signs.Howaner2014-11-151-4/+1
| | | |
| | * | Merge branch 'master' into ViewDistanceHowaner2014-11-141-0/+3
| | |\|
| | | * Fixed trailing whitespace.Mattes D2014-11-121-1/+1
| | | |
| | | * renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDumpLukas Pioch2014-11-051-2/+2
| | | |
| | | * Added FindAndDoWithUUIDLukas Pioch2014-11-021-0/+3
| | | |
| | * | ... in this worldHowaner2014-10-301-1/+1
| | | |
| | * | Added a MaxViewDistance option.Howaner2014-10-301-0/+10
| | |/
| * | Merged branch 'master' into c++11.Mattes D2014-10-241-3/+3
| |\|
| * | En masse NULL -> nullptr replaceTiger Wang2014-10-201-45/+45
| | |
| * | Migrated random generators to std::randomTiger Wang2014-10-191-1/+1
| | |
* | | Cleaned up simulatorsTiger Wang2014-10-251-4/+3
| |/ |/|
* | Merge branch 'master' into ChunkLoaderHowaner2014-10-231-183/+187
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h
| * | En masse NULL -> nullptr replaceTiger Wang2014-10-231-185/+189
| | |
* | | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-143/+139
|\| | | | | | | | | | | | | | Conflicts: src/World.h
| * | Merged branch 'master' of git://github.com/sriehl/MCServerMattes D2014-10-211-144/+140
| |\ \ | | |/ | |/|
| | * convert old style casts to fix warningsSteven Riehl2014-10-121-144/+140
| | |
* | | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-12/+13
|\| | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | Functions in cPluginManager get references instead of pointers.Mattes D2014-10-151-1/+1
| | |
| * | Fixed style.Mattes D2014-10-131-1/+2
| | |
| * | Aligned simulatorsworktycho2014-10-121-5/+5
| | |
| * | Moved a few objects to unique_ptrtycho2014-10-101-9/+9
| |/
* / Stream 4 chunks per tick. Added priority.Howaner2014-10-061-2/+2
|/
* Merge branch 'master' into FixesHowaner2014-09-261-5/+6
|\
| * Merge branch 'master' into redstoneTestsTycho2014-09-251-27/+34
| |\ | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h
| * \ Merge branch 'master' into redstoneTestsTycho2014-09-171-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h
| * | | Added first test to show the object can be createdTycho2014-09-171-2/+2
| | | |
| * | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-111-3/+4
| | | | | | | | | | | | | | | | THis wil hopefully allow for unit testing
* | | | Fixed players custom name in 1.8Howaner2014-09-261-1/+1
| |_|/ |/| |
* | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-191-0/+3
|\ \ \
| * | | Update World.hnesco2014-09-171-1/+1
| | | |
| * | | Preparing 1.8 update nesco2014-09-161-0/+3
| | |/ | |/| | | | Added Spectator gamemode
* | | Exported player list states to extra functions.Howaner2014-09-181-27/+31
| | |
* | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-1/+1
|\| | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h
| * | Spawn exp if you break a mob spawner.Howaner2014-09-121-1/+1
| |/
* | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-121-3/+3
|\|
| * TimeOfDay does not need to be an Int64Tycho2014-09-081-3/+3
| |
* | 1.8: Added ParticleEffect packet.Howaner2014-09-111-1/+1
| |
* | Added the player list to the 1.8 protocol.Howaner2014-09-091-1/+1
|/
* Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-051-7/+7
| | | | This fixes #1370.
* Merge remote-tracking branch 'origin/master' into EntitiesInBoxmadmaxoft2014-09-041-4/+4
|\
| * fix chunk regeneratingLO1ZB2014-08-291-1/+1
| |
| * remove y-coord from chunksLO1ZB2014-08-281-3/+3
| |
* | Added cWorld::ForEachEntityInBox()madmaxoft2014-09-031-0/+5
|/
* CheckBasicStyle checks the src folder as well.madmaxoft2014-08-141-1/+1
|
* Renamed functions.Howaner2014-08-101-4/+4
|
* Renamed m_DoDaylightCycle to m_CycleDaylight.Howaner2014-08-081-4/+4
|
* Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.Howaner2014-08-071-1/+13
| | | I need this for a GameRule plugin.
* Exported the beacon.Howaner2014-07-301-0/+5
|
* Merged branch 'howaner/Options'.madmaxoft2014-07-301-0/+7
|\
| * Add "Broadcasting" settings to world.iniHowaner2014-07-271-1/+7
| |
* | Slight cleanup after portalsTiger Wang2014-07-291-2/+3
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-291-25/+25
|\| | | | | | | | | Conflicts: src/World.h
| * Removed redundant semicolons and re-added warningarchshift2014-07-241-6/+6
| |
| * Added a queue for setting chunk data.madmaxoft2014-07-241-18/+18
| | | | | | | | Fixes #1196.
| * Export BroadcastEntityAnimation with ToLuaarchshift2014-07-221-1/+1
| | | | | | Fixes #752
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-5/+5
|\| | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-4/+4
| |
| * Fixed style: spaces after commas.madmaxoft2014-07-191-1/+1
| |
* | SuggestionsTiger Wang2014-07-211-0/+7
| |
* | Bug and crash fixesTiger Wang2014-07-201-1/+1
| | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files
* | Fix failed merge and other issuesTiger Wang2014-07-181-12/+0
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-29/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * Normalized comments.madmaxoft2014-07-171-1/+1
| | | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
| * Fixed spaces around single-line comments.madmaxoft2014-07-171-4/+4
| | | | | | | | There should be at least two spaces in front and one space after //-style comments.
| * Fixed basic whitespace problems.madmaxoft2014-07-171-7/+7
| | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
| * Made CreateProjectile a pointerworktycho2014-07-131-1/+1
| |
| * Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-1/+1
| |
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-13/+2
| |\ | | | | | | Implemented trapped chests & others
| | * Implemented trapped chests & othersTiger Wang2014-07-071-13/+2
| | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| * | Implemented support for forced chunk ticking.madmaxoft2014-07-101-0/+7
| | | | | | | | | | | | Fixes #1160.
| * | Fixed arrow collection animationTiger Wang2014-07-091-1/+0
| |/ | | | | | | * Fixed piston extension non-solidness
| * Redstone simulator is alerted to lever unpoweringTiger Wang2014-07-021-1/+1
| | | | | | | | | | * Fixed the "fix" that broke the fix for #535, thereby fixing said issue * Fixed #535
| * Added generic entity-collecting.Mattes D2014-06-271-0/+1
| | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* | Merge branch 'master' into portalsTiger Wang2014-06-211-1/+2
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Nullify deleted pointers.archshift2014-06-191-0/+1
| |
| * Merge branch 'master' into GlobalFixesHowaner2014-06-171-8/+73
| |\
| * | Add DoWithBlockEntityAt() to WorldInterface.hHowaner2014-06-171-1/+1
| | |
* | | Fixed invalid iteratorsTiger Wang2014-06-211-3/+0
| | |
* | | Cauldrons check the heightmapTiger Wang2014-06-141-3/+3
| | |
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-141-6/+32
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/World.h
| * | Removed an unused fwd declaration.madmaxoft2014-06-131-1/+0
| | |
| * | Fixed constnessworktycho2014-06-111-5/+5
| | |
| * | Compile fixTiger Wang2014-06-111-1/+1
| | |
| * | Reduced code duplicationTiger Wang2014-06-111-4/+4
| | | | | | | | | | | | | | | | | | call @maxmaxoft! calling... call connected (0:20) call ended
| * | IsWeatherSunnyAt does something useful :DTiger Wang2014-06-111-9/+5
| | |
| * | SMICOLOSLAlexander Harkness2014-06-111-4/+4
| | | | | | | | | Meant to be semicolons up there.
| * | Updated unnecessary function :/Tiger Wang2014-06-111-1/+5
| | |
| * | Add DoxyComments to he weather things. Alexander Harkness2014-06-111-7/+24
| | | | | | | | | Also changed the function names.
| * | Add new IsWeatherWet hook for cauldrons.Alexander Harkness2014-06-111-1/+12
| | | | | | | | | @madmaxoft can you comment?
* | | Merge branch 'master' into portalsTiger Wang2014-06-101-3/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * | Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-2/+19
| | | | | | | | | | | | Fixes #1039, fixes #851
| * | Added queue for adding entities to cWorld.Mattes D2014-06-081-1/+8
| | | | | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed.
* | | Portal improvements and suggestionsTiger Wang2014-06-101-2/+11
| | |
* | | SuggestionsTiger Wang2014-06-051-1/+3
| | |
* | | Configurable portalsTiger Wang2014-06-041-0/+24
| | |
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-1/+15
|\| |
| * | Changed block send queue to use vectorsTiger Wang2014-05-291-4/+2
| | | | | | | | | | | | As suggested by @worktycho.
| * | Hopefully fixed piston duplication issuesTiger Wang2014-05-251-1/+17
| |/ | | | | | | | | * Fixes #879 * Fixes #714
* / Cauldrons fillTiger Wang2014-05-291-2/+2
|/
* Merge branch 'master' into fixesTiger Wang2014-05-061-1/+1
|\ | | | | | | | | Conflicts: src/Vector3.h
| * Redstone simulator now directly accesses cChunkTiger Wang2014-04-271-1/+1
| | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes
* | Merge branch 'master' into fixes.madmaxoft2014-05-021-1/+4
|\|
| * Moved the weather picker out of TickWeather(), squashing a warning and improving readability.archshift2014-04-261-1/+4
| |
* | Merge branch 'master' into fixesTiger Wang2014-04-241-1/+1
|\| | | | | | | | | Conflicts: src/World.h
| * Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-1/+1
| |
* | Small changesTiger Wang2014-04-231-1/+3
|/
* Merge branch 'master' into overrideTycho2014-04-051-13/+13
|\ | | | | | | | | Conflicts: lib/tolua++/CMakeLists.txt
| * Fixed a few clang warnings.madmaxoft2014-03-301-3/+3
| |
| * Minor fixesandrew2014-03-251-10/+10
| |
| * Wither invulnerabilityandrew2014-03-241-1/+1
| |
* | Added override specifier to functions declared in cWorldTycho2014-03-221-8/+8
|/
* ENUMified shrapnel levelTiger Wang2014-03-201-6/+4
|
* Merge branch 'master' into awesometntTiger Wang2014-03-181-39/+39
|\ | | | | | | | | Conflicts: src/ChunkMap.cpp
| * Added override specifier where appropriate in cWorld.madmaxoft2014-03-161-37/+38
| |
| * Merge pull request #782 from mc-server/bedsMattes D2014-03-161-4/+4
| |\ | | | | | | Beds now work properly, fixes #707
| | * Beds now work properly fixes #707Tiger Wang2014-03-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp
| * | Unified Vector classesandrew2014-03-111-2/+1
| | |
* | | Added levels of shrapnelTiger Wang2014-03-181-4/+8
| | |
* | | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-101-2/+2
|\| | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp
| * | Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-091-1/+1
| |\ \ | | | | | | | | Add TNT load/save
| | * | Merge branch 'master' into BlockEntitysHowaner2014-03-081-1/+1
| | |\|
| | * | Change TNT Fuse to ticksHowaner2014-03-081-1/+1
| | | |
| * | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-5/+20
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-1/+1
| | | | | | | | | | | | | | | | + Added fireworks
* | | | Merge branch 'master' into awesometntTiger Wang2014-03-101-5/+20
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-071-4/+9
| |\ \ \ | | | |/ | | |/| Add Flower Pots
| | * | Add Lua Bindings for FlowerPotEntity.h and add documentation.Howaner2014-03-071-2/+2
| | | |
| | * | Add Flower PotsHowaner2014-03-071-2/+7
| | | |
| * | | Add SendBlockTo to cWorldInterfaceHowaner2014-03-051-1/+1
| |/ /
| * | Fixed previous weather changes.madmaxoft2014-03-031-1/+2
| | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
| * | Add cancelling to WeatherChanging event.Howaner2014-03-021-0/+3
| | |
| * | More documentation (thanks to madmaxoft) and use GetBlockTypeMetaHowaner2014-03-021-2/+2
| | |
| * | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone BugsHowaner2014-03-021-0/+6
| |/
* / Shrapnel now configurableTiger Wang2014-03-101-0/+6
|/
* Maps: Improvementsandrew2014-02-231-3/+6
|
* Thread safe cMap managerandrew2014-02-201-2/+3
|
* Manual merge (Fixed conflicts)andrew2014-02-201-32/+56
|\
| * Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+5
| |\ | | | | | | Add Skulls/Heads to MCServer
| | * Rename SkullEntity to MobHeadEntityHowaner2014-02-191-4/+4
| | |
| | * Add Heads completelyHowaner2014-02-181-0/+5
| | |
| * | The cuboid for cWorld::SetAreaBiome() doesn't need sorting.madmaxoft2014-02-181-1/+2
| | |
| * | Added cWorld:SetAreaBiome() API function.madmaxoft2014-02-181-1/+19
| | | | | | | | | | | | Fixes #675.
| * | Added a bit more documentation to cForEachChunkProvider.madmaxoft2014-02-181-4/+7
| |/
| * Removed the unnecessary LoopPlayersAndBroadcastChat() functions.madmaxoft2014-02-151-9/+7
| |
| * Implemented cCompositeChat.madmaxoft2014-02-151-1/+3
| | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
| * Merge pull request #677 from mc-server/BroadcastParticleEffectAlexander Harkness2014-02-151-1/+1
| |\ | | | | | | Broadcast particle effect
| | * Exported cWorld::BroadcastParticleEffect.STRWarrior2014-02-151-1/+1
| | |
| * | Merged branch 'narroo/master'.madmaxoft2014-02-131-1/+14
| |\ \ | | |/ | |/| | | | This merges pull request #661.
| | * Fixed formatting. Moved UnloadUnusedChunks from public to private.narroo2014-02-111-4/+3
| | |
| | * Fixed formatting of previous commit.narroo2014-02-111-2/+2
| | |
| | * Fixed bug #385. UnloadUnusedChunks now has the same interface asnarroo2014-02-111-1/+15
| | | | | | | | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking.
* | | Send map when selectedandrew2014-02-141-0/+6
| | |
* | | IDCount Serializationandrew2014-02-131-0/+11
|/ /
* | More gcc warnings fixed.madmaxoft2014-02-111-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into ChunkStaymadmaxoft2014-02-091-3/+20
|\|
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-0/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * \ Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-2/+2
| |\ \ | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * | | Improved chat messaging functionsTiger Wang2014-02-071-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
| * | | Added more chat functionsTiger Wang2014-02-061-1/+11
| | | |
* | | | Initial ChunkStay code.madmaxoft2014-02-081-3/+0
| |_|/ |/| |
* | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).STRWarrior2014-02-071-4/+4
| | |
* | | Implemented an easy way of adding new redstone simulators.STRWarrior2014-02-071-3/+6
| |/ |/| | | | | Also added a "noop" redstone simulator that does the same as the fluid version.
* | Merge pull request #635 from tonibm19/masterMattes D2014-02-041-1/+1
|\ \ | | | | | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
| * | Not exporting FindClosestPlayertonibm192014-02-031-1/+1
| | |
| * | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua APItonibm192014-02-031-1/+1
| |/
* / Increased Type safety of BiomesTycho2014-02-031-1/+1
|/ | | | | Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
* Changed pointers to referencesTycho2014-02-011-2/+2
|
* Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-011-0/+3
|\ | | | | | | | | Conflicts: src/World.h
| * The world can now be configured wether farmers should be able to harvest crops.STRWarrior2014-01-271-0/+3
| |
* | Changed signitures of Several BLockHandler MethodsTycho2014-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check
* | Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-261-1/+11
|\| | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h
| * Merge pull request #575 from worktycho/GeneratingBenchmarkMattes D2014-01-251-3/+4
| |\ | | | | | | More Interfaces to decouple Generator from the rest of the code
| * | Mob bugfixesTiger Wang2014-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563
| * | Command block fixes 2andrew2014-01-231-0/+9
| | |
* | | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-261-28/+28
| | |
* | | First attempt at Implementing InterfacesTycho2014-01-251-4/+5
| |/ |/|
* | Merge branch 'master' into GeneratingBenchmarkTycho2014-01-221-3/+12
|\| | | | | | | | | Conflicts: src/World.h
| * Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-130/+146
| |\
| * | Scoreboard protocol supportandrew2014-01-211-1/+4
| | |
| * | Basic scoreboard implementationandrew2014-01-191-0/+6
| | |
* | | Actually implemented interfacesTycho2014-01-201-0/+1
| | |
* | | Merge branch 'ForEachChunkProvider' into GeneratingBenchmarkTycho2014-01-201-6/+6
|\ \ \ | |_|/ |/| | | | | | | | Conflicts: src/World.h
| * | Seperated BlockArea From WorldTycho2014-01-201-3/+3
| | | | | | | | | | | | If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things
* | | Changed the cWorld::ScheduleTask() signature.madmaxoft2014-01-191-130/+146
| |/ |/| | | | | Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
* | Command blocks: Execute()andrew2014-01-181-1/+1
| |
* | Basic command block implementationandrew2014-01-181-6/+10
|/
* Added user setting compression factorTycho2014-01-171-0/+2
|
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-0/+3
|\ | | | | Added cWorld::SpawnMinecart.
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-1/+1
| |
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-1/+1
| |
| * Added cWorld::SpawnMinecart.STRWarrior2014-01-121-0/+3
| |
* | added cWorld::ScheduleTask FunctionTycho2014-01-141-0/+24
|/ | | | | ScheduleTask schedules a SceduledTask object to be run x ticks in the future. In is exported to lua, fixes #150
* Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-101-0/+24
| | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
* Exported cWorld::BroadcastBlockAction().madmaxoft2014-01-061-1/+1
| | | | As requested in #508; no guarantees about it.
* fixed warnings in World.cppTycho Bickerstaff2013-12-311-0/+1
|
* Replaced esCreeper with esMonster.madmaxoft2013-12-231-1/+1
| | | | Any monster will be able to explode, and also this fixes #425.
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+1
|
* Fixed the rest of constructor reorders.madmaxoft2013-12-201-1/+1
|
* Removed some old cRedstone remnantsTiger Wang2013-12-161-5/+0
|
* This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-151-0/+2
|
* Implemented note block playing and fixed wireTiger Wang2013-12-141-0/+5
| | | | Game of Thrones music in Minecraft, here I come!
* Redstone data is now loaded on chunk loadTiger Wang2013-12-131-0/+1
|
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-0/+3
|\ | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Added a SpawnFallingBlock function so plugins can make other blocks fall.STRWarrior2013-12-071-0/+3
| |
* | Renamed animation functionTiger Wang2013-12-071-1/+1
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-061-1/+1
|/ | | | | | | 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.
* Lava can spawn fire.madmaxoft2013-12-041-0/+3
| | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
* Added the real tick duration to the OnWorldTick hook.madmaxoft2013-11-301-1/+1
|
* Merged master into redstonefixesTiger Wang2013-11-271-1/+5
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+3
| | | | | Conflicts: VC2008/MCServer.vcproj
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-2/+8
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+744
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 11:04:48 +0100