Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added a MaxViewDistance option. | Howaner | 2014-10-30 | 1 | -0/+3 |
| | |||||
* | Merge pull request #1565 from mc-server/MergedIniFile | Mattes D | 2014-10-24 | 1 | -1/+1 |
|\ | | | | | Merged ini file | ||||
| * | Merged IniFile into main MCS sources. | Mattes D | 2014-10-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-23 | 1 | -35/+35 |
|\| | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h | ||||
| * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -35/+35 |
| | | |||||
* | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -33/+40 |
|\| | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 1 | -5/+5 |
| | | |||||
| * | cWorld: Fixed scheduler. | Mattes D | 2014-10-13 | 1 | -9/+18 |
| | | | | | | | | | | Fixes #1534. Added a test case into the Debuggers plugin. | ||||
| * | Fixed style. | Mattes D | 2014-10-13 | 1 | -2/+4 |
| | | |||||
| * | Fix style | worktycho | 2014-10-12 | 1 | -2/+2 |
| | | |||||
| * | Update World.cpp | worktycho | 2014-10-12 | 1 | -1/+1 |
| | | |||||
| * | Fix lambda capture | worktycho | 2014-10-11 | 1 | -1/+2 |
| | | |||||
| * | Moved a few objects to unique_ptr | tycho | 2014-10-10 | 1 | -29/+24 |
| | | |||||
* | | Stream 4 chunks per tick. Added priority. | Howaner | 2014-10-06 | 1 | -4/+4 |
| | | |||||
* | | Optimized chunk loader | Howaner | 2014-10-02 | 1 | -1/+0 |
|/ | |||||
* | Fixed iron trapdoors | Howaner | 2014-09-30 | 1 | -2/+2 |
| | |||||
* | World: Fixed chunk generation by plugins. | madmaxoft | 2014-09-29 | 1 | -1/+1 |
| | | | | ChunkWorx was broken, it was trying to generate chunks that were not properly marked as InQueue. | ||||
* | Merge branch 'master' into Fixes | Howaner | 2014-09-26 | 1 | -6/+6 |
|\ | |||||
| * | Merge pull request #1419 from mc-server/redstoneTests | worktycho | 2014-09-26 | 1 | -6/+6 |
| |\ | | | | | | | Added test mocking to IncrementalRedstoneSimulator | ||||
| | * | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -7/+83 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| | * \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| | * | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | IncrementalRedstoneSimulator now has no dependencies on cChunk | Tycho | 2014-09-16 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the server | Tycho | 2014-09-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | THis wil hopefully allow for unit testing | ||||
* | | | | | Fixed players custom name in 1.8 | Howaner | 2014-09-26 | 1 | -2/+2 |
|/ / / / | |||||
* | | / | Improved searching for spawn. | madmaxoft | 2014-09-26 | 1 | -3/+14 |
| |_|/ |/| | | | | | | | | Won't spawn on a small island inside ocean anymore. | ||||
* | | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 1 | -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. | Howaner | 2014-09-18 | 1 | -3/+75 |
| | | | | |||||
| * | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| | * | | Fixed farmland issues. | Howaner | 2014-09-12 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 1 | -12/+24 |
| |\| | |||||
| | * | Actually set default | worktycho | 2014-09-09 | 1 | -0/+1 |
| | | | |||||
| | * | use the correct ASSERT | worktycho | 2014-09-08 | 1 | -2/+2 |
| | | | |||||
| | * | FIxed a couple more warnings | Tycho | 2014-09-08 | 1 | -2/+8 |
| | | | |||||
| | * | TimeOfDay does not need to be an Int64 | Tycho | 2014-09-08 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed a few compile warnings | Tycho | 2014-09-08 | 1 | -9/+14 |
| | | | |||||
| * | | 1.8: Added ParticleEffect packet. | Howaner | 2014-09-11 | 1 | -2/+2 |
| | | | |||||
| * | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 1 | -3/+3 |
| |/ | |||||
| * | Rewritten chunk status to specify whether the chunk is in queue. | Mattes D | 2014-09-05 | 1 | -18/+20 |
| | | | | | | | | This fixes #1370. | ||||
| * | Merge remote-tracking branch 'origin/master' into EntitiesInBox | madmaxoft | 2014-09-04 | 1 | -11/+10 |
| |\ | |||||
| | * | Merge pull request #1351 from LO1ZB/remove-a_RelY | Mattes D | 2014-09-03 | 1 | -11/+10 |
| | |\ | | | | | | | | | remove y-coord from chunks | ||||
| | | * | hopefully the last commit for removing y-coord from chunks. :) | LO1ZB | 2014-09-03 | 1 | -11/+2 |
| | | | | |||||
| | | * | me being stupid | LO1ZB | 2014-08-29 | 1 | -1/+1 |
| | | | | |||||
| | | * | add comments | LO1ZB | 2014-08-29 | 1 | -1/+2 |
| | | | | |||||
| | | * | fix chunk regenerating | LO1ZB | 2014-08-29 | 1 | -0/+8 |
| | | | | |||||
| | | * | remove y-coord from chunks | LO1ZB | 2014-08-28 | 1 | -11/+10 |
| | | | | |||||
| * | | | Added cWorld::ForEachEntityInBox() | madmaxoft | 2014-09-03 | 1 | -0/+9 |
| |/ / | |||||
* / / | Added SetCustomName() to players. | Howaner | 2014-09-02 | 1 | -5/+9 |
|/ / | |||||
* | | Merge branch 'master' into fixes | madmaxoft | 2014-08-30 | 1 | -2/+4 |
|\ \ | |||||
| * | | Rewritten block entity loading. | Mattes D | 2014-08-29 | 1 | -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/MCServer | Tiger Wang | 2014-08-29 | 1 | -19/+57 |
|\| | | | | | | | | | Conflicts: src/Server.cpp | ||||
| * | World: Report chunk count for the spawn area. | Mattes D | 2014-08-22 | 1 | -1/+1 |
| | | |||||
| * | Added cWorld initializers. | Mattes D | 2014-08-21 | 1 | -0/+30 |
| | | |||||
| * | Code formatting fixes. | Howaner | 2014-08-19 | 1 | -0/+1 |
| | | |||||
| * | CheckBasicStyle checks the src folder as well. | madmaxoft | 2014-08-14 | 1 | -1/+1 |
| | | |||||
| * | Exported daylight cycle flag to the protocol. | Howaner | 2014-08-11 | 1 | -8/+1 |
| | | |||||
| * | Added a comment and simplified code. | Howaner | 2014-08-10 | 1 | -5/+2 |
| | | |||||
| * | Added IsDaylightCycleEnabled saving. | Howaner | 2014-08-10 | 1 | -0/+2 |
| | | |||||
| * | Renamed functions. | Howaner | 2014-08-10 | 1 | -3/+3 |
| | | |||||
| * | Renamed m_DoDaylightCycle to m_CycleDaylight. | Howaner | 2014-08-08 | 1 | -3/+3 |
| | | |||||
| * | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | Howaner | 2014-08-07 | 1 | -17/+32 |
| | | | | | | I need this for a GameRule plugin. | ||||
* | | Improved explosion damage | Tiger Wang | 2014-08-29 | 1 | -3/+6 |
|/ | |||||
* | Fixed issues with autocomplete and time loading | Tiger Wang | 2014-08-01 | 1 | -7/+33 |
| | | | | * Fixes #1274 | ||||
* | Merge pull request #1269 from Howaner/BlockEntitys | Mattes D | 2014-08-01 | 1 | -0/+10 |
|\ | | | | | Added beacon. | ||||
| * | Exported the beacon. | Howaner | 2014-07-30 | 1 | -0/+10 |
| | | |||||
* | | Capitalised "incremental" | Howaner | 2014-07-31 | 1 | -4/+4 |
| | | |||||
* | | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator. | Howaner | 2014-07-31 | 1 | -2/+2 |
|/ | |||||
* | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 1 | -0/+3 |
|\ | |||||
| * | Add "Broadcasting" settings to world.ini | Howaner | 2014-07-27 | 1 | -0/+3 |
| | | |||||
* | | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 1 | -32/+63 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Added a queue for setting chunk data. | madmaxoft | 2014-07-24 | 1 | -32/+53 |
| | | | | | | | | Fixes #1196. | ||||
| * | Made the cWorld::SpawnMobFinalize function more readable. | STRWarrior | 2014-07-24 | 1 | -0/+10 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-23 | 1 | -6/+3 |
| | | |||||
* | | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 1 | -11/+6 |
| | | |||||
* | | Suggestion and failed merge fix | Tiger Wang | 2014-07-22 | 1 | -0/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -9/+4 |
|\| | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -1/+1 |
| | | |||||
| * | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -3/+3 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -1/+1 |
| | | |||||
| * | World.cpp: fixed not all enum fields being used in m_Dimension switch | archshift | 2014-07-19 | 1 | -1/+2 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-21 | 1 | -56/+79 |
| | | |||||
* | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -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 issues | Tiger Wang | 2014-07-18 | 1 | -10/+6 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -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. | madmaxoft | 2014-07-17 | 1 | -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. | madmaxoft | 2014-07-17 | 1 | -17/+15 |
| | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
| * | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -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/skinuuid | Mattes D | 2014-07-16 | 1 | -1/+1 |
| |\ | | | | | | | Skins | ||||
| | * | Player properties are now retrieved | Tiger Wang | 2014-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed FindClosestPlayer | Tycho | 2014-07-15 | 1 | -3/+6 |
| | | | |||||
| * | | Made CreateProjectile a pointer | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | |||||
| * | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -3/+3 |
| |/ | |||||
| * | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 1 | -4/+13 |
| |\ | | | | | | | Implemented trapped chests & others | ||||
| | * | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 1 | -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. | madmaxoft | 2014-07-10 | 1 | -0/+9 |
| | | | | | | | | | | | | Fixes #1160. | ||||
| * | | Fixed arrow collection animation | Tiger Wang | 2014-07-09 | 1 | -9/+0 |
| |/ | | | | | | | * Fixed piston extension non-solidness | ||||
| * | Removed world-saving log messages. | madmaxoft | 2014-07-04 | 1 | -2/+0 |
| | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1518 | ||||
| * | Added generic entity-collecting. | Mattes D | 2014-06-27 | 1 | -1/+10 |
| | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098. | ||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -6/+9 |
|\| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -6/+9 |
| | | |||||
* | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 1 | -10/+4 |
| | | |||||
* | | Fixed order of initalisation | Tycho | 2014-06-12 | 1 | -3/+4 |
| | | |||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -3/+6 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -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. | madmaxoft | 2014-06-10 | 1 | -4/+1 |
| | | |||||
| * | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 1 | -29/+82 |
| | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | Added queue for adding entities to cWorld. | Mattes D | 2014-06-08 | 1 | -1/+27 |
| | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
* | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -5/+13 |
| | | |||||
* | | Fixed Time of day | worktycho | 2014-06-07 | 1 | -1/+1 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-06-05 | 1 | -9/+2 |
| | | |||||
* | | Time and weather is saved, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -0/+12 |
| | | | | | | | | Also fixed unreliability in Health and LootPickup loading. | ||||
* | | Configurable portals | Tiger Wang | 2014-06-04 | 1 | -0/+26 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -2/+45 |
|\| | |||||
| * | Changed block send queue to use vectors | Tiger Wang | 2014-05-29 | 1 | -11/+10 |
| | | | | | | | | As suggested by @worktycho. | ||||
| * | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 1 | -2/+46 |
| | | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
* | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -0/+31 |
|/ | |||||
* | World pre-generation distance is settable in world.ini. | Mattes D | 2014-05-09 | 1 | -2/+6 |
| | |||||
* | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 1 | -4/+3 |
| | |||||
* | Moved the weather picker out of TickWeather(), squashing a warning and improving readability. | archshift | 2014-04-26 | 1 | -24/+26 |
| | |||||
* | Removed impossible default case. | archshift | 2014-04-26 | 1 | -6/+0 |
| | | | | Squashed a warning. | ||||
* | Removed extraneous switch{} in Start() | archshift | 2014-04-26 | 1 | -15/+0 |
| | | | | Squashed a warning. | ||||
* | Small changes; warning fixing. | archshift | 2014-04-25 | 1 | -6/+3 |
| | |||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 1 | -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 fixes | jfhumann | 2014-04-18 | 1 | -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 code | jfhumann | 2014-04-18 | 1 | -5/+5 |
| | | | |||||
* | | | Fixed #904 | Tiger Wang | 2014-04-18 | 1 | -0/+5 |
| |/ |/| | |||||
* | | Rewrote redstone powering to use power levels | Tiger Wang | 2014-04-15 | 1 | -1/+1 |
| | | |||||
* | | Simplified pickup speed randomisation | Tiger Wang | 2014-04-12 | 1 | -4/+3 |
|/ | |||||
* | Fixed double projectile spawning. | madmaxoft | 2014-04-05 | 1 | -1/+0 |
| | | | | Two spawn packets were sent per projectile. | ||||
* | Removed unused constants. | madmaxoft | 2014-03-25 | 1 | -3/+0 |
| | | | | DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now. | ||||
* | Fixed code style after recent merge. | madmaxoft | 2014-03-20 | 1 | -30/+28 |
| | |||||
* | Added braces | Tiger Wang | 2014-03-20 | 1 | -0/+2 |
| | |||||
* | ENUMified shrapnel level | Tiger Wang | 2014-03-20 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 1 | -6/+5 |
|\ | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | Merge branch 'master' into warnings | Tycho | 2014-03-14 | 1 | -3/+3 |
| |\ | |||||
| | * | Fixed a warning. | madmaxoft | 2014-03-14 | 1 | -3/+3 |
| | | | |||||
| * | | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | Conflicts: src/Globals.h | ||||
| | * | Unified Vector classes | andrew | 2014-03-11 | 1 | -1/+0 |
| | | | |||||
| * | | Fixed more Format issues | Tycho | 2014-03-11 | 1 | -2/+2 |
| |/ | |||||
* | | Added levels of shrapnel | Tiger Wang | 2014-03-18 | 1 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into awesometnt | Tiger Wang | 2014-03-10 | 1 | -11/+11 |
|\| | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 1 | -2/+2 |
| |\ | | | | | | | Add TNT load/save | ||||
| | * | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-08 | 1 | -8/+18 |
| | |\ | |||||
| | * | | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -27/+112 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | | Improved formatting of username tabcomplete | Tiger Wang | 2014-03-09 | 1 | -7/+7 |
| | | | | |||||
| * | | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | + Added fireworks | ||||
* | | | | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-10 | 1 | -27/+112 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #763 from Howaner/BlockEntitys | Mattes D | 2014-03-07 | 1 | -2/+11 |
| |\ \ \ | | | |/ | | |/| | Add Flower Pots | ||||
| | * | | Add Lua Bindings for FlowerPotEntity.h and add documentation. | Howaner | 2014-03-07 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add Flower Pots | Howaner | 2014-03-07 | 1 | -0/+9 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-06 | 1 | -8/+18 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Implemented vanilla-like fluid simulator | andrew | 2014-03-05 | 1 | -8/+18 |
| | | | | |||||
| * | | | Fixed an assert in map-loading. | madmaxoft | 2014-03-04 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | The maps were loaded too soon, the world wasn't initialized yet. | ||||
| * | | | Fixed previous weather changes. | madmaxoft | 2014-03-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather. | ||||
| * | | | Merge pull request #746 from Howaner/Slabs | Mattes D | 2014-03-03 | 1 | -13/+81 |
| |\ \ \ | | |/ / | |/| | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | ||||
| | * | | Add cancelling to WeatherChanging event. | Howaner | 2014-03-02 | 1 | -13/+40 |
| | | | | |||||
| | * | | More documentation (thanks to madmaxoft) and use GetBlockTypeMeta | Howaner | 2014-03-02 | 1 | -4/+8 |
| | | | | |||||
| | * | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | Howaner | 2014-03-02 | 1 | -0/+37 |
| | |/ | |||||
| * / | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -1/+1 |
| |/ | |||||
* | | Shrapnel now configurable | Tiger Wang | 2014-03-10 | 1 | -2/+1 |
| | | |||||
* | | Added extra awesomeness to TNT | Tiger Wang | 2014-03-05 | 1 | -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/master | Tiger Wang | 2014-02-24 | 1 | -0/+8 |
|\ | | | | | Implementation of in-game maps :D | ||||
| * | Maps: Improvements | andrew | 2014-02-23 | 1 | -3/+3 |
| | | |||||
| * | Thread safe cMap manager | andrew | 2014-02-20 | 1 | -1/+2 |
| | | |||||
| * | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -95/+85 |
| |\ | |||||
| * | | Map item handler; Fixed several bugs | andrew | 2014-02-17 | 1 | -8/+20 |
| | | | |||||
| * | | Send map when selected | andrew | 2014-02-14 | 1 | -2/+43 |
| | | | |||||
| * | | IDCount Serialization | andrew | 2014-02-13 | 1 | -0/+54 |
| | | | |||||
* | | | Merge pull request #700 from Howaner/GlobalFixes | Mattes D | 2014-02-20 | 1 | -4/+6 |
|\ \ \ | |_|/ |/| | | Add new Trees (without Generator) | ||||
| * | | Add BlockNewLeaves.h and rename Darkoac to Darkoak | Howaner | 2014-02-19 | 1 | -6/+6 |
| | | | |||||
| * | | Add new Trees (without Generator) | Howaner | 2014-02-19 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 1 | -0/+9 |
|\ \ \ | |/ / |/| | | Add Skulls/Heads to MCServer | ||||
| * | | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 1 | -2/+2 |
| | | | |||||
| * | | Add Heads completely | Howaner | 2014-02-18 | 1 | -0/+9 |
| | | | |||||
* | | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting. | madmaxoft | 2014-02-18 | 1 | -1/+5 |
| | | | |||||
* | | | Added cWorld:SetAreaBiome() API function. | madmaxoft | 2014-02-18 | 1 | -0/+37 |
|/ / | | | | | | | Fixes #675. | ||||
* | | Removed the unnecessary LoopPlayersAndBroadcastChat() functions. | madmaxoft | 2014-02-15 | 1 | -1/+1 |
| | | |||||
* | | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -1/+19 |
| | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
* | | Merged branch 'narroo/master'. | madmaxoft | 2014-02-13 | 1 | -0/+22 |
|\ \ | |/ |/| | | | This merges pull request #661. | ||||
| * | Fixed formatting. Moved UnloadUnusedChunks from public to private. | narroo | 2014-02-11 | 1 | -0/+7 |
| | | |||||
| * | Fixed formatting of previous commit. | narroo | 2014-02-11 | 1 | -0/+5 |
| | | |||||
| * | Fixed bug #385. UnloadUnusedChunks now has the same interface as | narroo | 2014-02-11 | 1 | -0/+10 |
| | | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking. | ||||
* | | More gcc warnings fixed. | madmaxoft | 2014-02-11 | 1 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into ChunkStay | madmaxoft | 2014-02-09 | 1 | -6/+9 |
|\| | |||||
| * | Fixed compile and some warnings in MSVS | Tiger Wang | 2014-02-09 | 1 | -2/+0 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -4/+36 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * \ | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | | Moved Gamemode setting into General root tag | Tiger Wang | 2014-02-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added sender name to PM if prefixes disabled | Tiger Wang | 2014-02-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | * Also moved the PVP setting into Mechanics | ||||
| * | | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
* | | | | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 1 | -12/+0 |
| |_|/ |/| | | |||||
* | | | Fixed comment. | STRWarrior | 2014-02-08 | 1 | -1/+1 |
| | | | |||||
* | | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). | STRWarrior | 2014-02-07 | 1 | -12/+8 |
| | | | |||||
* | | | Implemented an easy way of adding new redstone simulators. | STRWarrior | 2014-02-07 | 1 | -3/+37 |
| | | | | | | | | | | | | Also added a "noop" redstone simulator that does the same as the fluid version. | ||||
* | | | Merge pull request #646 from worktycho/warningfixes | Alexander Harkness | 2014-02-05 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | Fixed most of the reordering warnings | ||||
| * | | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #635 from tonibm19/master | Mattes D | 2014-02-04 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API | ||||
| * | | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 2014-02-03 | 1 | -1/+1 |
| |/ | |||||
* / | Increased Type safety of Biomes | Tycho | 2014-02-03 | 1 | -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/improvementsandfixes | Mattes D | 2014-02-03 | 1 | -3/+3 |
|\ | | | | | Redstone crash fix and current console line replace function | ||||
| * | Added IsBlockWaterOrIce() | Tiger Wang | 2014-02-02 | 1 | -1/+1 |
| | | |||||
| * | Revert "Added LOGREPLACELINE for line replacement" | Tiger Wang | 2014-02-02 | 1 | -5/+5 |
| | | | | | | | | This reverts commit 7d03876a3e11aedff0201a8330bfdb2b5523fc5e. | ||||
| * | Revert "Improved code" | Tiger Wang | 2014-02-02 | 1 | -2/+0 |
| | | | | | | | | This reverts commit d8aa0b0ec7a2ebea2fc157c623ae8cd7d0b6ba1c. | ||||
| * | Possibly fixed #618 | Tiger Wang | 2014-02-02 | 1 | -2/+2 |
| | | |||||
| * | Added checks for ice into IsBlockWater() | Tiger Wang | 2014-02-01 | 1 | -1/+1 |
| | | | | | | | | | | * This fixes players spawning in vast oceans of ice, as opposed to the previous water | ||||
| * | Improved code | Tiger Wang | 2014-01-31 | 1 | -0/+2 |
| | | | | | | | | | | * Fixed some issues * Fixed standard violation | ||||
| * | Added LOGREPLACELINE for line replacement | Tiger Wang | 2014-01-29 | 1 | -5/+5 |
| | | |||||
* | | Changed pointers to references | Tycho | 2014-02-01 | 1 | -4/+3 |
| | | |||||
* | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-01 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | Attempt at implementing #563 | tonibm19 | 2014-01-30 | 1 | -2/+1 |
| |/ | | | | | Not tested (I don't have RasPi) | ||||
| * | The world can now be configured wether farmers should be able to harvest crops. | STRWarrior | 2014-01-27 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 1 | -3/+37 |
|\| | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | Did what xoft recommended | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | |||||
| * | Mob bugfixes | Tiger Wang | 2014-01-25 | 1 | -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 2 | andrew | 2014-01-23 | 1 | -1/+26 |
| | | |||||
* | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 1 | -88/+5 |
|/ | |||||
* | cWorld now saves/loads the scoreboard | andrew | 2014-01-22 | 1 | -0/+9 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -15/+21 |
|\ | |||||
| * | Changed the cWorld::ScheduleTask() signature. | madmaxoft | 2014-01-19 | 1 | -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/schedular | Mattes D | 2014-01-19 | 1 | -6/+2 |
| |\ | | | | | | | Implemented xoft's suggestion for a saturating counter in the scheduler | ||||
| | * | Fixed iterators bug | Tycho | 2014-01-18 | 1 | -2/+1 |
| | | | |||||
| | * | switched to using m_WorldAge rather than m_TickID | Tycho | 2014-01-18 | 1 | -6/+3 |
| | | | |||||
| | * | Increased tick count to long | Tycho | 2014-01-17 | 1 | -2/+2 |
| | | | |||||
| | * | Implemented xsofts suggestion for a saturating counter in the scheduler | Tycho | 2014-01-17 | 1 | -5/+5 |
| | | | |||||
* | | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -1/+56 |
|/ / | |||||
* | | Merge pull request #559 from mc-server/SpawnMobParticles | Mattes D | 2014-01-19 | 1 | -3/+0 |
|\ \ | | | | | | | Removed the particles when a mob spawns. | ||||
| * | | Removed the particles when a mob spawns. | STRWarrior | 2014-01-18 | 1 | -3/+0 |
| | | | |||||
* | | | Basic command block implementation | andrew | 2014-01-18 | 1 | -0/+9 |
|/ / | |||||
* / | Added user setting compression factor | Tycho | 2014-01-17 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 1 | -0/+24 |
|\ | | | | | Added cWorld::SpawnMinecart. | ||||
| * | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 1 | -2/+2 |
| | | |||||
| * | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 1 | -3/+3 |
| | | |||||
| * | Added cWorld::SpawnMinecart. | STRWarrior | 2014-01-12 | 1 | -0/+24 |
| | | |||||
* | | added cWorld::ScheduleTask Function | Tycho | 2014-01-14 | 1 | -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. | madmaxoft | 2014-01-10 | 1 | -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 waits | Tycho Bickerstaff | 2014-01-02 | 1 | -1/+4 |
| | |||||
* | fixed warnings in World.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+3 |
| | |||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+9 |
| | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -6/+6 |
| | |||||
* | Removed some old cRedstone remnants | Tiger Wang | 2013-12-16 | 1 | -24/+0 |
| | |||||
* | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. | STRWarrior | 2013-12-15 | 1 | -0/+18 |
| | |||||
* | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 1 | -0/+9 |
| | | | | Game of Thrones music in Minecraft, here I come! | ||||
* | Improved pickups spawning speed again | Tiger Wang | 2013-12-10 | 1 | -4/+4 |
| | |||||
* | Merge pull request #408 from mc-server/SpawnPoint_Fix | Mattes D | 2013-12-08 | 1 | -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. | STRWarrior | 2013-12-08 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -2/+13 |
|\| | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -2/+1 |
| | | | | | | | | Ref.: #407 | ||||
| * | Added a SpawnFallingBlock function so plugins can make other blocks fall. | STRWarrior | 2013-12-07 | 1 | -0/+12 |
| | | |||||
* | | Bonemeal has particles, fixes #393 | Tiger Wang | 2013-12-08 | 1 | -0/+6 |
| | | |||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -2/+2 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed duplication glitch with QueueSetBlock | Tiger Wang | 2013-12-06 | 1 | -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 check | Tiger Wang | 2013-12-06 | 1 | -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. | madmaxoft | 2013-12-04 | 1 | -0/+1 |
| | | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65. | ||||
* | Changed cBlockHandler->OnUpdate() to use cChunk directly. | madmaxoft | 2013-11-30 | 1 | -2/+2 |
| | |||||
* | Explicitly set spawnpoint fixes. | madmaxoft | 2013-11-30 | 1 | -20/+11 |
| | | | | | The value names are case-insensitive. The debug message is printed only once. | ||||
* | Added the real tick duration to the OnWorldTick hook. | madmaxoft | 2013-11-30 | 1 | -9/+10 |
| | |||||
* | Made TNT pickups spawning chance 25% | Tiger Wang | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Merged master into redstonefixes | Tiger Wang | 2013-11-27 | 1 | -11/+73 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+12 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Fixed another one. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+18 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+2715 |