summaryrefslogtreecommitdiffstats
path: root/src/World.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* correct comment to say millisecondsworktycho2015-01-171-1/+1
|
* Initial convertion of a_Dt to std::chronoTycho2015-01-111-42/+37
| | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
* Created new type cTickTime and rewrote cWorld::TickThread to use itTycho2015-01-111-6/+5
|
* Refactored all player block placing to go through hooks.Mattes D2014-12-241-2/+11
| | | | Fixes #1618.
* Fix compile error on OS X introduced by commit ecf778bbec2794562bf5e5b8645e2171f7cd081cJonathan Fabian2014-12-221-1/+1
| | | | The following error occurs on OS X with the order reversed: `MCServer/src/World.cpp:282:2: error: field 'm_LastSave' will be initialized after field 'm_LastUnload' [-Werror,-Wreorder] m_LastSave(0),`. Reversing the order of initialization fixes this.
* cWorld: Moved initialization into constructor.Mattes D2014-12-211-3/+2
| | | | Fixes CID 71781.
* Merge pull request #1581 from mc-server/redstoneMattes D2014-12-171-3/+3
|\ | | | | Resplit redstone .inc file and provided improvements
| * Merge branch 'master' into redstoneTiger Wang2014-12-131-160/+182
| |\
| * | Cleaned up simulatorsTiger Wang2014-10-251-3/+3
| | |
* | | Fixed mob invisibilityHowaner2014-12-141-1/+0
| | |
* | | "& 0x0f" isn't neededHowaner2014-12-141-1/+1
| | |
* | | FixesHowaner2014-12-131-1/+15
| |/ |/|
* | Merge pull request #1657 from mc-server/PrepareChunkMattes D2014-12-111-2/+11
|\ \ | | | | | | Prepare chunk
| * | Added a cWorld:PrepareChunk function.Mattes D2014-12-101-2/+11
| | | | | | | | | | | | | | | It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function.
* | | Merge pull request #1655 from tonibm19/patch-2Mattes D2014-12-101-1/+1
|\ \ \ | | | | | | | | Added NetherOreNests to default nether generator.
| * | | Moved NetherOreNeststonibm192014-12-101-1/+1
| | | |
| * | | Added NetherOreNests to nether default generator.tonibm192014-12-081-1/+1
| | | | | | | | | | | | Now there's quartz in the nether
* | | | Merge pull request #1623 from p-mcgowan/issue_1253Mattes D2014-12-101-0/+1
|\ \ \ \ | | | | | | | | | | Prevent multiple logins with same username, unless allowed in settings
| * | | | removed GetUsernames() from WorldVincent2014-11-301-15/+0
| | | | |
| * | | | fixed naming of strings and changed from i to IVincent2014-11-291-3/+7
| | | | |
| * | | | issue 1253 - prevent multiple logins with same usernameVincent2014-11-291-0/+12
| | | | |
* | | | | Moved NaturalPatches in front of PreSimulator and Animals.Mattes D2014-12-081-1/+1
| |/ / / |/| | |
* | | | Added NaturalPatches to finisherstonibm192014-12-081-1/+1
| |/ / |/| |
* | | Fixed crash on server stop.Mattes D2014-12-071-0/+9
| | | | | | | | | | | | | | | The entity destructors called through chunkmap destructor and chunk destructor were accessing the world which was in an already invalid state (half-destroyed). Fixed by destroying chunkmap explicitly and providing a nullptr check in the HasEntity() function.
* | | Fixed c++11 branch issues.Mattes D2014-12-071-1/+3
| | |
* | | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-12-061-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp
| * \ \ Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisherp-mcgowan2014-12-051-3/+3
| |\ \ \ | | | | | | | | | | | | | | | update
| | * | | Fixed reported parentheses around comparisons.Mattes D2014-12-051-2/+2
| | | | |
| * | | | forgot generation defaul initp-mcgowan2014-12-031-1/+1
| | | | |
* | | | | Merged branch 'origin/master' into c++11.Mattes D2014-12-041-3/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Allow Spectator Gamemode as a world default.Jonathan Fabian2014-12-031-1/+1
| |/ / /
| * | | Added better soulsand rimsSTRWarrior2014-12-011-1/+1
| | | | | | | | | | | | | | | | As a finisher called SoulsandRims
| * | | Fixed a crash in cSpawnPrepare.Mattes D2014-11-301-0/+2
| | | |
| * | | Improved comments for cWorld::DoWithPlayer().Mattes D2014-11-301-1/+1
| |/ /
| * | Merge pull request #1604 from mc-server/GeneratorShapeRefactorMattes D2014-11-241-13/+17
| |\ \ | | | | | | | | Generator shape refactor
| | * | cWorld: Changed generator defaults.Mattes D2014-11-201-13/+17
| | | |
| * | | Changed back capitalization.Mattes D2014-11-241-3/+3
| | | |
| * | | cWorld: Rewritten spawn preparation.Mattes D2014-11-221-120/+111
| |/ / | | | | | | | | | | | | 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-132/+123
| | |
* | | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-231-9/+23
|\| | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h
| * | Merge pull request #1598 from mc-server/SignEditorMattes D2014-11-181-9/+3
| |\ \ | | | | | | | | Fixed a security problem with signs.
| | * | Fixed a security problem with signs.Howaner2014-11-151-9/+3
| | | |
| * | | Merge branch 'master' into ViewDistanceHowaner2014-11-141-0/+17
| |\| |
| | * | Merge branch 'master' of https://github.com/mc-server/MCServerMattes D2014-11-061-1/+1
| | |\|
| | * | renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDumpLukas Pioch2014-11-051-2/+3
| | | |
| | * | Simplified FindAndDoWithUUID, formatted lineLukas Pioch2014-11-021-7/+1
| | | |
| | * | Added FindAndDoWithUUIDLukas Pioch2014-11-021-0/+22
| | |/
| * / Added a MaxViewDistance option.Howaner2014-10-301-0/+3
| |/
* | Merged branch 'master' into c++11.Mattes D2014-10-241-6/+5
|\|
| * Merge pull request #1565 from mc-server/MergedIniFileMattes D2014-10-241-1/+1
| |\ | | | | | | Merged ini file
| | * Merged IniFile into main MCS sources.Mattes D2014-10-231-1/+1
| | |
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-231-35/+35
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h
| | * En masse NULL -> nullptr replaceTiger Wang2014-10-231-35/+35
| | |
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-33/+40
| |\| | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | Stream 4 chunks per tick. Added priority.Howaner2014-10-061-4/+4
| | |
| * | Optimized chunk loaderHowaner2014-10-021-1/+0
| | |
* | | Missing space fix.Alexander Harkness2014-10-211-1/+1
| | |
* | | En masse NULL -> nullptr replaceTiger Wang2014-10-201-35/+35
| | |
* | | Migrated cSleep and cTimer to std::chronoTiger Wang2014-10-201-16/+11
| | |
* | | Migrated random generators to std::randomTiger Wang2014-10-191-1/+0
| |/ |/|
* | Functions in cPluginManager get references instead of pointers.Mattes D2014-10-151-5/+5
| |
* | cWorld: Fixed scheduler.Mattes D2014-10-131-9/+18
| | | | | | | | | | Fixes #1534. Added a test case into the Debuggers plugin.
* | Fixed style.Mattes D2014-10-131-2/+4
| |
* | Fix styleworktycho2014-10-121-2/+2
| |
* | Update World.cppworktycho2014-10-121-1/+1
| |
* | Fix lambda captureworktycho2014-10-111-1/+2
| |
* | Moved a few objects to unique_ptrtycho2014-10-101-29/+24
|/
* Fixed iron trapdoorsHowaner2014-09-301-2/+2
|
* World: Fixed chunk generation by plugins.madmaxoft2014-09-291-1/+1
| | | | ChunkWorx was broken, it was trying to generate chunks that were not properly marked as InQueue.
* Merge branch 'master' into FixesHowaner2014-09-261-6/+6
|\
| * Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-261-6/+6
| |\ | | | | | | Added test mocking to IncrementalRedstoneSimulator
| | * Merge branch 'master' into redstoneTestsTycho2014-09-251-7/+83
| | |\ | | | | | | | | | | | | | | | | 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-3/+3
| | | | |
| | * | | IncrementalRedstoneSimulator now has no dependencies on cChunkTycho2014-09-161-1/+1
| | | | |
| | * | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-111-3/+3
| | | | | | | | | | | | | | | | | | | | THis wil hopefully allow for unit testing
* | | | | Fixed players custom name in 1.8Howaner2014-09-261-2/+2
|/ / / /
* | | / Improved searching for spawn.madmaxoft2014-09-261-3/+14
| |_|/ |/| | | | | | | | Won't spawn on a small island inside ocean anymore.
* | | Merge branch 'master' into EntityCustomNameHowaner2014-09-231-45/+139
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/ClientHandle.h src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/World.cpp src/World.h
| * | | Exported player list states to extra functions.Howaner2014-09-181-3/+75
| | | |
| * | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/Items/ItemHoe.h
| | * | Fixed farmland issues.Howaner2014-09-121-1/+1
| | |/
| * | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-121-12/+24
| |\|
| | * Actually set defaultworktycho2014-09-091-0/+1
| | |
| | * use the correct ASSERTworktycho2014-09-081-2/+2
| | |
| | * FIxed a couple more warningsTycho2014-09-081-2/+8
| | |
| | * TimeOfDay does not need to be an Int64Tycho2014-09-081-1/+1
| | |
| | * Fixed a few compile warningsTycho2014-09-081-9/+14
| | |
| * | 1.8: Added ParticleEffect packet.Howaner2014-09-111-2/+2
| | |
| * | Added the player list to the 1.8 protocol.Howaner2014-09-091-3/+3
| |/
| * Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-051-18/+20
| | | | | | | | This fixes #1370.
| * Merge remote-tracking branch 'origin/master' into EntitiesInBoxmadmaxoft2014-09-041-11/+10
| |\
| | * Merge pull request #1351 from LO1ZB/remove-a_RelYMattes D2014-09-031-11/+10
| | |\ | | | | | | | | remove y-coord from chunks
| | | * hopefully the last commit for removing y-coord from chunks. :)LO1ZB2014-09-031-11/+2
| | | |
| | | * me being stupidLO1ZB2014-08-291-1/+1
| | | |
| | | * add commentsLO1ZB2014-08-291-1/+2
| | | |
| | | * fix chunk regeneratingLO1ZB2014-08-291-0/+8
| | | |
| | | * remove y-coord from chunksLO1ZB2014-08-281-11/+10
| | | |
| * | | Added cWorld::ForEachEntityInBox()madmaxoft2014-09-031-0/+9
| |/ /
* / / Added SetCustomName() to players.Howaner2014-09-021-5/+9
|/ /
* | Merge branch 'master' into fixesmadmaxoft2014-08-301-2/+4
|\ \
| * | Rewritten block entity loading.Mattes D2014-08-291-2/+4
| |/ | | | | | | | | | | Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked. The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't. Fixes #1354.
* | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-291-19/+57
|\| | | | | | | | | Conflicts: src/Server.cpp
| * World: Report chunk count for the spawn area.Mattes D2014-08-221-1/+1
| |
| * Added cWorld initializers.Mattes D2014-08-211-0/+30
| |
| * Code formatting fixes.Howaner2014-08-191-0/+1
| |
| * CheckBasicStyle checks the src folder as well.madmaxoft2014-08-141-1/+1
| |
| * Exported daylight cycle flag to the protocol.Howaner2014-08-111-8/+1
| |
| * Added a comment and simplified code.Howaner2014-08-101-5/+2
| |
| * Added IsDaylightCycleEnabled saving.Howaner2014-08-101-0/+2
| |
| * Renamed functions.Howaner2014-08-101-3/+3
| |
| * Renamed m_DoDaylightCycle to m_CycleDaylight.Howaner2014-08-081-3/+3
| |
| * Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.Howaner2014-08-071-17/+32
| | | | | | I need this for a GameRule plugin.
* | Improved explosion damageTiger Wang2014-08-291-3/+6
|/
* Fixed issues with autocomplete and time loadingTiger Wang2014-08-011-7/+33
| | | | * Fixes #1274
* Merge pull request #1269 from Howaner/BlockEntitysMattes D2014-08-011-0/+10
|\ | | | | Added beacon.
| * Exported the beacon.Howaner2014-07-301-0/+10
| |
* | Capitalised "incremental"Howaner2014-07-311-4/+4
| |
* | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator.Howaner2014-07-311-2/+2
|/
* Merged branch 'howaner/Options'.madmaxoft2014-07-301-0/+3
|\
| * Add "Broadcasting" settings to world.iniHowaner2014-07-271-0/+3
| |
* | Slight cleanup after portalsTiger Wang2014-07-291-2/+4
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-291-32/+63
|\| | | | | | | | | Conflicts: src/World.h
| * Added a queue for setting chunk data.madmaxoft2014-07-241-32/+53
| | | | | | | | Fixes #1196.
| * Made the cWorld::SpawnMobFinalize function more readable.STRWarrior2014-07-241-0/+10
| |
* | SuggestionsTiger Wang2014-07-231-6/+3
| |
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-11/+6
| |
* | Suggestion and failed merge fixTiger Wang2014-07-221-0/+5
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-9/+4
|\| | | | | | | | | | | | | | | 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-1/+1
| |
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-3/+3
| |
| * Fixed style: spaces after commas.madmaxoft2014-07-191-1/+1
| |
| * World.cpp: fixed not all enum fields being used in m_Dimension switcharchshift2014-07-191-1/+2
| |
* | SuggestionsTiger Wang2014-07-211-56/+79
| |
* | Bug and crash fixesTiger Wang2014-07-201-8/+16
| | | | | | | | | | | | | | | | | | * 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-10/+6
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-48/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10/+10
| | | | | | | | | | 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-17/+15
| | | | | | | | There should be at least two spaces in front and one space after //-style comments.
| * Fixed basic whitespace problems.madmaxoft2014-07-171-5/+5
| | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
| * Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-161-1/+1
| |\ | | | | | | Skins
| | * Player properties are now retrievedTiger Wang2014-07-141-1/+1
| | |
| * | Fixed FindClosestPlayerTycho2014-07-151-3/+6
| | |
| * | Made CreateProjectile a pointerworktycho2014-07-131-1/+1
| | |
| * | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-3/+3
| |/
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-4/+13
| |\ | | | | | | Implemented trapped chests & others
| | * Implemented trapped chests & othersTiger Wang2014-07-071-4/+13
| | | | | | | | | | | | | | | | | | | | | + 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/+9
| | | | | | | | | | | | Fixes #1160.
| * | Fixed arrow collection animationTiger Wang2014-07-091-9/+0
| |/ | | | | | | * Fixed piston extension non-solidness
| * Removed world-saving log messages.madmaxoft2014-07-041-2/+0
| | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1518
| * Added generic entity-collecting.Mattes D2014-06-271-1/+10
| | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* | Merge branch 'master' into portalsTiger Wang2014-06-211-6/+9
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Nullify deleted pointers.archshift2014-06-191-6/+9
| |
* | Fixed invalid iteratorsTiger Wang2014-06-211-10/+4
| |
* | Fixed order of initalisationTycho2014-06-121-3/+4
| |
* | Portals animate and delay correctlyTiger Wang2014-06-121-3/+6
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-30/+106
|\| | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * Fixed a race condition when adding a player to a world.madmaxoft2014-06-101-4/+1
| |
| * Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-29/+82
| | | | | | | | Fixes #1039, fixes #851
| * Added queue for adding entities to cWorld.Mattes D2014-06-081-1/+27
| | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed.
* | Portal improvements and suggestionsTiger Wang2014-06-101-5/+13
| |
* | Fixed Time of dayworktycho2014-06-071-1/+1
| |
* | SuggestionsTiger Wang2014-06-051-9/+2
| |
* | Time and weather is saved, part of #1058Tiger Wang2014-06-041-0/+12
| | | | | | | | Also fixed unreliability in Health and LootPickup loading.
* | Configurable portalsTiger Wang2014-06-041-0/+26
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-2/+45
|\|
| * Changed block send queue to use vectorsTiger Wang2014-05-291-11/+10
| | | | | | | | As suggested by @worktycho.
| * Hopefully fixed piston duplication issuesTiger Wang2014-05-251-2/+46
| | | | | | | | | | * Fixes #879 * Fixes #714
* | Implemented end and nether portalsTiger Wang2014-05-311-0/+31
|/
* World pre-generation distance is settable in world.ini.Mattes D2014-05-091-2/+6
|
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-091-4/+3
|
* Moved the weather picker out of TickWeather(), squashing a warning and improving readability.archshift2014-04-261-24/+26
|
* Removed impossible default case.archshift2014-04-261-6/+0
| | | | Squashed a warning.
* Removed extraneous switch{} in Start()archshift2014-04-261-15/+0
| | | | Squashed a warning.
* Small changes; warning fixing.archshift2014-04-251-6/+3
|
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-221-5/+5
|\ | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-181-5/+4
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp
| * | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-5/+5
| | |
* | | Fixed #904Tiger Wang2014-04-181-0/+5
| |/ |/|
* | Rewrote redstone powering to use power levelsTiger Wang2014-04-151-1/+1
| |
* | Simplified pickup speed randomisationTiger Wang2014-04-121-4/+3
|/
* Fixed double projectile spawning.madmaxoft2014-04-051-1/+0
| | | | Two spawn packets were sent per projectile.
* Removed unused constants.madmaxoft2014-03-251-3/+0
| | | | DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now.
* Fixed code style after recent merge.madmaxoft2014-03-201-30/+28
|
* Added bracesTiger Wang2014-03-201-0/+2
|
* ENUMified shrapnel levelTiger Wang2014-03-201-3/+3
|
* Merge branch 'master' into awesometntTiger Wang2014-03-181-6/+5
|\ | | | | | | | | Conflicts: src/ChunkMap.cpp
| * Merge branch 'master' into warningsTycho2014-03-141-3/+3
| |\
| | * Fixed a warning.madmaxoft2014-03-141-3/+3
| | |
| * | Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-121-2/+2
| | |
| * | Merge branch 'Werror' into warningsTycho2014-03-121-1/+0
| |\| | | | | | | | | | | | | Conflicts: src/Globals.h
| | * Unified Vector classesandrew2014-03-111-1/+0
| | |
| * | Fixed more Format issuesTycho2014-03-111-2/+2
| |/
* | Added levels of shrapnelTiger Wang2014-03-181-1/+3
| |
* | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-101-11/+11
|\| | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp
| * Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-091-2/+2
| |\ | | | | | | Add TNT load/save
| | * Merge branch 'master' into BlockEntitysHowaner2014-03-081-8/+18
| | |\
| | * | Change TNT Fuse to ticksHowaner2014-03-081-2/+2
| | | |
| * | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-27/+112
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | | Improved formatting of username tabcompleteTiger Wang2014-03-091-7/+7
| | | |
| * | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-2/+2
| | | | | | | | | | | | | | | | + Added fireworks
* | | | Merge branch 'master' into awesometntTiger Wang2014-03-101-27/+112
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-071-2/+11
| |\ \ \ | | | |/ | | |/| Add Flower Pots
| | * | Add Lua Bindings for FlowerPotEntity.h and add documentation.Howaner2014-03-071-2/+2
| | | |
| | * | Add Flower PotsHowaner2014-03-071-0/+9
| | | |
| * | | Merge remote-tracking branch 'xdot/master'madmaxoft2014-03-061-8/+18
| |\ \ \ | | |/ / | |/| |
| | * | Implemented vanilla-like fluid simulatorandrew2014-03-051-8/+18
| | | |
| * | | Fixed an assert in map-loading.madmaxoft2014-03-041-3/+1
| | | | | | | | | | | | | | | | The maps were loaded too soon, the world wasn't initialized yet.
| * | | Fixed previous weather changes.madmaxoft2014-03-031-3/+3
| | | | | | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
| * | | Merge pull request #746 from Howaner/SlabsMattes D2014-03-031-13/+81
| |\ \ \ | | |/ / | |/| | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
| | * | Add cancelling to WeatherChanging event.Howaner2014-03-021-13/+40
| | | |
| | * | More documentation (thanks to madmaxoft) and use GetBlockTypeMetaHowaner2014-03-021-4/+8
| | | |
| | * | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone BugsHowaner2014-03-021-0/+37
| | |/
| * / cBlockInfo now manages the respective cBlockHandlerandrew2014-03-021-1/+1
| |/
* | Shrapnel now configurableTiger Wang2014-03-101-2/+1
| |
* | Added extra awesomeness to TNTTiger Wang2014-03-051-1/+5
|/ | | | | | | + TNT now has a chance of flinging FallingBlock entities around * Improved TNT damage * Improved TNT spawning visuals * Possible fix for 'SetSwimState failure' messages in debug
* Merge pull request #669 from xdot/masterTiger Wang2014-02-241-0/+8
|\ | | | | Implementation of in-game maps :D
| * Maps: Improvementsandrew2014-02-231-3/+3
| |
| * Thread safe cMap managerandrew2014-02-201-1/+2
| |
| * Manual merge (Fixed conflicts)andrew2014-02-201-95/+85
| |\
| * | Map item handler; Fixed several bugsandrew2014-02-171-8/+20
| | |
| * | Send map when selectedandrew2014-02-141-2/+43
| | |
| * | IDCount Serializationandrew2014-02-131-0/+54
| | |
* | | Merge pull request #700 from Howaner/GlobalFixesMattes D2014-02-201-4/+6
|\ \ \ | |_|/ |/| | Add new Trees (without Generator)
| * | Add BlockNewLeaves.h and rename Darkoac to DarkoakHowaner2014-02-191-6/+6
| | |
| * | Add new Trees (without Generator)Howaner2014-02-191-0/+2
| | |
* | | Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+9
|\ \ \ | |/ / |/| | Add Skulls/Heads to MCServer
| * | Rename SkullEntity to MobHeadEntityHowaner2014-02-191-2/+2
| | |
| * | Add Heads completelyHowaner2014-02-181-0/+9
| | |
* | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting.madmaxoft2014-02-181-1/+5
| | |
* | | Added cWorld:SetAreaBiome() API function.madmaxoft2014-02-181-0/+37
|/ / | | | | | | Fixes #675.
* | Removed the unnecessary LoopPlayersAndBroadcastChat() functions.madmaxoft2014-02-151-1/+1
| |
* | Implemented cCompositeChat.madmaxoft2014-02-151-1/+19
| | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
* | Merged branch 'narroo/master'.madmaxoft2014-02-131-0/+22
|\ \ | |/ |/| | | This merges pull request #661.
| * Fixed formatting. Moved UnloadUnusedChunks from public to private.narroo2014-02-111-0/+7
| |
| * Fixed formatting of previous commit.narroo2014-02-111-0/+5
| |
| * Fixed bug #385. UnloadUnusedChunks now has the same interface asnarroo2014-02-111-0/+10
| | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking.
* | More gcc warnings fixed.madmaxoft2014-02-111-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into ChunkStaymadmaxoft2014-02-091-6/+9
|\|
| * Fixed compile and some warnings in MSVSTiger Wang2014-02-091-2/+0
| |
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-4/+36
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * \ Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-3/+3
| |\ \ | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * | | Moved Gamemode setting into General root tagTiger Wang2014-02-071-1/+1
| | | |
| * | | Added sender name to PM if prefixes disabledTiger Wang2014-02-071-1/+1
| | | | | | | | | | | | | | | | * Also moved the PVP setting into Mechanics
| * | | Improved chat messaging functionsTiger Wang2014-02-071-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
* | | | Initial ChunkStay code.madmaxoft2014-02-081-12/+0
| |_|/ |/| |
* | | Fixed comment.STRWarrior2014-02-081-1/+1
| | |
* | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).STRWarrior2014-02-071-12/+8
| | |
* | | Implemented an easy way of adding new redstone simulators.STRWarrior2014-02-071-3/+37
| | | | | | | | | | | | Also added a "noop" redstone simulator that does the same as the fluid version.
* | | Merge pull request #646 from worktycho/warningfixesAlexander Harkness2014-02-051-2/+2
|\ \ \ | |_|/ |/| | Fixed most of the reordering warnings
| * | Fixed most of the reordering warningsTycho2014-02-051-2/+2
| | |
* | | Merge pull request #635 from tonibm19/masterMattes D2014-02-041-1/+1
|\ \ \ | |/ / |/| | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
| * | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua APItonibm192014-02-031-1/+1
| |/
* / Increased Type safety of BiomesTycho2014-02-031-2/+2
|/ | | | | 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
* Merge pull request #602 from mc-server/improvementsandfixesMattes D2014-02-031-3/+3
|\ | | | | Redstone crash fix and current console line replace function
| * Added IsBlockWaterOrIce()Tiger Wang2014-02-021-1/+1
| |
| * Revert "Added LOGREPLACELINE for line replacement"Tiger Wang2014-02-021-5/+5
| | | | | | | | This reverts commit 7d03876a3e11aedff0201a8330bfdb2b5523fc5e.
| * Revert "Improved code"Tiger Wang2014-02-021-2/+0
| | | | | | | | This reverts commit d8aa0b0ec7a2ebea2fc157c623ae8cd7d0b6ba1c.
| * Possibly fixed #618Tiger Wang2014-02-021-2/+2
| |
| * Added checks for ice into IsBlockWater()Tiger Wang2014-02-011-1/+1
| | | | | | | | | | * This fixes players spawning in vast oceans of ice, as opposed to the previous water
| * Improved codeTiger Wang2014-01-311-0/+2
| | | | | | | | | | * Fixed some issues * Fixed standard violation
| * Added LOGREPLACELINE for line replacementTiger Wang2014-01-291-5/+5
| |
* | Changed pointers to referencesTycho2014-02-011-4/+3
| |
* | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-011-2/+2
|\ \ | | | | | | | | | | | | Conflicts: src/World.h
| * | Attempt at implementing #563tonibm192014-01-301-2/+1
| |/ | | | | Not tested (I don't have RasPi)
| * The world can now be configured wether farmers should be able to harvest crops.STRWarrior2014-01-271-0/+1
| |
* | Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-261-3/+37
|\| | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h
| * Did what xoft recommendedTiger Wang2014-01-251-1/+1
| |
| * Mob bugfixesTiger Wang2014-01-251-2/+11
| | | | | | | | | | | | | | | | | | | | * 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-1/+26
| |
* | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-261-88/+5
|/
* cWorld now saves/loads the scoreboardandrew2014-01-221-0/+9
|
* Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-15/+21
|\
| * Changed the cWorld::ScheduleTask() signature.madmaxoft2014-01-191-11/+21
| | | | | | | | 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.
| * 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-181-6/+3
| | |
| | * Increased tick count to longTycho2014-01-171-2/+2
| | |
| | * Implemented xsofts suggestion for a saturating counter in the schedulerTycho2014-01-171-5/+5
| | |
* | | Scoreboard protocol supportandrew2014-01-211-1/+56
|/ /
* | 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
| | |
* | | Basic command block implementationandrew2014-01-181-0/+9
|/ /
* / Added user setting compression factorTycho2014-01-171-1/+3
|/
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-0/+24
|\ | | | | Added cWorld::SpawnMinecart.
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-2/+2
| |
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-3/+3
| |
| * Added cWorld::SpawnMinecart.STRWarrior2014-01-121-0/+24
| |
* | added cWorld::ScheduleTask FunctionTycho2014-01-141-0/+39
|/ | | | | 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-1/+77
| | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
* rewrote queue not to use promises for waitsTycho Bickerstaff2014-01-021-1/+4
|
* fixed warnings in World.cppTycho Bickerstaff2013-12-311-1/+3
|
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+9
|
* Fixed the rest of constructor reorders.madmaxoft2013-12-201-6/+6
|
* Removed some old cRedstone remnantsTiger Wang2013-12-161-24/+0
|
* This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-151-0/+18
|
* Implemented note block playing and fixed wireTiger Wang2013-12-141-0/+9
| | | | Game of Thrones music in Minecraft, here I come!
* Improved pickups spawning speed againTiger Wang2013-12-101-4/+4
|
* 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
| |
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-2/+13
|\| | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-2/+1
| | | | | | | | Ref.: #407
| * Added a SpawnFallingBlock function so plugins can make other blocks fall.STRWarrior2013-12-071-0/+12
| |
* | Bonemeal has particles, fixes #393Tiger Wang2013-12-081-0/+6
| |
* | Renamed animation functionTiger Wang2013-12-071-2/+2
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-061-2/+2
| | | | | | | | | | | | | | 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 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.
* Lava can spawn fire.madmaxoft2013-12-041-0/+1
| | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
* Changed cBlockHandler->OnUpdate() to use cChunk directly.madmaxoft2013-11-301-2/+2
|
* 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-301-9/+10
|
* Made TNT pickups spawning chance 25%Tiger Wang2013-11-271-1/+1
|
* Merged master into redstonefixesTiger Wang2013-11-271-11/+73
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+12
| | | | | Conflicts: VC2008/MCServer.vcproj
* Fixed another one.Alexander Harkness2013-11-261-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-1/+1
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+18
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+2715
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 07:52:25 +0100