Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | 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 |
|/ | |||||
* | 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 |