Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 21 | -6/+501 |
|\ | | | | | Add Skulls/Heads to MCServer | ||||
| * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 23 | -256/+254 |
| | | |||||
| * | Add break to Protocol17x.cpp and use new comment delimiter | Howaner | 2014-02-19 | 2 | -7/+8 |
| | | |||||
| * | Add Heads completely | Howaner | 2014-02-18 | 14 | -7/+154 |
| | | |||||
| * | Add Skulls/Heads | Howaner | 2014-02-17 | 13 | -5/+354 |
| | | |||||
* | | Merge branch 'master' into itemframes | Tiger Wang | 2014-02-18 | 24 | -11/+433 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp | ||||
| * \ | Merge pull request #696 from mc-server/paintings | Mattes D | 2014-02-18 | 17 | -3/+231 |
| |\ \ | | | | | | | | | Implemented paintings, fixes #689 | ||||
| | * | | Properly exported and documented paintings | Tiger Wang | 2014-02-18 | 3 | -2/+4 |
| | | | | |||||
| | * | | Comments & new BLOCK_FACE constants | Tiger Wang | 2014-02-18 | 1 | -7/+10 |
| | | | | |||||
| | * | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 15 | -3/+226 |
| | | | | | | | | | | | | | | | | + Implemented paintings | ||||
| * | | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting. | madmaxoft | 2014-02-18 | 2 | -2/+7 |
| | | | | |||||
| * | | | Added cWorld:SetAreaBiome() API function. | madmaxoft | 2014-02-18 | 6 | -3/+164 |
| | | | | | | | | | | | | | | | | Fixes #675. | ||||
| * | | | Added a bit more documentation to cForEachChunkProvider. | madmaxoft | 2014-02-18 | 2 | -5/+33 |
| |/ / | |||||
* | | | Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes | Tiger Wang | 2014-02-18 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fixed possible ASSERT failure | Tiger Wang | 2014-02-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | De-breaked stuff | Tiger Wang | 2014-02-18 | 1 | -2/+0 |
|/ / / | |||||
* | | | Changed BlockFace type to eBlockFace | Tiger Wang | 2014-02-18 | 3 | -26/+27 |
| | | | |||||
* | | | Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes | Tiger Wang | 2014-02-18 | 1 | -7/+10 |
|\ \ \ | |||||
| * | | | Added an explanatory comment | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
| | | | | |||||
| * | | | Used new BLOCK_FACE constants | Tiger Wang | 2014-02-18 | 1 | -7/+8 |
| | | | | | | | | | | | | Also added more comments | ||||
* | | | | Added a brace | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ==== { } { __ } { | | } ==== REMOVE ALL THE BRACES!! | ||||
* / / | Implemented item frames, a part of #689 | Tiger Wang | 2014-02-18 | 7 | -2/+233 |
|/ / | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!) | ||||
* | | Added cPluginManager:GetPluginsPath() to the Lua API. | madmaxoft | 2014-02-17 | 2 | -1/+5 |
| | | |||||
* | | Add Lua plugin path to package.path and .cpath. | madmaxoft | 2014-02-17 | 3 | -0/+37 |
| | | | | | | | | Fixes #693. | ||||
* | | Merge pull request #690 from tonibm19/master | Alexander Harkness | 2014-02-17 | 1 | -2/+2 |
|\ \ | |/ |/| | Now mobs can't escape from fences. | ||||
| * | Improved formatting | tonibm19 | 2014-02-17 | 1 | -2/+2 |
| | | |||||
| * | Now mobs can't escape from fences. | tonibm19 | 2014-02-16 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #692 from mc-server/wolfcleanup | Alexander Harkness | 2014-02-17 | 1 | -30/+15 |
|\ \ | | | | | | | Wolf cleanup | ||||
| * | | Fixes to previous commit | Tiger Wang | 2014-02-16 | 1 | -9/+10 |
| | | | |||||
| * | | Slight cleanup of wolf code | Tiger Wang | 2014-02-16 | 1 | -23/+7 |
| | | | |||||
* | | | Fixed a memory leak in CompositeChat. | madmaxoft | 2014-02-17 | 1 | -0/+3 |
| | | | |||||
* | | | Links sent via chat messages are clickable. | madmaxoft | 2014-02-16 | 4 | -9/+34 |
| | | | | | | | | | | | | Fixes #658. | ||||
* | | | Implemented cCompositeChat::ParseText(), incl. self-test. | madmaxoft | 2014-02-16 | 2 | -1/+211 |
| | | | |||||
* | | | Fixed cBoundingBox self-test code-style. | madmaxoft | 2014-02-16 | 1 | -10/+10 |
| | | | | | | | | | | | | Also made the class name unique and the global variable static, to avoid linkage problems with other self-tests | ||||
* | | | Merge pull request #683 from mc-server/redstoneimprovements | Mattes D | 2014-02-16 | 5 | -94/+167 |
|\ \ \ | |_|/ |/| | | Redstone speed improvements | ||||
| * | | Fixed a glaring bug with chunk cross-simulating | Tiger Wang | 2014-02-16 | 1 | -9/+17 |
| | | | | | | | | | | | | | | | | | | * A chunk's redstone blocks list is no longer touched if AddBlock was being called with another chunk's coordinates * Fixed chunk boundary checks | ||||
| * | | Added a 'default:' for SimChunk()'s switch | Tiger Wang | 2014-02-15 | 1 | -0/+1 |
| | | | |||||
| * | | A fix and an improvement | Tiger Wang | 2014-02-15 | 2 | -23/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed a special case with the wrong ChunkX/Z values being used to calculate a relative position * Simplified data structure adding and removing operations (no more pointers!) - Removed one character of whitespace :D | ||||
| * | | Fixed TNT fizzing everywhere | Tiger Wang | 2014-02-15 | 2 | -2/+2 |
| | | | |||||
| * | | Sizeable speed improvements to redstone | Tiger Wang | 2014-02-15 | 3 | -83/+127 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Moved all simulator data into individual chunks * Cleaned up parameters for functions and some code * Fixed repeaters powering off faster than they power on The main issue before was that, although the redstone simulator stored blocks to be simulated in individual cChunks, other data, such as powered lists, and etcetera, were global regardless of which chunk was being simulated. Therefore, with worlds with lots of redstone, each tick saw the ticking of chunks, which themselves iterated through the entire dataset needlessly, creating LOTS of lag. Should be better now :) | ||||
* | | | Merge pull request #686 from Howaner/GlobalFixes | Mattes D | 2014-02-16 | 5 | -3/+11 |
|\ \ \ | |_|/ |/| | | Add Locale to ClientHandle | ||||
| * | | Add Locale to ClientHandle | Howaner | 2014-02-16 | 5 | -3/+11 |
| | | | |||||
* | | | Fixed minor formatting issues from #682 | Tiger Wang | 2014-02-16 | 3 | -16/+3 |
|/ / | | | | | | | | | - Removed unused PlaySoundEffect * Simplified and parenthesised code | ||||
* | | Replace random Float Generation and broadcast the Exp Pickup Sound | Howaner | 2014-02-16 | 2 | -9/+4 |
| | | |||||
* | | Add Exp Bottle Effects | Howaner | 2014-02-16 | 4 | -1/+23 |
| | | |||||
* | | Set max. Players in the Tablist to 60 | Howaner | 2014-02-16 | 1 | -1/+1 |
| | | |||||
* | | Disable Hunger Death | Howaner | 2014-02-16 | 1 | -1/+7 |
| | | |||||
* | | Removed the unnecessary LoopPlayersAndBroadcastChat() functions. | madmaxoft | 2014-02-15 | 4 | -23/+19 |
| | | |||||
* | | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 18 | -21/+671 |
| | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
* | | Merge pull request #679 from mc-server/NotchDeath | Alexander Harkness | 2014-02-15 | 1 | -0/+6 |
|\ \ | |/ |/| | NotchApple | ||||
| * | If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/Notch | STRWarrior | 2014-02-15 | 1 | -0/+6 |
| | | |||||
* | | Add more Sounds to Redstone Simulator | Howaner | 2014-02-15 | 1 | -1/+23 |
| | | |||||
* | | Add Fence Gate to Redstone Simulator | Howaner | 2014-02-15 | 2 | -0/+31 |
| | | |||||
* | | Merge pull request #664 from mc-server/generalfixes | Mattes D | 2014-02-15 | 19 | -46/+130 |
|\ \ | | | | | | | General fixes | ||||
| * | | Fixed typographical error | Tiger Wang | 2014-02-15 | 1 | -2/+1 |
| | | | |||||
| * | | Removed debug messages again | Tiger Wang | 2014-02-15 | 1 | -6/+0 |
| | | | |||||
| * | | Added proper debug messages | Tiger Wang | 2014-02-13 | 1 | -3/+8 |
| | | | |||||
| * | | Fancy stuff with constant references | Tiger Wang | 2014-02-13 | 1 | -2/+2 |
| | | | |||||
| * | | Added more missing GetClassStatic()s | Tiger Wang | 2014-02-12 | 2 | -0/+4 |
| | | | |||||
| * | | Removed some unneeded BroadcastWholeWindow()s | Tiger Wang | 2014-02-12 | 4 | -23/+2 |
| | | | |||||
| * | | Changed inheritance a bit | Tiger Wang | 2014-02-12 | 8 | -33/+54 |
| | | | | | | | | | | | | * cBlockEntityWithItems now inherits from cBlockEntityWindowOwner | ||||
| * | | Made player jump reset less ambiguous | Tiger Wang | 2014-02-12 | 1 | -1/+2 |
| | | | |||||
| * | | Simplified Attack() tracing | Tiger Wang | 2014-02-12 | 1 | -1/+6 |
| | | | |||||
| * | | Improved pressure plates | Tiger Wang | 2014-02-12 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | + Two (or more) pressure plates can be triggered at the same time * Fixed issues caused by pressure plates not being in the sources list | ||||
| * | | Fixed #190 | Tiger Wang | 2014-02-11 | 1 | -2/+67 |
| | | | | | | | | | | | | + Hoppers now collect pickups above them | ||||
| * | | Fixed #627 | Tiger Wang | 2014-02-11 | 5 | -21/+12 |
| | | | | | | | | | | | | | | | | | | | | | - Attack() is now called from cAggressive instead of cMonster * Monsters can no longer attack through walls * Should fix last remnants of player damage after teleporting (that both STR and bearbin contributed fixes to :P) | ||||
| * | | Fixed #612 | Tiger Wang | 2014-02-11 | 2 | -0/+16 |
| | | | | | | | | | | | | * Chests send contents updates to client | ||||
* | | | Merge pull request #677 from mc-server/BroadcastParticleEffect | Alexander Harkness | 2014-02-15 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | Broadcast particle effect | ||||
| * | | Exported cWorld::BroadcastParticleEffect. | STRWarrior | 2014-02-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merged branch 'narroo/master'. | madmaxoft | 2014-02-13 | 2 | -1/+36 |
|\ \ \ | |/ / |/| | | | | | This merges pull request #661. | ||||
| * | | Fixed formatting. Moved UnloadUnusedChunks from public to private. | narroo | 2014-02-11 | 2 | -4/+10 |
| | | | |||||
| * | | Fixed formatting of previous commit. | narroo | 2014-02-11 | 2 | -2/+7 |
| | | | |||||
| * | | Fixed bug #385. UnloadUnusedChunks now has the same interface as | narroo | 2014-02-11 | 2 | -1/+25 |
| | | | | | | | | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking. | ||||
* | | | Fixed #573 | STRWarrior | 2014-02-12 | 1 | -4/+4 |
| | | | |||||
* | | | cWorld:ChunkStay() accepts nils as callbacks. | madmaxoft | 2014-02-11 | 1 | -5/+3 |
| | | | | | | | | | | | | Also removed leftover debug logging. | ||||
* | | | Added cLuaState::CheckParamFunctionOrNil(). | madmaxoft | 2014-02-11 | 2 | -2/+37 |
| |/ |/| | | | | | Also fixed error reporting for the two function-checking functions. | ||||
* | | More gcc warnings fixed. | madmaxoft | 2014-02-11 | 2 | -4/+5 |
| | | |||||
* | | Made cChunkStay's destructor virtual. | madmaxoft | 2014-02-11 | 1 | -1/+1 |
| | | |||||
* | | Fixed gcc warnings in Item.h. | madmaxoft | 2014-02-11 | 1 | -21/+21 |
| | | |||||
* | | Fixed nested plugin function calls. | madmaxoft | 2014-02-11 | 1 | -6/+9 |
| | | |||||
* | | Merge branch 'master' into ChunkStay | madmaxoft | 2014-02-11 | 1 | -2/+1 |
|\ \ | |||||
| * | | Added additional parenthasies | worktycho | 2014-02-10 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'master' into boatsFix | Tycho | 2014-02-10 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemBoat.h | ||||
| | * | | Maybe fixed boat placing | tonibm19 | 2014-02-10 | 1 | -1/+1 |
| | |/ | |||||
| * / | Fixed stupid mistax in conditional | worktycho | 2014-02-10 | 1 | -2/+1 |
| |/ | | | | | boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one. | ||||
* | | Added LuaChunkStay to Bindings sources. | madmaxoft | 2014-02-10 | 1 | -36/+47 |
| | | | | | | | | This should fix *nix compilation. Also alpha-sorted the lists. | ||||
* | | Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay(). | madmaxoft | 2014-02-10 | 9 | -87/+213 |
| | | | | | | | | This fixes problems with indeterminate class object lifespan (Lua-GC) and forgetting to disable it or keep it until ready. | ||||
* | | cLuaState: Stack traces don't include ghost 0-th element. | madmaxoft | 2014-02-10 | 1 | -1/+1 |
| | | |||||
* | | Added cPluginLua::cOperation. | madmaxoft | 2014-02-10 | 1 | -1/+27 |
| | | | | | | | | This class should be used to lock-and-access the plugin's LuaState. cPluginLua::GetLuaState() is unsafe and by this commit obsolete. | ||||
* | | First working version of cLuaChunkStay. | madmaxoft | 2014-02-09 | 4 | -17/+92 |
| | | | | | | | | It works, but has random failures, probably due to threading issues. | ||||
* | | Initial Lua cChunkStay export. | madmaxoft | 2014-02-09 | 4 | -1/+123 |
| | | |||||
* | | cLuaState::cRef can be unbound and re-bound. | madmaxoft | 2014-02-09 | 2 | -9/+60 |
| | | | | | | | | This will allow us to store Lua references as member variables in classes and initialize those later than in the constructor. | ||||
* | | Added AllToLua.pkg to MSVC project files. | madmaxoft | 2014-02-09 | 1 | -0/+2 |
| | | | | | | | | MSVC ignores the file when compiling and it makes it easier to open it up for editing. | ||||
* | | Merge remote-tracking branch 'origin/master' into ChunkStay | madmaxoft | 2014-02-09 | 30 | -127/+328 |
|\| | |||||
| * | Fixed compile and some warnings in MSVS | Tiger Wang | 2014-02-09 | 7 | -17/+6 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 33 | -1897/+2087 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| | * | Merge pull request #656 from mc-server/ReloadGroups | Mattes D | 2014-02-09 | 1 | -0/+11 |
| | |\ | | | | | | | | | The console reload command also reloads the groups. | ||||
| | | * | "reload" is back. | STRWarrior | 2014-02-09 | 1 | -0/+7 |
| | | | | |||||
| | | * | Split "reload" in "reloadplugins" and "reloadgroups". | STRWarrior | 2014-02-09 | 1 | -2/+5 |
| | | | | |||||
| | | * | The console reload command also reloads the groups. | STRWarrior | 2014-02-09 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 92 | -214/+347 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | | | Fixed a boat ASSERT | Tiger Wang | 2014-02-09 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | 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 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | * Also moved the PVP setting into Mechanics | ||||
| * | | | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 9 | -111/+155 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
| * | | | | Server internally uses new functions | Tiger Wang | 2014-02-06 | 4 | -17/+13 |
| | | | | | |||||
| * | | | | Added more chat functions | Tiger Wang | 2014-02-06 | 4 | -27/+46 |
| | | | | | |||||
| * | | | | Reduced max explosions per tick | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed explosions bug | Tiger Wang | 2014-02-05 | 3 | -32/+13 |
| | | | | | | | | | | | | | | | | | | | | * Fixed bug where explosions would sometimes never be sent | ||||
| * | | | | Fixed annoying creative on fire bug | Tiger Wang | 2014-02-05 | 2 | -0/+20 |
| | | | | | |||||
| * | | | | Fixed a bunch of MSVS warnings | Tiger Wang | 2014-02-05 | 6 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely | ||||
| * | | | | Added more SendMessageXXX() functions | Tiger Wang | 2014-02-04 | 3 | -47/+62 |
| | | | | | |||||
| * | | | | Pickup constructor no longer exported | Tiger Wang | 2014-02-03 | 3 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | It didn't do anything without Initialize() exported, anyway, pickups are spawned with cWorld. | ||||
| * | | | | Added SendMessageXXX() to cPlayer | Tiger Wang | 2014-02-03 | 2 | -1/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by @bearbin, one no longer needs to download a file that links to Core. The server does it! Hopefully this encourages standards compliance. | ||||
| * | | | | Partial fix for #130 | Tiger Wang | 2014-02-03 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fixed #491 | Tiger Wang | 2014-02-03 | 1 | -2/+14 |
| | | | | | |||||
| * | | | | Fixed a crash bug | Tiger Wang | 2014-02-03 | 2 | -11/+5 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-03 | 11 | -80/+219 |
| |\ \ \ \ | |||||
| * | | | | | Fixed #626 | Tiger Wang | 2014-02-03 | 3 | -13/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed consumption of carrots and potatoes | ||||
| * | | | | | Fixed issues with farmland | Tiger Wang | 2014-02-03 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed farmland reversion checks not taking into account carrots and potatoes * Fixed #623 | ||||
| * | | | | | Server now handles join messages also | Tiger Wang | 2014-02-03 | 2 | -10/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Revised as well hook documentation | ||||
* | | | | | | Moved a forgotten comment back to its place. | madmaxoft | 2014-02-08 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Fixed lighting thread queueing. | madmaxoft | 2014-02-08 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | Fixed ChunkStay initialization. | madmaxoft | 2014-02-08 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Fixed gcc compilation. | madmaxoft | 2014-02-08 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 11 | -406/+560 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #653 from mc-server/RedstoneSimulator | Mattes D | 2014-02-08 | 8 | -1772/+1881 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | Improvements for the redstone simulator. | ||||
| * | | | | 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 | 10 | -1826/+1822 |
| | | | | | |||||
| * | | | | Fixed some end of lines | STRWarrior | 2014-02-07 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Implemented an easy way of adding new redstone simulators. | STRWarrior | 2014-02-07 | 6 | -9/+122 |
| | | | | | | | | | | | | | | | | | | | | Also added a "noop" redstone simulator that does the same as the fluid version. | ||||
* | | | | | Fixed cWorld:TryGetHeight() API. | madmaxoft | 2014-02-08 | 1 | -1/+5 |
|/ / / / | |||||
* | | | | WebAdmin is stopped properly on server shutdown / restart. | madmaxoft | 2014-02-07 | 3 | -36/+55 |
| | | | | | | | | | | | | | | | | Fixes #272. | ||||
* | | | | Fixed wiki link in auto-generated settings.ini. | madmaxoft | 2014-02-07 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #648 from worktycho/runMCServer | Mattes D | 2014-02-05 | 1 | -9/+27 |
|\ \ \ \ | | | | | | | | | | | Added BoundingBox Test | ||||
| * | | | | Change Output to stderr | worktycho | 2014-02-05 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Merge branch 'master' into runMCServer | Tycho | 2014-02-05 | 16 | -45/+96 |
| |\ \ \ \ | |||||
| * | | | | | Modified automatic test for boundingBox | Tycho | 2014-02-05 | 1 | -7/+26 |
| | | | | | | |||||
| * | | | | | Simplified shutdown | Tycho | 2014-02-05 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | Added support to start up MCServer and then immediatly sut it down in travis | Tycho | 2014-02-05 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #649 from mc-server/GroupsPermissions | Mattes D | 2014-02-05 | 4 | -36/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Removed deprecated HasCommand function | ||||
| * | | | | | Removed deprecated HasCommand function | STRWarrior | 2014-02-05 | 4 | -36/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #645 from mc-server/GroupsPermissions | Mattes D | 2014-02-05 | 6 | -18/+69 |
|\| | | | | | | | | | | | | | | | | | Improvements to the GroupManager | ||||
| * | | | | | Forgot extra lines. | STRWarrior | 2014-02-05 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Improvements: | STRWarrior | 2014-02-05 | 6 | -22/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a function in cRoot that allows you to reload all the groups permissions. Note: Players don't automatically load their new permissions. You can use cPlayer::LoadPermissionsFromDisk for that. | ||||
* | | | | | | Merge pull request #646 from worktycho/warningfixes | Alexander Harkness | 2014-02-05 | 10 | -27/+27 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Fixed most of the reordering warnings | ||||
| * | | | | | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 12 | -33/+33 |
| | | | | | | |||||
* | | | | | | Improved the signedness conversion. | madmaxoft | 2014-02-05 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Added cPluginManager:LogStackTrace() to the Lua API. | madmaxoft | 2014-02-05 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #637. | ||||
* | | | | | | Crypto: Removed unused member, fixed gcc warning. | madmaxoft | 2014-02-04 | 2 | -6/+4 |
| | | | | | | |||||
* | | | | | | Added dtExplosion to damage<->string functions. | madmaxoft | 2014-02-04 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Protocol 1.7: Fixed a signed / unsigned comparison warning. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fixed a gcc warning in ManualBindings. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Constructor member order... | ||||
* | | | | | Removed a useless check in cLuaState. | madmaxoft | 2014-02-04 | 1 | -3/+1 |
| | | | | | |||||
* | | | | | Fixed a warning in cItem in gcc. | madmaxoft | 2014-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Constructor member order... | ||||
* | | | | | Protocol 1.7 uses char for blockface. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | That should fix #644 on RasPi. | ||||
* | | | | | Merge pull request #644 from worktycho/warningfixes | Mattes D | 2014-02-04 | 76 | -178/+199 |
|\| | | | | | | | | | | | | | | Improved Type safety of eBlockFace | ||||
| * | | | | Fix gcc not having operator ++ on enums | Tycho | 2014-02-04 | 1 | -6/+7 |
| | | | | | |||||
| * | | | | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 76 | -174/+194 |
| | | | | | | | | | | | | | | | | | | | | May Fix #640 | ||||
* | | | | | Fixed chest placement. | madmaxoft | 2014-02-04 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | Fixes #624. | ||||
* | | | | | Merge pull request #635 from tonibm19/master | Mattes D | 2014-02-04 | 5 | -3/+16 |
|\ \ \ \ \ | |/ / / / |/| | | | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API | ||||
| * | | | | Blank lines and indentation. | tonibm19 | 2014-02-04 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Also removed GetClosestPlayer documentation | ||||
| * | | | | Not exporting FindClosestPlayer | tonibm19 | 2014-02-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed compilation | tonibm19 | 2014-02-03 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 2014-02-03 | 6 | -3/+13 |
| | |_|/ | |/| | | |||||
* | | | | Fixed calling plugins with userdata params. | madmaxoft | 2014-02-04 | 1 | -0/+1 |
| | | | | |||||
* | | | | Removed a leftover debug message. | madmaxoft | 2014-02-04 | 1 | -1/+0 |
| | | | | |||||
* | | | | Fixed error handling in cPluginManager:CallPlugin() API. | madmaxoft | 2014-02-04 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | Fixed: When the called function malfunctioned, the entire plugin's call was aborted. | ||||
* | | | | Improved error resistance in cPluginManager:CallPlugin(). | madmaxoft | 2014-02-04 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | Fixed: If the call failed, all the next plugin calls would fail as well. | ||||
* | | | | Greatly improved TNT propulsion chances | Tiger Wang | 2014-02-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #636 from worktycho/warningfixes | Mattes D | 2014-02-03 | 9 | -18/+31 |
|\ \ \ \ | | | | | | | | | | | Increased Type safety of Biomes | ||||
| * | | | | Fogot to save Biogen | Tycho | 2014-02-03 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Fixed Compile errors | Tycho | 2014-02-03 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | c++11 introduces scoped enums, so the code didn't fail in clang | ||||
| * | | | | Removed unused lookups | Tycho | 2014-02-03 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Increased Type safety of Biomes | Tycho | 2014-02-03 | 8 | -16/+31 |
| |/ / / | | | | | | | | | | | | | | | | | 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 #633 from mc-server/More_Sideways_Blocks | Mattes D | 2014-02-03 | 4 | -5/+80 |
|\ \ \ \ | |/ / / |/| / / | |/ / | More sideways blocks. | ||||
| * | | Named the different quartz block. | STRWarrior | 2014-02-03 | 2 | -1/+6 |
| | | | |||||
| * | | Fixed some issues. | STRWarrior | 2014-02-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | Meta wasn't set if the block wasn't a pillar. Fixed typo. | ||||
| * | | Renamed cBlockQuartsHandler to cBlockQuartzHandler. Fixed not being able to place normal quartz blocks. | STRWarrior | 2014-02-03 | 2 | -4/+4 |
| | | | |||||
| * | | This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars. | STRWarrior | 2014-02-03 | 3 | -5/+74 |
| | | | |||||
* | | | Merge pull request #623 from mc-server/tnt | Mattes D | 2014-02-03 | 2 | -36/+122 |
|\ \ \ | |/ / |/| | | TNT improvements | ||||
| * | | Inversed condition | Tiger Wang | 2014-02-03 | 1 | -25/+28 |
| | | | |||||
| * | | Uncommented pickup spawner code | Tiger Wang | 2014-02-02 | 1 | -3/+7 |
| | | | |||||
| * | | TNT improvements | Tiger Wang | 2014-02-02 | 2 | -37/+116 |
| | | | | | | | | | | | | | | | | | | + Added entity damage + Added entity propulsion * Fixed #67 and fixed #230 | ||||
* | | | Fixed socket leaking. | madmaxoft | 2014-02-03 | 1 | -0/+5 |
| | | | |||||
* | | | SocketThreads: Fixed sending to closed socket. | madmaxoft | 2014-02-03 | 1 | -1/+6 |
| | | | |||||
* | | | Groups.ini can contain spaces around commas in values. | madmaxoft | 2014-02-03 | 1 | -21/+25 |
| | | | | | | | | | | | | | | | This includes Permissions, Inherits and Commands. Also fixed an unlikely but possible crash with group colors. | ||||
* | | | Merge pull request #602 from mc-server/improvementsandfixes | Mattes D | 2014-02-03 | 7 | -22/+61 |
|\ \ \ | |_|/ |/| | | Redstone crash fix and current console line replace function | ||||
| * | | Added IsBlockWaterOrIce() | Tiger Wang | 2014-02-02 | 2 | -10/+12 |
| | | | |||||
| * | | Revert "Added LOGREPLACELINE for line replacement" | Tiger Wang | 2014-02-02 | 5 | -94/+16 |
| | | | | | | | | | | | | This reverts commit 7d03876a3e11aedff0201a8330bfdb2b5523fc5e. | ||||
| * | | Revert "Improved code" | Tiger Wang | 2014-02-02 | 4 | -19/+13 |
| | | | | | | | | | | | | This reverts commit d8aa0b0ec7a2ebea2fc157c623ae8cd7d0b6ba1c. | ||||
| * | | Revert "Added a comment" | Tiger Wang | 2014-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 7ae5631d89426df6f05b6c8ba656ba02b9d15f93. | ||||
| * | | Revert "Properly initialised variables" | Tiger Wang | 2014-02-02 | 4 | -13/+10 |
| | | | | | | | | | | | | This reverts commit 02e752789399ad1b65a0443534ea6a8721efd78c. | ||||
| * | | Revert "Fixed issues with insufficient console space" | Tiger Wang | 2014-02-02 | 3 | -114/+29 |
| | | | | | | | | | | | | This reverts commit 6b18add09b5e9d6d6c2a61e90bdd7011f56f4c82. | ||||
| * | | Revert "A newline issue is resolved" | Tiger Wang | 2014-02-02 | 2 | -1/+3 |
| | | | | | | | | | | | | This reverts commit 397208145ebe5c95ebf32f2985f6800634932230. | ||||
| * | | Revert "Fixed Linux compile" | Tiger Wang | 2014-02-02 | 1 | -2/+1 |
| | | | | | | | | | | | | This reverts commit 5becfe850a2b4827a21e8ede989545334efbbead. | ||||
| * | | Revert "Another Linux fix" | Tiger Wang | 2014-02-02 | 1 | -6/+0 |
| | | | | | | | | | | | | This reverts commit 6f660b379ecbc091b9bd92093e0dad01a4f6bf38. | ||||
| * | | Revert "Again improved LogReplaceLine" | Tiger Wang | 2014-02-02 | 2 | -80/+77 |
| | | | | | | | | | | | | This reverts commit dd325d742db9db54a25460fcacd093e7cc6f44f0. | ||||
| * | | Possibly fixed #618 | Tiger Wang | 2014-02-02 | 1 | -2/+2 |
| | | | |||||
| * | | Creative players take Plugin damage | Tiger Wang | 2014-02-02 | 2 | -3/+4 |
| | | | |||||
| * | | Again improved LogReplaceLine | Tiger Wang | 2014-02-01 | 2 | -77/+80 |
| | | | | | | | | | | | | | | | | | | | | | * Fixed issues on Linux with cursor positioning * Made preprocessor blocks more readable * Improved reliability of line clearing on Windows - Removed an *unneeded* variable | ||||
| * | | Added checks for ice into IsBlockWater() | Tiger Wang | 2014-02-01 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | * This fixes players spawning in vast oceans of ice, as opposed to the previous water | ||||
| * | | Split cCoord template into one and two data types | Tiger Wang | 2014-02-01 | 2 | -12/+34 |
| | | | |||||
| * | | Another Linux fix | Tiger Wang | 2014-02-01 | 1 | -0/+6 |
| | | | |||||
| * | | Fixed Linux compile | Tiger Wang | 2014-02-01 | 1 | -1/+2 |
| | | | |||||
| * | | A newline issue is resolved | Tiger Wang | 2014-02-01 | 2 | -3/+1 |
| | | | |||||
| * | | Fixed issues with insufficient console space | Tiger Wang | 2014-02-01 | 3 | -29/+114 |
| | | | |||||
| * | | Properly initialised variables | Tiger Wang | 2014-01-31 | 4 | -10/+13 |
| | | | |||||
| * | | Added a comment | Tiger Wang | 2014-01-31 | 1 | -1/+1 |
| | | | |||||
| * | | Improved code | Tiger Wang | 2014-01-31 | 4 | -13/+19 |
| | | | | | | | | | | | | | | | * Fixed some issues * Fixed standard violation | ||||
| * | | Added LOGREPLACELINE for line replacement | Tiger Wang | 2014-01-29 | 5 | -16/+94 |
| | | | |||||
| * | | Fixed redstone simulator crash found in #570 | Tiger Wang | 2014-01-29 | 3 | -18/+25 |
| | | | |||||
* | | | Fixed multiple invalid permission nodes | Tiger Wang | 2014-02-02 | 1 | -2/+2 |
| | | | | | | | | | | | | New players can build as default now | ||||
* | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-02-02 | 78 | -550/+730 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into registerfix | Tycho | 2014-02-02 | 44 | -63/+211 |
| |\ \ \ | |||||
| | * | | | Fixed dark oak and acacia placement. | madmaxoft | 2014-02-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Fixes #621. | ||||
| | * | | | Added missing files | Tycho | 2014-02-02 | 3 | -0/+39 |
| | | | | | |||||
| | * | | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-02 | 11 | -3/+72 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | Conflicts: src/Blocks/BlockTorch.h | ||||
| | * | | | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 20 | -37/+65 |
| | | | | | |||||
| | * | | | Changed Signiture of OnDigging | Tycho | 2014-02-01 | 4 | -7/+7 |
| | | | | | |||||
| | * | | | Changed Signiture of OnDestroyedByPlayer | Tycho | 2014-02-01 | 12 | -16/+27 |
| | | | | | |||||
| * | | | | Removed register keyword from Messinne Twister | Tycho | 2014-02-01 | 1 | -26/+26 |
| |/ / / | | | | | | | | | | | | | Removed register as it is meaningless in c++ and causes a depreciated warning in clang 3.4 in c++ mode for va_copy | ||||
| * | | | Changed pointers to references | Tycho | 2014-02-01 | 60 | -249/+247 |
| | | | | |||||
| * | | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-01 | 41 | -184/+863 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | | | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 55 | -196/+209 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
| * | | | | Removed cWorld Include | Tycho | 2014-01-26 | 3 | -3/+0 |
| | | | | | |||||
| * | | | | Refactored GetPlacementBlockTypeMeta | Tycho | 2014-01-26 | 7 | -11/+12 |
| | | | | | |||||
| * | | | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 70 | -1195/+2527 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | | | | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 21 | -263/+310 |
| | | | | | | |||||
| * | | | | | Added support for overide in c++11 supporting varients of gcc/clang | Tycho | 2014-01-26 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | First attempt at Implementing Interfaces | Tycho | 2014-01-25 | 19 | -38/+80 |
| | | | | | | |||||
| * | | | | | dded dependecy on Blocks to Generator | Tycho | 2014-01-25 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Fixed #624 | Tiger Wang | 2014-02-02 | 2 | -0/+7 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Fixed #620 | Tiger Wang | 2014-02-02 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Added saving of angry flag. | Kirill Kirilenko | 2014-02-02 | 2 | -0/+7 |
| | | | | | |||||
* | | | | | Fixed sitting tag. | Kirill Kirilenko | 2014-02-02 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | Monster's nominal speed was increased. | Kirill Kirilenko | 2014-02-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fixed teleport to air, if owner is flying. | Kirill Kirilenko | 2014-02-01 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Added saving of collar's color. | Kirill Kirilenko | 2014-02-01 | 2 | -4/+11 |
| | | | | | |||||
* | | | | | Merge pull request #585 from daniel0916/hooks | Mattes D | 2014-02-01 | 6 | -0/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | Added "player destroying" and "player destroyed" hooks | ||||
| * | | | | | Removed "player destroying" hook | daniel0916 | 2014-02-01 | 6 | -48/+1 |
| | | | | | | |||||
| * | | | | | Added "player destroying" and "player destroyed" hooks | daniel0916 | 2014-01-25 | 6 | -0/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hooks: HOOK_PLAYER_DESTROYING HOOK_PLAYER_DESTROYED Idea from: https://github.com/mc-server/MCServer/issues/473 | ||||
* | | | | | | Added reading saved state of the wolf (sitting or standing). | Kirill Kirilenko | 2014-01-31 | 1 | -0/+6 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #607 from mc-server/Wolf_Owner_Saving | Mattes D | 2014-01-31 | 2 | -3/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Wolf: Their owner now gets saved. | ||||
| * | | | | | Inversed condition. | STRWarrior | 2014-01-31 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Wolf: If Owner tag is missing a normal ownerless wolf will spawn. | STRWarrior | 2014-01-31 | 1 | -9/+6 |
| | | | | | | |||||
| * | | | | | Fixed bad variable. | STRWarrior | 2014-01-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Check if the tag is found. | STRWarrior | 2014-01-30 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Fixes #606 | STRWarrior | 2014-01-30 | 2 | -2/+9 |
| | | | | | | |||||
* | | | | | | Fixed cLineBlockTracer:Trace() signature. | madmaxoft | 2014-01-31 | 1 | -13/+27 |
| | | | | | | |||||
* | | | | | | Added cPluginManager:BindCommand() form to the API. | madmaxoft | 2014-01-31 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | That's the canonical way to call static functions. | ||||
* | | | | | | Added cChunkDest::UpdateHeightmap() | madmaxoft | 2014-01-31 | 2 | -17/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator. | ||||
* | | | | | | Attempt at implementing #563 | tonibm19 | 2014-01-30 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | Not tested (I don't have RasPi) | ||||
* | | | | | | Lua: Fixed an error in table-functions callbacks. | madmaxoft | 2014-01-29 | 1 | -1/+5 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Did what xoft said | tonibm19 | 2014-01-29 | 4 | -5/+3 |
| | | | | | |||||
* | | | | | Rewritten code. | tonibm19 | 2014-01-29 | 12 | -152/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Implemented xoft suggestion. Using MoveToPosition as tigerw suggested. | ||||
* | | | | | Fixed sheep | tonibm19 | 2014-01-29 | 1 | -18/+17 |
| | | | | | |||||
* | | | | | Fixed a copypasta error... | tonibm19 | 2014-01-29 | 4 | -1/+5 |
| | | | | | |||||
* | | | | | Now mobs follow you when holding their breed item | tonibm19 | 2014-01-29 | 10 | -5/+153 |
| | | | | | |||||
* | | | | | Limited sign lines to 15 chars. | madmaxoft | 2014-01-29 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | Fixes #598. | ||||
* | | | | | Plugin files are loaded in alphabetical order. | madmaxoft | 2014-01-29 | 1 | -17/+35 |
|/ / / / | | | | | | | | | | | | | Except for the Info.lua file which gets loaded always last. Implements #597. | ||||
* | | | | Removed debug message when a firework entity hit a solid block. | STRWarrior | 2014-01-29 | 1 | -2/+0 |
| | | | | |||||
* | | | | Bottle o' Enchanting spawns an experience orb. | STRWarrior | 2014-01-29 | 1 | -1/+2 |
| | | | | |||||
* | | | | Added 1.7.4 to the list of supported protocols. | madmaxoft | 2014-01-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Protocol 1.7: Encryption is enabled only with auth. | madmaxoft | 2014-01-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Protocol 1.7: Forced encryption on all connections. | madmaxoft | 2014-01-28 | 4 | -15/+120 |
| | | | | | | | | | | | | | | | | This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication. | ||||
* | | | | Crypto: Added public key encryption / decryption. | madmaxoft | 2014-01-28 | 2 | -0/+106 |
| | | | | |||||
* | | | | Fixed an error in Crypto. | madmaxoft | 2014-01-28 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #594 from mc-server/Villager_Update | Mattes D | 2014-01-28 | 5 | -2/+185 |
|\ \ \ \ | | | | | | | | | | | Villager update | ||||
| * | | | | Renamed Farmer functions and added doxycomments | STRWarrior | 2014-01-28 | 2 | -17/+20 |
| | | | | | |||||
| * | | | | Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere. | STRWarrior | 2014-01-28 | 1 | -10/+0 |
| | | | | | |||||
| * | | | | Villager doesn't check the environment for crops if it doesn't need to. | STRWarrior | 2014-01-27 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | The world can now be configured wether farmers should be able to harvest crops. | STRWarrior | 2014-01-27 | 3 | -0/+14 |
| | | | | | |||||
| * | | | | Villager: Few more comments. | STRWarrior | 2014-01-27 | 2 | -4/+9 |
| | | | | | |||||
| * | | | | Cleanup | STRWarrior | 2014-01-27 | 2 | -31/+65 |
| | | | | | | | | | | | | | | | | | | | | Most code in Tick is now split up in different functions. | ||||
| * | | | | Villagers: Harvesting is more rare. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Villager: Farmers can't place crops on blocks other then farmland. | STRWarrior | 2014-01-27 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | Fixed compiler error. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Villager: Farmer: Crops finding is more random. | STRWarrior | 2014-01-27 | 1 | -18/+19 |
| | | | | | |||||
| * | | | | Added GetCropsPos and DidFindCrops functions. | STRWarrior | 2014-01-27 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Villagers: Farmers now replant the crops. | STRWarrior | 2014-01-27 | 2 | -1/+17 |
| | | | | | |||||
| * | | | | Villagers: Fixed only gettings the crops block when farming. | STRWarrior | 2014-01-27 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Villagers don't look for new crops when they already found one. | STRWarrior | 2014-01-27 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | Slight cleanup. | ||||
| * | | | | E_BLOCK_POTATOES isn't an solid block. Villagers were floating above them. | STRWarrior | 2014-01-27 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Villagers: Farmers can also harvest carrots and potatoes. | STRWarrior | 2014-01-27 | 2 | -9/+38 |
| | | | | | |||||
| * | | | | Makes farmers farm crops. | STRWarrior | 2014-01-27 | 2 | -1/+76 |
| | |_|/ | |/| | | |||||
* | | | | Fixed timing on *nix. | madmaxoft | 2014-01-28 | 2 | -2/+2 |
| | | | | |||||
* | | | | Fixed a slight bug in RSA encryption code. | madmaxoft | 2014-01-28 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge pull request #595 from mc-server/NonBlockingSockets | Mattes D | 2014-01-28 | 4 | -63/+171 |
|\ \ \ \ | | | | | | | | | | | Non blocking sockets | ||||
| * | | | | Squashed common code. | madmaxoft | 2014-01-27 | 1 | -14/+7 |
| | | | | | |||||
| * | | | | Fixed Linux compilation. | madmaxoft | 2014-01-27 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Rewritten networking to use non-blocking sockets. | madmaxoft | 2014-01-27 | 4 | -62/+176 |
| | | | | | | | | | | | | | | | | | | | | This fixes #592. | ||||
* | | | | | SIGABRT exits with failure. | Tiger Wang | 2014-01-27 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Fixed client packet parsing. | madmaxoft | 2014-01-26 | 2 | -15/+56 |
| | | | | | | | | | | | | | | | | | | | | When the packet wouldn't fit the current buffer, the server would mis-parse the next packet. This was the cause for #541. Also modified comm logging, now each direction can be turned on separately. | ||||
* | | | | cByteBuffer has more self-tests. | madmaxoft | 2014-01-26 | 1 | -6/+29 |
| | | | | |||||
* | | | | Item-loading now checks for weird bytes. | madmaxoft | 2014-01-26 | 1 | -3/+9 |
| | | | | |||||
* | | | | Fixed Byte-order reading. | madmaxoft | 2014-01-26 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | The functions would fail on bytes that were above 127. | ||||
* | | | | Added SIGABRT to catchers list | Tiger Wang | 2014-01-26 | 1 | -1/+6 |
|/ / / | |||||
* | | | Merge pull request #589 from mc-server/minecartimprovements | Mattes D | 2014-01-26 | 5 | -110/+438 |
|\ \ \ | | | | | | | | | Minecart improvements | ||||
| * | | | Reduced unnecessary echoes (thanks xoft) | Tiger Wang | 2014-01-26 | 1 | -5/+3 |
| | | | | |||||
| * | | | Rail speed tweak | Tiger Wang | 2014-01-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Improved AllToLua UI experience | Tiger Wang | 2014-01-25 | 1 | -2/+8 |
| | | | | |||||
| * | | | Added more minecart powered rail directions | Tiger Wang | 2014-01-24 | 3 | -80/+63 |
| | | | | |||||
| * | | | Begin implementing ascending rails | Tiger Wang | 2014-01-19 | 2 | -2/+45 |
| | | | | |||||
| * | | | Added one more direction into collision checks | Tiger Wang | 2014-01-19 | 1 | -26/+51 |
| | | | | | | | | | | | | | | | | | | | | * Added direction XM_XP * Improved performance, thanks STR and xoft | ||||
| * | | | Minecart improvements and fixes | Tiger Wang | 2014-01-19 | 1 | -33/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed curved rails * Fixed detector rails in certain situations * Fixed powered rails and others passing bad meta to SnapToRail() | ||||
| * | | | Fixed weird meta with curved rails | Tiger Wang | 2014-01-19 | 1 | -5/+15 |
| | | | | |||||
| * | | | Added more rail functionality | Tiger Wang | 2014-01-19 | 3 | -18/+22 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into minecartimprovements | Tiger Wang | 2014-01-19 | 72 | -276/+1139 |
| |\ \ \ | |||||
| * | | | | Minecart collision and general improvements | Tiger Wang | 2014-01-18 | 2 | -70/+242 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented collision on one type of rail * Improved curved rails somewhat * Fixed a crash bug | ||||
* | | | | | Merge pull request #590 from mc-server/Wolf_Fix | Mattes D | 2014-01-26 | 1 | -7/+31 |
|\ \ \ \ \ | | | | | | | | | | | | | Wolf: Small fix since the new AI and a new small feature. | ||||
| * | | | | | Fixed bug where wolfs would teleport while they were sitting. | STRWarrior | 2014-01-26 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Small fix since the new AI and a new small feature. | STRWarrior | 2014-01-26 | 1 | -6/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You get particles when trying to tame wolfs. They don't walk anymore when they are sitting. | ||||
* | | | | | | Fixed segmentation fault on villager damage | Tiger Wang | 2014-01-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | It occurred when attack was environmental. | ||||
* | | | | | | Merge pull request #575 from worktycho/GeneratingBenchmark | Mattes D | 2014-01-25 | 8 | -189/+294 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | More Interfaces to decouple Generator from the rest of the code | ||||
| * | | | | Stupid Mistake fixed | Tycho | 2014-01-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fixed exports | Tycho | 2014-01-25 | 3 | -7/+1 |
| | | | | | |||||
| * | | | | Fixed spelling error | Tycho | 2014-01-22 | 4 | -3/+3 |
| | | | | | |||||
| * | | | | Added manual bindings for moved functions | Tycho | 2014-01-22 | 3 | -2/+71 |
| | | | | | |||||
| * | | | | formatting changes | Tycho | 2014-01-22 | 2 | -6/+26 |
| | | | | | |||||
| * | | | | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-22 | 27 | -228/+2047 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | | | | Actually implemented interfaces | Tycho | 2014-01-20 | 4 | -21/+33 |
| | | | | | | |||||
| * | | | | | Moved Schematic file methods to seperate class | Tycho | 2014-01-20 | 4 | -175/+177 |
| | | | | | | |||||
| * | | | | | Merge branch 'ForEachChunkProvider' into GeneratingBenchmark | Tycho | 2014-01-20 | 4 | -17/+23 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | * | | | | | Seperated BlockArea From World | Tycho | 2014-01-20 | 4 | -14/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-20 | 43 | -490/+1360 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | this merge is necessary, | ||||
| * | | | | | Added Inifile and OSSupport Linking | Tycho | 2014-01-19 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #588 from mc-server/Sheep_Eating | Mattes D | 2014-01-25 | 2 | -1/+41 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Implemented sheeps eating grass. | ||||
| * | | | | | | Implemented sheeps eating grass. | STRWarrior | 2014-01-25 | 2 | -1/+41 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #587 from mc-server/mobimprovements | Mattes D | 2014-01-25 | 28 | -563/+716 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Mob improvements & rudimentary artificial intelligence | ||||
| * | | | | | | | Did what xoft recommended | Tiger Wang | 2014-01-25 | 2 | -2/+6 |
| | | | | | | | | |||||
| * | | | | | | | Two minor changes | Tiger Wang | 2014-01-25 | 2 | -6/+4 |
| | | | | | | | | |||||
| * | | | | | | | Implemented fall damage for mobs | Tiger Wang | 2014-01-25 | 5 | -11/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
| * | | | | | | | Attack() is no longer always called | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Implemented pickup combining | Tiger Wang | 2014-01-25 | 1 | -0/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes FS393 * Part of #131 | ||||
| * | | | | | | | Mob bugfixes | Tiger Wang | 2014-01-25 | 6 | -26/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | | | | | | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 6 | -127/+137 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
| * | | | | | | | Fixed a generator bug | Tiger Wang | 2014-01-25 | 2 | -1/+9 |
| | | | | | | | | |||||
| * | | | | | | | Zombies and skeletons use AI | Tiger Wang | 2014-01-25 | 2 | -9/+15 |
| | | | | | | | | |||||
| * | | | | | | | Miscellaneous improvements | Tiger Wang | 2014-01-24 | 3 | -28/+17 |
| | | | | | | | | |||||
| * | | | | | | | Changed a condition to IsGameMode | Tiger Wang | 2014-01-24 | 1 | -2/+1 |
| | | | | | | | | |||||
| * | | | | | | | Made wolves compatible with new AI code | Tiger Wang | 2014-01-24 | 2 | -11/+26 |
| | | | | | | | | |||||
| * | | | | | | | Monsters no longer check for direct line of sight | Tiger Wang | 2014-01-24 | 1 | -10/+2 |
| | | | | | | | | |||||
| * | | | | | | | Large reworking of mob code [SEE DESC] | Tiger Wang | 2014-01-24 | 7 | -242/+334 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented better pathfinding - Removed lots of unused variables, functions, etc. * Changed some variable types * Other miscellaneous fixes, and also completes the previous PRs | ||||
| * | | | | | | | Fixed mobs too close to player not ticking | Tiger Wang | 2014-01-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A condition would never be fulfilled. A number squared was compared to -1, but there is nothing that, multiplied by itself, gives -1. | ||||
| * | | | | | | | Implemented creeper abilities | Tiger Wang | 2014-01-24 | 2 | -2/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Creepers now explode with a sound effect * Creepers drop a music disc on the unlikely event of being killed by a skeleton's arrow Inspired by @maniak89's PR #132. | ||||
| * | | | | | | | Removed unused ReferenceManager | Tiger Wang | 2014-01-24 | 4 | -122/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #583 from mc-server/ChangeToPolarSSL | Mattes D | 2014-01-25 | 14 | -161/+679 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Change to polar ssl | ||||
| * | | | | | | | | Added RSA encryption to crypto wrappers. | madmaxoft | 2014-01-25 | 2 | -0/+39 |
| | | | | | | | | | |||||
| * | | | | | | | | Merged branch 'master' into ChangeToPolarSSL. | madmaxoft | 2014-01-25 | 15 | -117/+319 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into ChangeToPolarSSL. | madmaxoft | 2014-01-23 | 11 | -198/+254 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixed a warning in ScoreboardSerializer. | madmaxoft | 2014-01-23 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | PolarSSL is fully used for 1.3.2 protocol encryption. | madmaxoft | 2014-01-23 | 13 | -157/+630 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed a bug in LeakFinder. | madmaxoft | 2014-01-23 | 1 | -3/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Replacing CryptoPP with PolarSSL. | madmaxoft | 2014-01-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only the CMake modification to build with PolarSSL, the actual MCS code doesn't compile at all yet. | ||||
* | | | | | | | | | | | Merge pull request #581 from worktycho/strerror | Mattes D | 2014-01-25 | 7 | -65/+76 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | Switched cEvent to use strerror_r for error messages | ||||
| * | | | | | | | | | | Switched cEvent to GetOSErrorString | Tycho | 2014-01-25 | 3 | -18/+14 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Extracted cSocket::GetErrorString into GetOSErrorString | Tycho | 2014-01-25 | 6 | -59/+62 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Switched cEvent to use strerror_r for error messages | Tycho | 2014-01-23 | 1 | -6/+18 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Comm logging is available in both Debug and Release modes. | madmaxoft | 2014-01-25 | 3 | -16/+16 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Added cFile::Flush(). | madmaxoft | 2014-01-25 | 2 | -20/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful when using cFile as a log file and we know the server may crash after a specific write, so we flush the file before continuing. | ||||
* | | | | | | | | | | | Protocol17: Comm logging shows the data left over from previous parse. | madmaxoft | 2014-01-25 | 1 | -2/+15 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #586 from worktycho/BindingsMove | Alexander Harkness | 2014-01-25 | 1 | -28/+65 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | Implented xofts suggestions in #577 | ||||
| * | | | | | | | | | | Added dependecy output to Bindings/BindingsDependencies.txt | Tycho | 2014-01-25 | 1 | -0/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Reformatted Bindings Dependecies | Tycho | 2014-01-25 | 1 | -28/+58 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed *nix compilation for previous commit. | madmaxoft | 2014-01-24 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Added per-connection comm logging in debug mode. | madmaxoft | 2014-01-24 | 3 | -1/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter. | ||||
* | | | | | | | | | | | Fixed a possible deadlock on client disconnect. | madmaxoft | 2014-01-24 | 1 | -9/+0 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed a failure in cSquid. | madmaxoft | 2014-01-24 | 1 | -1/+2 |
| |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably due to rounding errors the squid was querying out-of-chunk coords. | ||||
* | | | | | | | | | | Fixed Win nightbuilds not producing PDBs. | madmaxoft | 2014-01-24 | 1 | -0/+7 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed a few compile-time and runtime warnings in ScoreboardSerializer. | madmaxoft | 2014-01-24 | 1 | -8/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed crash with failed entity-loading. | madmaxoft | 2014-01-24 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix issues reported in: http://forum.mc-server.org/showthread.php?tid=1328 http://forum.mc-server.org/showthread.php?tid=1308 | ||||
* | | | | | | | | | | Merge remote-tracking branch 'MikeHunsinger/master' | madmaxoft | 2014-01-24 | 4 | -49/+89 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixed indentation once and for all. | Mike Hunsinger | 2014-01-24 | 2 | -46/+46 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed indentation and doxygen comments... For real this time. | Mike Hunsinger | 2014-01-24 | 2 | -15/+15 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed spacing and doxycomments. | Mike Hunsinger | 2014-01-24 | 3 | -18/+16 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed extra line | Mike Hunsinger | 2014-01-23 | 1 | -2/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Split TossItem into three Toss functions (Held, Equipped and Pickup) | Mike Hunsinger | 2014-01-23 | 4 | -57/+101 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Fixed flint&steel failure on the Y world edges. | madmaxoft | 2014-01-24 | 1 | -0/+4 |
| |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #580 from xdot/master | Mattes D | 2014-01-23 | 2 | -41/+33 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Fixed scoreboard serialization | ||||
| * | | | | | | | | | Fixed 1.5.x scoreboard packet IDs | andrew | 2014-01-23 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed scoreboard.dat structure | andrew | 2014-01-23 | 1 | -5/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed scoreboard serialization | andrew | 2014-01-23 | 1 | -35/+26 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Make clean now effects Bindings | Tycho | 2014-01-23 | 1 | -0/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Removed Bindings folder subcmake on *nix | Tycho | 2014-01-23 | 1 | -1/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Bugfixes | Tycho | 2014-01-23 | 2 | -12/+9 |
| | | | | | | | | | | |||||
* | | | | | | | | | | added dependecies for bindings regen | Tycho | 2014-01-23 | 2 | -14/+46 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Fixed crash while calling disabled plugins. | madmaxoft | 2014-01-23 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Improved code safety for the Compact world storage. | Mattes D | 2014-01-23 | 1 | -104/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was a huge chunk of smelly code. | ||||
* | | | | | | | | Minor style improvements for the merged PR. | Mattes D | 2014-01-23 | 1 | -4/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge remote-tracking branch 'xdot/master' | Mattes D | 2014-01-23 | 6 | -40/+104 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | * xdot/master: Command block fixes 2 | ||||
| * | | | | | | | Command block fixes 2 | andrew | 2014-01-23 | 6 | -40/+104 |
| | | | | | | | | |||||
* | | | | | | | | Authenticator: Reduced logging levels. | madmaxoft | 2014-01-22 | 1 | -4/+4 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Fixed compilation on VC2008 | tonibm19 | 2014-01-22 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #566 from xdot/master | Mattes D | 2014-01-22 | 20 | -9/+1571 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Scoreboard | ||||
| * | | | | | | cWorld now saves/loads the scoreboard | andrew | 2014-01-22 | 4 | -15/+44 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 30 | -478/+679 |
| |\| | | | | | |||||
| * | | | | | | Scoreboard SendTo() | andrew | 2014-01-21 | 4 | -6/+74 |
| | | | | | | | |||||
| * | | | | | | Scoreboard protocol support | andrew | 2014-01-21 | 17 | -23/+321 |
| | | | | | | | |||||
| * | | | | | | Scoreboard serialization | andrew | 2014-01-20 | 3 | -14/+92 |
| | | | | | | | |||||
| * | | | | | | Scoreboard deserialization | andrew | 2014-01-20 | 7 | -48/+599 |
| | | | | | | | |||||
| * | | | | | | Scoreboard improvements | andrew | 2014-01-19 | 3 | -116/+79 |
| | | | | | | | |||||
| * | | | | | | Basic scoreboard implementation | andrew | 2014-01-19 | 5 | -1/+576 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Implemented cPluginManager:CallPlugin() API. | madmaxoft | 2014-01-21 | 7 | -214/+471 |
| |/ / / / |/| | | | | | | | | | | | | | | This function supersedes cPlugin:Call(), is safer to use in regards to multithreading and once again removes the need for the cPlugin class being exported at all. | ||||
* | | | | | Fix a crash but somewhere... | Alexander Harkness | 2014-01-20 | 1 | -2/+1 |
| |_|/ / |/| | | | |||||
* | | | | Changed the cWorld::ScheduleTask() signature. | madmaxoft | 2014-01-19 | 3 | -151/+181 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | | | cLuaState can now check function params. | madmaxoft | 2014-01-19 | 2 | -0/+37 |
| | | | | |||||
* | | | | Merge pull request #569 from worktycho/EnchantmentsFix | Mattes D | 2014-01-19 | 8 | -88/+120 |
|\ \ \ \ | | |/ / | |/| | | Enchantments fix | ||||
| * | | | Switched EnchantmentSerilizer to namespace | Tycho | 2014-01-19 | 7 | -17/+23 |
| | | | | |||||
| * | | | Spilt Writing of Enchantments to seperate class | Tycho | 2014-01-19 | 8 | -90/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a new class cEnchantmentSerializer to serilize Enchantments to NBT. This breaks a dependecy chain between cChunkGenerator and cWorld. cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments so having it seperate reduces the spread of the frein modifier | ||||
* | | | | Merge pull request #565 from mc-server/commandblockfixes | Mattes D | 2014-01-19 | 11 | -5/+151 |
|\ \ \ \ | | | | | | | | | | | Command block fixes | ||||
| * | | | | Removed unneeded paramters | Tiger Wang | 2014-01-19 | 9 | -15/+23 |
| | | | | | |||||
| * | | | | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 9 | -42/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug | ||||
| * | | | | Implemented MC|Brand response | Tiger Wang | 2014-01-19 | 1 | -3/+9 |
| | | | | | |||||
| * | | | | Improved command blocks | Tiger Wang | 2014-01-19 | 11 | -5/+124 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Their command and previous output are displayed on the client * They have a BlockHandler implementation, so you can't place blocks on them anymore + As a side effect, implemented UpdateBlockEntity | ||||
* | | | | | Rewritten SocketThreads for proper shutdown scenario. | madmaxoft | 2014-01-19 | 8 | -178/+189 |
| | | | | | | | | | | | | | | | | | | | | This fixes #560 and #390. | ||||
* | | | | | 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 | 2 | -9/+3 |
| | | | | | | |||||
| * | | | | | Increased tick count to long | Tycho | 2014-01-17 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Implemented xsofts suggestion for a saturating counter in the scheduler | Tycho | 2014-01-17 | 2 | -5/+8 |
| | | | | | | |||||
* | | | | | | SocketThreads: Removed unused code. | madmaxoft | 2014-01-19 | 2 | -53/+3 |
| |_|_|/ / |/| | | | | |||||
* | | | | | 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 |
| | | | | | | |||||
* | | | | | | Exported cFloater to the Lua API. | STRWarrior | 2014-01-19 | 2 | -3/+8 |
| | | | | | | |||||
* | | | | | | Fixed compiler error. | STRWarrior | 2014-01-18 | 1 | -3/+3 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #557 from xdot/master | Mattes D | 2014-01-18 | 19 | -62/+592 |
|\ \ \ \ \ | | | | | | | | | | | | | Command blocks | ||||
| * | | | | | Command block fixes | andrew | 2014-01-18 | 3 | -43/+17 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-18 | 3 | -3/+150 |
| |\| | | | | |||||
| * | | | | | Parse the MC|AdvCdm plugin message | andrew | 2014-01-18 | 4 | -1/+70 |
| | | | | | | |||||
| * | | | | | Command blocks: Execute() | andrew | 2014-01-18 | 5 | -18/+42 |
| | | | | | | |||||
| * | | | | | Command block (de)serialization | andrew | 2014-01-18 | 6 | -21/+122 |
| | | | | | | |||||
| * | | | | | Basic command block implementation | andrew | 2014-01-18 | 11 | -33/+395 |
| | |_|/ / | |/| | | | |||||
* | | | | | HTTP connections aren't kept alive unless explicitly enabled. | madmaxoft | 2014-01-18 | 4 | -37/+58 |
| |/ / / |/| | | | | | | | | | | | | | | | Only the client can decide that the connection can be kept alive, we must close the socket if the client doesn't indicate keepalive support. This will provide a fix for #390 when #560 is fixed; until then the issue remains, just it's no longer HTTPServer's fault. | ||||
* | | | | Alpha-sorted the finishers. | madmaxoft | 2014-01-18 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merged branch 'NetherFinish'. | madmaxoft | 2014-01-18 | 3 | -3/+150 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fixed errors. | STRWarrior | 2014-01-18 | 2 | -2/+2 |
| | | | | |||||
| * | | | Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's | STRWarrior | 2014-01-18 | 3 | -10/+10 |
| | | | | |||||
| * | | | Some tweaks. | STRWarrior | 2014-01-18 | 1 | -5/+18 |
| | | | | | | | | | | | | | | | | | | | | Everything generates more often. Fire can only spawn on ForeverBurning blocks. | ||||
| * | | | Fixed bug where only brown mushrooms would spawn. | STRWarrior | 2014-01-18 | 1 | -3/+3 |
| | | | | |||||
| * | | | It now actualy works. | STRWarrior | 2014-01-18 | 1 | -20/+42 |
| | | | | |||||
| * | | | First attempt at creating a clumb version NetherFinisher. | STRWarrior | 2014-01-17 | 2 | -22/+63 |
| | | | | |||||
| * | | | Added cFinishGenNetherSprinkleFoliage. | STRWarrior | 2014-01-10 | 3 | -2/+73 |
| | | | | |||||
* | | | | Merge pull request #552 from worktycho/c++11 | Mattes D | 2014-01-17 | 1 | -4/+0 |
|\ \ \ \ | | | | | | | | | | | Changed std to c++11 in clang to fix va_copy issues | ||||
| * | | | | Changed std to c++11 in clang to fix va_copy issues | Tycho | 2014-01-17 | 1 | -4/+0 |
| | |/ / | |/| | | |||||
* / | | | Added user setting compression factor | Tycho | 2014-01-17 | 10 | -22/+33 |
|/ / / | |||||
* | | | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 7 | -11/+62 |
|\ \ \ | | | | | | | | | Added cWorld::SpawnMinecart. | ||||
| * | | | Changed GetContent function. | STRWarrior | 2014-01-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed server crash. | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 7 | -17/+18 |
| | | | | |||||
| * | | | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 7 | -10/+33 |
| | | | | |||||
| * | | | Added cWorld::SpawnMinecart. | STRWarrior | 2014-01-12 | 2 | -0/+27 |
| | | | | |||||
* | | | | Fixed SIGABRT_COMPAT on other architectures. | madmaxoft | 2014-01-17 | 1 | -0/+2 |
| | | | | |||||
* | | | | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 23 | -43/+43 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/customnames' | madmaxoft | 2014-01-17 | 38 | -115/+201 |
|\ \ \ \ | |||||
| * | | | | Changed newline character because of issues | Tiger Wang | 2014-01-16 | 2 | -4/+13 |
| | | | | | |||||
| * | | | | Removed CustomCopy() | Tiger Wang | 2014-01-16 | 2 | -24/+1 |
| | | | | | |||||
| * | | | | Really did what xoft wanted | Tiger Wang | 2014-01-16 | 1 | -5/+8 |
| | | | | | |||||
| * | | | | Fixed #535 | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 34 | -74/+67 |
| | | | | | |||||
| * | | | | Possibly did what xoft wanted | Tiger Wang | 2014-01-16 | 3 | -10/+25 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into customnames | Tiger Wang | 2014-01-16 | 9 | -75/+90 |
| |\ \ \ \ | |||||
| * | | | | | OBSOLETE'd obsolete functions | Tiger Wang | 2014-01-15 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Implemented custom names and lore | Tiger Wang | 2014-01-15 | 4 | -35/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added custom names and lore + Added saving and loading + Added writing and parsing of NBT | ||||
| * | | | | | Implemented Ctrl-Q drop stack | Tiger Wang | 2014-01-15 | 3 | -3/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also fixed an issue with TossItems not respecting count. | ||||
* | | | | | | Protocol 1.7: More output on unknown packets / protocol states. | madmaxoft | 2014-01-17 | 1 | -4/+21 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fixed block break packet number | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fixed #535 | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fixed SIGPIPE on cSocket::Send(). | madmaxoft | 2014-01-16 | 3 | -12/+13 |
| | | | | | |||||
* | | | | | Protocol 1.7: Unknown packets are dumped to log in Debug mode. | madmaxoft | 2014-01-16 | 1 | -1/+14 |
| | | | | | |||||
* | | | | | Disabled excessive entity-related logging in Debug mode. | madmaxoft | 2014-01-16 | 2 | -3/+26 |
| | | | | | |||||
* | | | | | Fixed whitespace in previous commit. | madmaxoft | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Finished exporting cWorld:ScheduleTask() to Lua API. | madmaxoft | 2014-01-16 | 1 | -1/+15 |
| |/ / / |/| | | | |||||
* | | | | CMake: Fixed output paths for all MSVC versions. | madmaxoft | 2014-01-16 | 1 | -7/+9 |
| | | | | |||||
* | | | | Added packet diagnostics to 1.7 protocol. | madmaxoft | 2014-01-16 | 2 | -30/+40 |
| | | | | | | | | | | | | | | | | When the packet is mis-interpreted, a log message is output about the packet type and lengths. | ||||
* | | | | Yet another attempt at VarArgs. | madmaxoft | 2014-01-16 | 1 | -10/+15 |
| | | | | |||||
* | | | | Another VarArgs fix. | madmaxoft | 2014-01-16 | 6 | -39/+37 |
|/ / / | | | | | | | | | | This time using va_copy() on platforms that have it and simple assignment on platforms that don't. | ||||
* | | | Using a 2nd argument instead of va_copy(). | madmaxoft | 2014-01-15 | 6 | -30/+42 |
| | | | | | | | | | | | | This seems to be the only reasonable C++03-only solution. | ||||
* | | | Fixed varargs modification. | madmaxoft | 2014-01-15 | 1 | -1/+5 |
| | | | | | | | | | | | | Ref.: #541. | ||||
* | | | Furnace minecarts now stop being active after a while. | STRWarrior | 2014-01-15 | 2 | -2/+19 |
| | | | |||||
* | | | First implementation for furnace minecarts. | STRWarrior | 2014-01-15 | 2 | -1/+23 |
| | | | |||||
* | | | Merge pull request #542 from worktycho/schedular | Mattes D | 2014-01-15 | 3 | -4/+121 |
|\ \ \ | | | | | | | | | added cWorld::ScheduleTask Function | ||||
| * | | | added cWorld::ScheduleTask Function | Tycho | 2014-01-14 | 3 | -4/+121 |
| | | | | | | | | | | | | | | | | | | | | ScheduleTask schedules a SceduledTask object to be run x ticks in the future. In is exported to lua, fixes #150 | ||||
* | | | | Merge pull request #538 from mc-server/minecarts | Mattes D | 2014-01-15 | 9 | -176/+469 |
|\ \ \ \ | |/ / / |/| | | | Minecarts | ||||
| * | | | Yes newline at end of file :D | Tiger Wang | 2014-01-14 | 1 | -1/+5 |
| | | | | |||||
| * | | | Final improvements to Minecarts | Tiger Wang | 2014-01-13 | 3 | -93/+292 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed curved rails being a little broken + Implemented detector rails + Implemented block collisions on rails * Fixed snapping to rail - Removed minecart physics conditions in Entity.cpp as minecarts use their own simulator when on rails Fixes #148 and #217; partially implemented #215. This is Cave Johnson, and we're done here. | ||||
| * | | | Detaching improvements | Tiger Wang | 2014-01-13 | 4 | -4/+34 |
| | | | | | | | | | | | | | | | | | | | | * Players now search for an area around themselves to teleport to when detaching from something | ||||
| * | | | Fixed wire, rail, and pressure plate unpowering | Tiger Wang | 2014-01-13 | 1 | -3/+4 |
| | | | | |||||
| * | | | Fixed settings plugin generation after IniFile | Tiger Wang | 2014-01-12 | 1 | -3/+3 |
| | | | | |||||
| * | | | Multiple enhancements and fixes to minecarts | Tiger Wang | 2014-01-12 | 4 | -132/+191 |
| | | | | | | | | | | | | | | | | | | | | | | | | + They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails | ||||
* | | | | CMake: Added postfix for profiled exe | madmaxoft | 2014-01-14 | 1 | -0/+4 |
| | | | | |||||
* | | | | Removed shutdown() from socket closing. | madmaxoft | 2014-01-13 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | It's not there for Windows and everything seems fine, the client doesn't shutdown either, so why should we be polite. Fixes #537. | ||||
* | | | | Added handshake processing to protocol 1.7. | madmaxoft | 2014-01-13 | 2 | -2/+29 |
| | | | | | | | | | | | | | | | | This fixes #495 | ||||
* | | | | Generating the bindings outputs a message at the end. | madmaxoft | 2014-01-13 | 1 | -0/+8 |
| | | | | |||||
* | | | | cCreeper is no longer available in API. | madmaxoft | 2014-01-13 | 3 | -14/+1 |
| | | | | | | | | | | | | | | | | Has been replaced by cMonster. | ||||
* | | | | CMake: Removed leftover debugging output. | madmaxoft | 2014-01-13 | 1 | -1/+0 |
| | | | | |||||
* | | | | CMake: Added resources to windows projects. | madmaxoft | 2014-01-13 | 1 | -1/+14 |
| | | | | |||||
* | | | | Added a generic .user file for MSVC. | madmaxoft | 2014-01-13 | 1 | -0/+167 |
| | | | | | | | | | | | | | | | | This brings in the default debugging settings for the MSVC project, when generated by CMake. | ||||
* | | | | Moved the win resources into a separate subfolder. | madmaxoft | 2014-01-12 | 5 | -0/+22 |
| | | | | | | | | | | | | | | | | This will allow us to use them in CMake builds. | ||||
* | | | | CMake generates Bindings when not existant (win) | madmaxoft | 2014-01-12 | 1 | -0/+10 |
|/ / / | |||||
* | | | Merge pull request #529 from mc-server/derpstonerefactor | Alexander Harkness | 2014-01-12 | 10 | -331/+265 |
|\ \ \ | |/ / |/| | | Major refactoring of redstone | ||||
| * | | Fixed rails powering | Tiger Wang | 2014-01-11 | 1 | -0/+2 |
| | | | |||||
| * | | Did some stuff with the vectors | Tiger Wang | 2014-01-11 | 1 | -32/+17 |
| | | | |||||
| * | | Fixed a door bug and reduced code | Tiger Wang | 2014-01-11 | 1 | -19/+1 |
| | | | | | | | | | | | | | | | Doors wouldn't get powered by repeaters, and some blocks, like glass, were viable middle blocks when they shouldn't have been. | ||||
| * | | Renamed g_TorchPlaceable... | Tiger Wang | 2014-01-11 | 6 | -71/+71 |
| | | | | | | | | | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin | ||||
| * | | Fixed doors, fixes #453 | Tiger Wang | 2014-01-10 | 1 | -38/+8 |
| | | | |||||
| * | | Major refactoring of redstone | Tiger Wang | 2014-01-10 | 4 | -186/+181 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a refactoring of the redstone code, mainly the functions handling the removal of invalid blocks from power supplier data structures. Its aim is to improve performance and potentially reduce the memory footprint of the data structures. It works to reduce the amount of GetBlock()s triggered every tick. Before, a GetBlock() was requested for every single item in the data lists, as well as for every single redstone block in a chunk. Following these changes, the AddBlock() event is utilised more effectively to only update the lists when needed (a block is changed), as well as to insert the block type (and update it when needed) alongside the coordinates into the main redstone simulator chunkdata list. In short, a single GetBlock() is now cached, with this cache being updated when the simulator is awoken due to a block change. At least, I *hope* that this is what it does :P | ||||
* | | | Disabled a useless MSVC warning in Bindings.cpp. | madmaxoft | 2014-01-12 | 1 | -0/+6 |
| | | | |||||
* | | | Merge pull request #532 from mc-server/LuaStateErrorHandler | Mattes D | 2014-01-12 | 5 | -252/+130 |
|\ \ \ | | | | | | | | | Lua state error handler | ||||
| * | | | Lua errors display stack trace. | madmaxoft | 2014-01-11 | 2 | -3/+27 |
| | | | | | | | | | | | | | | | | Fixes #418. | ||||
| * | | | Removed internal methods from public cLuaState interface. | madmaxoft | 2014-01-11 | 3 | -119/+103 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PushFunction(), CallFunction() and GetReturn() are not to be called independently, but rather only by using the Call() templated overrides. Push() needs to be left in the public part, it is used for pushing results in the ManualBindings. Preparation for #418. | ||||
| * | | | Removed an unused file. | madmaxoft | 2014-01-11 | 2 | -130/+0 |
| | | | | |||||
* | | | | Merge pull request #527 from derouinw/biomessplit | Mattes D | 2014-01-11 | 8 | -222/+241 |
|\ \ \ \ | |/ / / |/| | | | Biomessplit | ||||
| * | | | Globals.h needs to be first include | Bill Derouin | 2014-01-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Include Biome enum in ChunkDef | Bill Derouin | 2014-01-10 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | Can't forward declare an enum | ||||
| * | | | Added newlines at ends of files | Bill Derouin | 2014-01-10 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fixed missing externals | Bill Derouin | 2014-01-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Turns out you actually have to include the .cpp in the project file | ||||
| * | | | Move biome definition to separate files | Bill Derouin | 2014-01-09 | 8 | -222/+241 |
| | | | | |||||
* | | | | Removed unused variables. | madmaxoft | 2014-01-11 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | The Lua API calls had no side-effects, either. | ||||
* | | | | Merge pull request #530 from mc-server/GeneratorDecouple | Mattes D | 2014-01-11 | 10 | -50/+188 |
|\ \ \ \ | | | | | | | | | | | Decoupled cChunkGenerator from cWorld and cRoot. | ||||
| * | | | | Decoupled cChunkGenerator from cWorld and cRoot. | madmaxoft | 2014-01-10 | 10 | -50/+188 |
| | | | | | | | | | | | | | | | | | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS. | ||||
* | | | | | Fixed glowstone drop count | andrew | 2014-01-11 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Fixed generator adding values to ini file. | madmaxoft | 2014-01-10 | 2 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #520 from mc-server/SoulSand | Mattes D | 2014-01-10 | 2 | -1/+17 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | NetherGen: Now generates SoulSand. | ||||
| * | | Fixed recurring pattern. | STRWarrior | 2014-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed chunk borders. | STRWarrior | 2014-01-09 | 1 | -3/+3 |
| | | | |||||
| * | | Speed-up. I got about 40 extra ch/s | STRWarrior | 2014-01-08 | 1 | -9/+14 |
| | | | |||||
| * | | WormNestCaves now remove soul sand. | STRWarrior | 2014-01-08 | 1 | -0/+1 |
| | | | |||||
| * | | NetherGen: Now generates SoulSand. | STRWarrior | 2014-01-08 | 1 | -1/+11 |
| |/ | |||||
* | | Exported cClientHandle::SendPluginMessage() to Lua. | madmaxoft | 2014-01-09 | 1 | -0/+30 |
| | | |||||
* | | Fixed wrong packet number for PluginMessage packet. | madmaxoft | 2014-01-09 | 1 | -1/+1 |
| | | |||||
* | | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 9 | -0/+50 |
| | | | | | | | | It is not yet exported in the API, though. | ||||
* | | Composition generator creating moved to a separate function. | madmaxoft | 2014-01-09 | 2 | -61/+83 |
| | | | | | | | | Also it forces the defaults into the INI file. | ||||
* | | Height generator creating moved info HeiGen.cpp. | madmaxoft | 2014-01-09 | 3 | -54/+82 |
| | | | | | | | | The generator also explicitly sets the default back into the INI file. | ||||
* | | Merge pull request #517 from derouinw/master | Mattes D | 2014-01-09 | 1 | -0/+13 |
|\ \ | |/ |/| | Add missing plugin error | ||||
| * | A couple touchups | Bill Derouin | 2014-01-08 | 1 | -2/+3 |
| | | |||||
| * | Add missing plugin error | Bill Derouin | 2014-01-07 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | Previously, if a plugin was included but the folder had no lua files, the error given was ambiguous. Now, it explicitly describes lack of lua files. See issue #512 P.S. This probably isn't the best way, but this is where the fix can be made. | ||||
* | | Fixed AppendVPrintf() handling for large strings. | madmaxoft | 2014-01-08 | 1 | -6/+4 |
| | | | | | | | | This caused a failure in server favicons. | ||||
* | | Graceful shutdown on SIGTERM | Tiger Wang | 2014-01-07 | 1 | -0/+5 |
|/ | |||||
* | Merge pull request #516 from mc-server/favicon | Alexander Harkness | 2014-01-07 | 4 | -18/+8 |
|\ | | | | | Fixed favicons | ||||
| * | Fixed favicons | Tiger Wang | 2014-01-07 | 4 | -18/+8 |
| | | |||||
* | | Plugin messages are received and handed to plugins. | madmaxoft | 2014-01-07 | 8 | -2/+68 |
|/ | | | | Note that MCS doesn't currently handle any channel registrations, this will come later on. | ||||
* | Merge pull request #514 from derouinw/master | Mattes D | 2014-01-07 | 3 | -0/+20 |
|\ | | | | | Implement favicon for 1.7.2 | ||||
| * | Avoid making copies of favicon string | Bill Derouin | 2014-01-07 | 2 | -2/+2 |
| | | |||||
| * | A few more touch ups | Bill Derouin | 2014-01-07 | 2 | -12/+2 |
| | | |||||
| * | A few touch ups | Bill Derouin | 2014-01-07 | 2 | -2/+5 |
| | | |||||
| * | Removed unused line | Bill Derouin | 2014-01-07 | 1 | -1/+0 |
| | | |||||
| * | Implement favicon for 1.7.2 | Bill Derouin | 2014-01-07 | 4 | -0/+28 |
| | | | | | | | | | | Favicon data is a png encoded in base64 which is stored in the server and sent in the server response packet | ||||
* | | Disabled an unneeded MSVC warning. | madmaxoft | 2014-01-07 | 1 | -4/+7 |
| | | | | | | | | Also sorted the enabled warnings by their numerical code for easier searching.. | ||||
* | | Removed a debugging log output in cPluginManager:AddHook(). | madmaxoft | 2014-01-07 | 1 | -1/+0 |
| | | |||||
* | | More MSVC warning fixes. | madmaxoft | 2014-01-07 | 9 | -11/+11 |
| | | |||||
* | | LuaState can push strings with embedded NULs. | madmaxoft | 2014-01-07 | 1 | -1/+1 |
| | | | | | | | | This also marginally improves performance, since a strlen() isn't called (inside lua_pushstring()), the string length is stored in the AString object directly. | ||||
* | | Fixed a few MSVC warnings. | madmaxoft | 2014-01-07 | 8 | -18/+21 |
| | | |||||
* | | Added Base64Encode(). | madmaxoft | 2014-01-07 | 2 | -0/+51 |
| | | |||||
* | | Disabled the type conversion MSVC warning. | madmaxoft | 2014-01-06 | 1 | -1/+3 |
| | | | | | | | | It was hitting way too many false positives. | ||||
* | | Fixed a few MSVC warnings. | madmaxoft | 2014-01-06 | 11 | -16/+12 |
|/ | |||||
* | Merge pull request #511 from mc-server/CmakeOutput | Mattes D | 2014-01-06 | 1 | -1/+1 |
|\ | | | | | Output dir set to $/MCServer. | ||||
| * | Output dir set to $/MCServer. | madmaxoft | 2014-01-06 | 1 | -1/+1 |
| | | | | | | | | Ref.: #510. | ||||
* | | Merge pull request #509 from Diusrex/master | Mattes D | 2014-01-06 | 7 | -5/+87 |
|\ \ | | | | | | | Added #pragma for warnings in MSVC warnings | ||||
| * | | Added fake functions into cCriticalSection because of the change to ASSERT | Diusrex | 2014-01-05 | 1 | -0/+5 |
| | | | |||||
| * | | Changed the release version of ASSERT. | Diusrex | 2014-01-05 | 1 | -1/+1 |
| | | | | | | | | | | | | This was so a variable only used in ASSERT statements will not give a warning about not being used. | ||||
| * | | Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h | Diusrex | 2014-01-05 | 5 | -3/+68 |
| | | | | | | | | | | | | | | | | | | I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings. So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function. | ||||
| * | | Making all of the useful level 4 warnings be active. | Diusrex | 2014-01-05 | 1 | -1/+13 |
| | | | |||||
* | | | Exported cWorld::BroadcastBlockAction(). | madmaxoft | 2014-01-06 | 1 | -1/+1 |
| |/ |/| | | | | | As requested in #508; no guarantees about it. | ||||
* | | Fixed wrong enqueueing. | madmaxoft | 2014-01-06 | 1 | -2/+9 |
|/ | | | | Fixes #505. | ||||
* | Fixed cPluginManager:AddHook() binding. | madmaxoft | 2014-01-05 | 1 | -6/+13 |
| | | | | Fixes #401. Old formats are still accepted, for compatibility reasons. | ||||
* | Fixed a race condition in the cQueue class. | madmaxoft | 2014-01-05 | 1 | -59/+86 |
| | | | | Fixes #505. | ||||
* | Fixed Documentation | Tycho | 2014-01-03 | 1 | -4/+2 |
| | |||||
* | derp | Tycho | 2014-01-03 | 1 | -1/+1 |
| | |||||
* | actual fix | Tycho | 2014-01-03 | 1 | -2/+9 |
| | |||||
* | fixed failure to return a value from Remove | Tycho | 2014-01-03 | 1 | -1/+1 |
| | |||||
* | implement xsofts recommendations | Tycho Bickerstaff | 2014-01-03 | 1 | -9/+15 |
| | |||||
* | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2014-01-02 | 7 | -29/+80 |
|\ | |||||
| * | Merge pull request #479 from mc-server/cmake-win | Mattes D | 2014-01-02 | 2 | -18/+30 |
| |\ | | | | | | | Cmake-win | ||||
| | * | Added support for out-of-source builds. | madmaxoft | 2013-12-28 | 2 | -18/+30 |
| | | | |||||
| * | | More memory alignment fixes. | madmaxoft | 2014-01-02 | 2 | -6/+6 |
| | | | | | | | | | | | | Ref.: #420. | ||||
| * | | Fixed unaligned memory access in FastNBT. | madmaxoft | 2014-01-02 | 3 | -5/+44 |
| | | | | | | | | | | | | This should fix #420. | ||||
* | | | added documentation | Tycho Bickerstaff | 2014-01-02 | 1 | -7/+45 |
| | | | |||||
* | | | fixed a few remaining issues with worldstorage | Tycho Bickerstaff | 2014-01-02 | 2 | -24/+6 |
| | | | |||||
* | | | rewrote queue not to use promises for waits | Tycho Bickerstaff | 2014-01-02 | 6 | -121/+24 |
| | | | |||||
* | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2013-12-31 | 10 | -3/+117 |
|\| | | | | | | | | | | | | | | Conflicts: src/OSSupport/Queue.h | ||||
| * | | merged changes from upstream | Tycho Bickerstaff | 2013-12-31 | 9 | -3/+112 |
| |\ \ | |||||
| | * \ | Merge branch 'FishingHook' | madmaxoft | 2014-01-01 | 8 | -1/+110 |
| | |\ \ | |||||
| | | * | | OnPlayerFishing doesn't have a const cItems anymore | STRWarrior | 2014-01-01 | 5 | -5/+5 |
| | | | | | |||||
| | | * | | implemented the recommendations Xoft gave. | STRWarrior | 2013-12-31 | 7 | -12/+25 |
| | | | | | |||||
| | | * | | Implented OnPlayerFishing and OnPlayerFished. | STRWarrior | 2013-12-30 | 6 | -1/+97 |
| | | | | | |||||
| | * | | | Fixed GetPhysicalRAMUsage on Linux | andrew | 2014-01-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into cmake-fixes | Tycho Bickerstaff | 2013-12-31 | 14 | -16/+56 |
| |\| | | | |||||
| * | | | | fixed bad merge | Tycho Bickerstaff | 2013-12-22 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | merged in more warning fixes | Tycho Bickerstaff | 2013-12-22 | 2 | -3/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | merged in changes | Tycho Bickerstaff | 2013-12-22 | 3 | -2/+12 |
| |\ \ \ \ | |||||
| * | | | | | merged in warnings changes | Tycho Bickerstaff | 2013-12-22 | 26 | -93/+94 |
| | | | | | | |||||
| * | | | | | fixed accedental commit | Tycho Bickerstaff | 2013-12-22 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not | Tycho Bickerstaff | 2013-12-22 | 2 | -1/+33 |
| | | | | | | |||||
* | | | | | | fogot to add promise classes | Tycho Bickerstaff | 2013-12-31 | 2 | -0/+92 |
| | | | | | | |||||
* | | | | | | clean up code for patching | Tycho Bickerstaff | 2013-12-31 | 3 | -3/+5 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2013-12-31 | 20 | -91/+69 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | removed unneccisary cast | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | fixed warnings in LineBlockTracer.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | fixed warnings in LightingThread.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | take Z axis into account when calculating neighboors in LightingThread::ChunkReady | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fixed warnings in World.cpp | Tycho Bickerstaff | 2013-12-31 | 4 | -6/+34 |
| | | | | | | |||||
| * | | | | | fixxed warnings in Server.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | fixed warnings in Inventory.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | fixed warnings in bytebuffer.cpp | Tycho Bickerstaff | 2013-12-31 | 2 | -4/+4 |
| | | | | | | |||||
| * | | | | | fixed ClientHandle warnings | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | fixed warnings in webadmin.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | fixed warnings in BlockArea.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure. | Morgan Redshaw | 2013-12-31 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
| * | | | | Fixed compilation in VC2008. | madmaxoft | 2013-12-30 | 6 | -75/+13 |
| | |/ / | |/| | | | | | | | | | | Also removed an unused inline header file (yuck). | ||||
* | | | | refactored chunk Queue to seperate class | Tycho Bickerstaff | 2013-12-31 | 7 | -124/+162 |
| | | | | |||||
* | | | | added link dependency between WorldStorage and OSSupport | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2013-12-22 | 24 | -29/+92 |
|\| | | | |||||
| * | | | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 16 | -39/+100 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 60 | -233/+1990 |
| |\| | | |||||
| * | | | Chunk is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 4 | -6/+5 |
| | | | | |||||
| * | | | fixed hidden bug with furnaces ignoring time burnt | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes this did not cause a problem as this function was only called with the same value as the one it was using for time burnt | ||||
| * | | | Root is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 8 | -30/+32 |
| | | | | |||||
| * | | | Piston is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 5 | -6/+6 |
| | | | | |||||
| * | | | ChunkSender is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 6 | -9/+10 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'upstream/master' into threadsafequeue | Tycho Bickerstaff | 2013-12-22 | 60 | -233/+1990 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Added HOOK_PLUGINS_LOADED. | madmaxoft | 2013-12-29 | 6 | -3/+64 |
| | | | | | | | | | | | | | | | | This fixes #482. | ||||
| * | | | Merge pull request #481 from MikeHunsinger/master | Mattes D | 2013-12-29 | 2 | -3/+49 |
| |\ \ \ | | | | | | | | | | | Added function to create large birch tree images in birch forests | ||||
| | * | | | Added function to create Tall Birch tree in BirchTreeForest biomes | Mike Hunsinger | 2013-12-29 | 2 | -3/+49 |
| | | |/ | | |/| | |||||
| * / | | Fixed a (valid) warning in RCONServer. | madmaxoft | 2013-12-28 | 1 | -0/+3 |
| |/ / | |||||
| * | | Merge branch 'master' into cmake-win | madmaxoft | 2013-12-27 | 2 | -4/+56 |
| |\ \ | |||||
| | * | | Server now handles death messages | Tiger Wang | 2013-12-26 | 1 | -0/+16 |
| | | | | |||||
| | * | | Merge pull request #472 from mc-server/Extreme_Hills_M | Mattes D | 2013-12-26 | 1 | -4/+40 |
| | |\ \ | | | | | | | | | | | Extreme hills | ||||
| | | * | | Simplefied Extreme Hills M pattern select. | STRWarrior | 2013-12-26 | 1 | -11/+3 |
| | | | | | |||||
| | | * | | Extreme Hills M biomes now generate gravel, stone and grass patterns. | STRWarrior | 2013-12-25 | 1 | -2/+10 |
| | | | | | |||||
| | | * | | Changed tbGravel. Vanilla has 3 layers of gravel and then stone. | STRWarrior | 2013-12-25 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Normal extreme hills (plus) now generate a stone/grass pattern. | STRWarrior | 2013-12-25 | 1 | -2/+20 |
| | | | | | |||||
| | | * | | Re-added empty line. | STRWarrior | 2013-12-25 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | This generates gravel in Extreme Hills M biomes. | STRWarrior | 2013-12-25 | 2 | -3/+20 |
| | | | | | |||||
| * | | | | Made cmake compilation possible on Windows. | madmaxoft | 2013-12-27 | 4 | -21/+27 |
| | | | | | |||||
| * | | | | Added proper precompiled headers for MSVC. | madmaxoft | 2013-12-26 | 1 | -48/+47 |
| |/ / / | |||||
| * | | | cBlockArea: Fixed writing full-height areas. | madmaxoft | 2013-12-26 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #461 from mc-server/repeaters | Mattes D | 2013-12-26 | 7 | -47/+314 |
| |\ \ \ | | |/ / | |/| | | Repeaters, pressure plates, and others | ||||
| | * | | Moved increment operator to back of variables | Tiger Wang | 2013-12-26 | 1 | -9/+9 |
| | | | | |||||
| | * | | Fixed rails not updating with diagonals | Tiger Wang | 2013-12-25 | 1 | -0/+34 |
| | | | | |||||
| | * | | Braced up some code | Tiger Wang | 2013-12-25 | 1 | -0/+2 |
| | | | | |||||
| | * | | Used IsGamemodeCreative() function | Tiger Wang | 2013-12-25 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed comments in main.cpp and Player.cpp | Tiger Wang | 2013-12-24 | 2 | -2/+2 |
| | | | | |||||
| | * | | Implemented stone and wooden pressure plates | Tiger Wang | 2013-12-24 | 2 | -3/+105 |
| | | | | |||||
| | * | | Improved knockback animation | Tiger Wang | 2013-12-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Critical hits now actually increase damage * Looking down at an entity and hitting them still produces upwards motion (as per Vanilla experience) * Reduced force to be more realistic | ||||
| | * | | Improved player fall particle positions | Tiger Wang | 2013-12-23 | 1 | -5/+2 |
| | | | | |||||
| | * | | Provides an enhancement to daylight sensors | Tiger Wang | 2013-12-23 | 1 | -2/+27 |
| | | | | |||||
| | * | | Clarified some code in Player.cpp | Tiger Wang | 2013-12-23 | 1 | -2/+5 |
| | | | | |||||
| | * | | Fixed a comment in Entity.cpp | Tiger Wang | 2013-12-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Added some comments in main.cpp | Tiger Wang | 2013-12-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Daylight sensor sensing enhancement | Tiger Wang | 2013-12-23 | 1 | -9/+11 |
| | | | | |||||
| | * | | A fix for daylight sensors | Tiger Wang | 2013-12-22 | 1 | -2/+3 |
| | | | | |||||
| | * | | Implemented knockback and critical hit | Tiger Wang | 2013-12-22 | 1 | -4/+21 |
| | | | | |||||
| | * | | Added many event catchers | Tiger Wang | 2013-12-22 | 2 | -20/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Window close * CTRL-C * etc. | ||||
| | * | | Implemented fall particles | Tiger Wang | 2013-12-22 | 1 | -3/+18 |
| | | | | |||||
| | * | | Daylight sensors | Tiger Wang | 2013-12-22 | 1 | -2/+1 |
| | | | | |||||
| | * | | Fixed them again, confound it | Tiger Wang | 2013-12-22 | 1 | -9/+21 |
| | | | | |||||
| * | | | Merge pull request #471 from mc-server/Fishing_Catapult | Mattes D | 2013-12-25 | 3 | -38/+206 |
| |\ \ \ | | | | | | | | | | | You are now able to sweep mobs to your position using fishing rods. | ||||
| | * | | | Fixed Parentheses. | STRWarrior | 2013-12-25 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | You are now able to sweep mobs to your position using fishing rods. | STRWarrior | 2013-12-25 | 3 | -38/+206 |
| | | | | | |||||
| * | | | | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer | madmaxoft | 2013-12-25 | 2 | -9/+64 |
| |\ \ \ \ | |||||
| | * | | | | (Hopefully) fixed if conditions | tonibm19 | 2013-12-25 | 1 | -4/+1 |
| | | | | | | |||||
| | * | | | | Implemented xoft suggestion (partly) | tonibm19 | 2013-12-25 | 1 | -25/+29 |
| | | | | | | | | | | | | | | | | | | I only get it working in first condition. It seems it's not compatible with else if... | ||||
| | * | | | | BLOCKTYPE... | tonibm19 | 2013-12-24 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fixed compilation | tonibm19 | 2013-12-24 | 1 | -29/+9 |
| | | | | | | |||||
| | * | | | | Implemented xoft suggestion | tonibm19 | 2013-12-24 | 1 | -7/+11 |
| | | | | | | |||||
| | * | | | | Using BLOCKTYPE instead of int | tonibm19 | 2013-12-24 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fixed comments | tonibm19 | 2013-12-24 | 1 | -8/+8 |
| | | | | | | |||||
| | * | | | | Changed a little how detection works and added comments. | tonibm19 | 2013-12-24 | 1 | -28/+31 |
| | | | | | | |||||
| | * | | | | Storing Y -1 and -2 blocks in a variable | tonibm19 | 2013-12-24 | 1 | -5/+7 |
| | | | | | | |||||
| | * | | | | Using parenthesis | tonibm19 | 2013-12-24 | 1 | -8/+8 |
| | | | | | | |||||
| | * | | | | Fixed a possible crash | tonibm19 | 2013-12-24 | 1 | -39/+42 |
| | | | | | | |||||
| | * | | | | Improved iron golem detection algorithm | tonibm19 | 2013-12-23 | 1 | -3/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | - You need to make it like in vanilla - Only used blocks are removed | ||||
| | * | | | | Some fixes (SEE DESC) | tonibm19 | 2013-12-23 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | -Added missing mobs (wither, enderdragon and iron golem) to type to string list. -Wither and iron golem can now spawn | ||||
| | * | | | | You can now spawn iron golems. | tonibm19 | 2013-12-23 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | | | | You can spawn them like in vanilla. | ||||
| * | | | | | Fixed block area height check. | madmaxoft | 2013-12-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | The block area couldn't be read up to chunk height. | ||||
| * | | | | | Preliminary mobile entity saving | Tiger Wang | 2013-12-25 | 4 | -13/+790 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs | ||||
| * | | | | Merge pull request #469 from mc-server/Android_Update | Tiger Wang | 2013-12-24 | 2 | -3/+9 |
| |\ \ \ \ | | | | | | | | | | | | | Android update | ||||
| | * | | | | Fixed getting configure button going to port 0. | STRWarrior | 2013-12-24 | 2 | -3/+9 |
| | |/ / / | |||||
| * | | | | removed the function def also | Alexander Harkness | 2013-12-24 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Finally removed the function. | Alexander Harkness | 2013-12-24 | 1 | -6/+0 |
| | | | | | |||||
| * | | | | fixed compile? | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | finally removed them all? | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | updated another file... | Alexander Harkness | 2013-12-24 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Updated MakeColour's defenition in the header. | Alexander Harkness | 2013-12-24 | 1 | -9/+9 |
| | | | | | |||||
| * | | | | Update as per xoft's instructions. | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update chat colours | Alexander Harkness | 2013-12-24 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | @madmaxoft, is this right? fixes #467 | ||||
| * | | | | Replaced esCreeper with esMonster. | madmaxoft | 2013-12-23 | 3 | -4/+7 |
| |/ / / | | | | | | | | | | | | | Any monster will be able to explode, and also this fixes #425. | ||||
| * | | | Fixed bug where snowgolems could replace non-solid blocks to snow blocks. | STRWarrior | 2013-12-22 | 1 | -1/+3 |
| | | | | |||||
| * | | | Snow golems die in hot biomes and leave a snow trail. | STRWarrior | 2013-12-22 | 2 | -0/+18 |
| | | | | |||||
| * | | | You can spawn snow golems with snow blocks and pumpkins. | STRWarrior | 2013-12-22 | 1 | -0/+15 |
| | | | | |||||
| * | | | EnderDragons and SnowGolems are able to spawn. | STRWarrior | 2013-12-22 | 1 | -0/+2 |
| | | | | |||||
| * | | | Fixed cacus breaking when next to any non-air block. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Made the lure enchantment work. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed signedness warning in cItemGrid. | madmaxoft | 2013-12-22 | 2 | -4/+4 |
| | | | | |||||
| * | | | Fixed compiler warning. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fishing underground is slower and fishing while raining is faster. | STRWarrior | 2013-12-22 | 1 | -0/+15 |
| | | | | |||||
| * | | | Fixed compiler warnings. | STRWarrior | 2013-12-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Countdown time is between 100 and 900 ticks. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fishing now uses a countdown instead of a random number each tick. | STRWarrior | 2013-12-22 | 2 | -12/+29 |
| | | | | |||||
| * | | | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 17 | -2/+122 |
| | | | | |||||
| * | | | Using regular assignments. | STRWarrior | 2013-12-21 | 1 | -6/+6 |
| | | | | |||||
| * | | | Once again better Y direction for the items given when fishing. | STRWarrior | 2013-12-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | You are now able to get different items from fishing. | STRWarrior | 2013-12-21 | 1 | -2/+108 |
| | | | | |||||
| * | | | Bindings regen script updated. | madmaxoft | 2013-12-21 | 1 | -11/+6 |
| | | | | | | | | | | | | | | | | The Bindings.cpp / .h files are no longer stored in the git repo. | ||||
| * | | | Floater now dissapears when the player doesn't have an fishing rod equipped. | STRWarrior | 2013-12-21 | 2 | -0/+32 |
| | |/ | |/| | |||||
* / | | basic threadsafe queue interface | Tycho Bickerstaff | 2013-12-21 | 2 | -0/+34 |
|/ / | |||||
* | | Merge branch 'cmake' of github.com:worktycho/MCServer into cmake | Tycho Bickerstaff | 2013-12-21 | 2 | -5/+25 |
|\ \ | |||||
| * | | added precompiled headers | tycho | 2013-12-20 | 1 | -13/+24 |
| | | | |||||
| * | | fixed include of math on windows | tycho | 2013-12-20 | 2 | -1/+10 |
| | | | |||||
* | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 26 | -174/+221 |
|\ \ \ | |/ / |/| | | |||||
| * | | You could now only get fish from non-source blocks. Fixed it. | STRWarrior | 2013-12-21 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around. | STRWarrior | 2013-12-21 | 1 | -0/+5 |
| | | | |||||
| * | | Fixed bug where you could get fish from non-source blocks. | STRWarrior | 2013-12-21 | 1 | -1/+1 |
| |/ | |||||
| * | Fixed repeaters delay, maybe | Tiger Wang | 2013-12-20 | 3 | -12/+41 |
| | | | | | | | | | | Also added basic daylight sensors, though because GetBlockSkylight always is 15, it doesn't work. | ||||
| * | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2013-12-20 | 9 | -97/+92 |
| |\ | |||||
| | * | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 9 | -97/+92 |
| | | | |||||
| * | | Increased the range an Floater can shoot to. | STRWarrior | 2013-12-20 | 1 | -1/+1 |
| |/ | |||||
| * | Fish now actualy jumps to the player instead of a few block bellow them. | STRWarrior | 2013-12-20 | 1 | -1/+1 |
| | | |||||
| * | Fixed bug where the floater could pop in the water while you could already get a fish. | STRWarrior | 2013-12-20 | 1 | -2/+2 |
| | | |||||
| * | More reordering fixes. | madmaxoft | 2013-12-20 | 3 | -7/+16 |
| | | |||||
| * | Fixed a typo in cBlockArea merging code. | madmaxoft | 2013-12-20 | 1 | -2/+1 |
| | | |||||
| * | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 10 | -49/+57 |
| | | |||||
| * | Fixed minor warnings. | madmaxoft | 2013-12-20 | 2 | -5/+7 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 39 | -97/+114 |
|\| | |||||
| * | Fixed warnings in HTTP parser. | madmaxoft | 2013-12-20 | 4 | -5/+15 |
| | | |||||
| * | Attempt at fixing cChunkDef::Height signedness. | madmaxoft | 2013-12-20 | 4 | -21/+24 |
| | | |||||
| * | Properly fixed warnings in cFastRandom. | madmaxoft | 2013-12-20 | 1 | -4/+4 |
| | | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 28 | -62/+66 |
| | | |||||
| * | Fixed melon and pumpkin growing. | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | | |||||
| * | Fixed missing parenthesis. | madmaxoft | 2013-12-20 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'cmake' of github.com:worktycho/MCServer into cmake | Tycho Bickerstaff | 2013-12-19 | 1 | -6/+16 |
|\ \ | |||||
| * | | fixed include paths on windows and added build dir to gitignore | tycho | 2013-12-20 | 1 | -0/+2 |
| | | | |||||
| * | | fixed compile errors with headers and math library | tycho | 2013-12-20 | 1 | -6/+15 |
| | | | |||||
| * | | Merge branch 'master' into cmake | tycho | 2013-12-20 | 12 | -26/+276 |
| |\ \ | |||||
| * | | | fixed multiprocessing on windows and removed redundend compile of headers | tycho | 2013-12-20 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 2 | -21/+21 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fixed clang warnings in Noise.cpp. | madmaxoft | 2013-12-20 | 1 | -20/+20 |
| | | | | | | | | | | | | | | | | Fix-a-random-warning-per-day :) | ||||
| * | | | Fixed assertion during dirt block OnUpdate() | Tiger Wang | 2013-12-20 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 12 | -26/+276 |
|\| | | |/ |/| | |||||
| * | Merge pull request #450 from mc-server/redstonefixes | Mattes D | 2013-12-19 | 6 | -26/+94 |
| |\ | | | | | | | Multiple fixes | ||||
| | * | Fixed PlayerAbilities and creative | Tiger Wang | 2013-12-19 | 3 | -13/+24 |
| | | | |||||
| | * | Fixed 1.7 arm swing animation | Tiger Wang | 2013-12-19 | 1 | -1/+23 |
| | | | |||||
| | * | Fixed dust from being placed on nonsolids | Tiger Wang | 2013-12-19 | 2 | -1/+6 |
| | | | |||||
| | * | Fixed repeaters not updating power | Tiger Wang | 2013-12-19 | 1 | -11/+41 |
| | | | |||||
| * | | Fixed #include in Floater.cpp. | STRWarrior | 2013-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | The floater now actualy dives under water. | STRWarrior | 2013-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | You can get fish from fishing :D. Only one type of fish though. | STRWarrior | 2013-12-19 | 1 | -12/+27 |
| | | | |||||
| * | | Implented cItemFishingRodHandler. | STRWarrior | 2013-12-19 | 2 | -0/+65 |
| | | | |||||
| * | | Implented IsFishing, SetIsFishing and GetFloaterID(). | STRWarrior | 2013-12-19 | 2 | -0/+12 |
| | | | |||||
| * | | Added cFloater class. | STRWarrior | 2013-12-19 | 3 | -0/+90 |
| | | | |||||
* | | | fixed a number of windows issues | tycho | 2013-12-19 | 1 | -13/+28 |
| | | | |||||
* | | | added md5 as a dependency for bindings | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+2 |
| | | | |||||
* | | | added expat as lua bindings dependincy | Tycho Bickerstaff | 2013-12-19 | 2 | -2/+2 |
| | | | |||||
* | | | added all cpp files to bindings | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+4 |
| | | | |||||
* | | | moved HTTPServer to globs | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+5 |
| | | | |||||
* | | | added pthread linking code to OSSupport | Tycho Bickerstaff | 2013-12-19 | 1 | -0/+4 |
| | | | |||||
* | | | moved protocol to glob | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+5 |
| | | | |||||
* | | | added blocks and blockentities | Tycho Bickerstaff | 2013-12-19 | 3 | -2/+18 |
| | | | |||||
* | | | linked in lua | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 3 | -14/+41 |
|\| | | |||||
| * | | Disconnection message no longer shown if ping | Tiger Wang | 2013-12-18 | 1 | -5/+8 |
| | | | |||||
| * | | Prettified command error messages | Tiger Wang | 2013-12-18 | 2 | -9/+23 |
| | | | | | | | | | | | | Using the magic of overlords (overloads) and standards compliance. | ||||
| * | | The "<>" of a player name is now coloured | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed 1.7 player disconnection not calling hook | Tiger Wang | 2013-12-18 | 1 | -4/+14 |
| |/ | | | | | | | This fixes #357 | ||||
* | | fixed bindings generation | Tycho Bickerstaff | 2013-12-19 | 1 | -8/+2 |
| | | |||||
* | | bindings regenration logic | Tycho Bickerstaff | 2013-12-19 | 3 | -32240/+8 |
| | | |||||
* | | added zlib and UI | Tycho Bickerstaff | 2013-12-18 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-18 | 50 | -306/+1327 |
|\| | |||||
| * | Merge pull request #440 from mc-server/repeaterfixes | Mattes D | 2013-12-18 | 2 | -84/+77 |
| |\ | | | | | | | Fixed redstone wire and certain repeater scenarios | ||||
| | * | Fixed wire powering blocks beneath | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed bad repeater power queuing in corner case | Tiger Wang | 2013-12-18 | 2 | -83/+76 |
| | | | | | | | | | | | | | | | Repeaters remain queued to power even if their original source has since unpowered. Also functionised and cleaned up code. | ||||
| * | | Merge pull request #442 from mc-server/Nether_Wart | Mattes D | 2013-12-18 | 4 | -0/+110 |
| |\ \ | | | | | | | | | Implented Nether Wart. | ||||
| | * | | Implented Nether Wart. | STRWarrior | 2013-12-18 | 4 | -0/+110 |
| | | | | |||||
| * | | | Renamed back EntityAnimation to PlayerAnimation | Tiger Wang | 2013-12-18 | 8 | -15/+51 |
| |/ / | | | | | | | | | | | | | This fixes #411 and partially reverts 30ead790490f04248b861db79fddde9148b552f4 | ||||
| * / | Removed offending tr1/memory header inclusion. | madmaxoft | 2013-12-18 | 1 | -3/+0 |
| |/ | | | | | | | We already use <memory> at line 160, this was a double include, additionally causing problems (#424). | ||||
| * | Fixed player falling through the floor on spawn. | madmaxoft | 2013-12-17 | 1 | -1/+5 |
| | | | | | | | | The 1.7 client seems to have math issues with exact coords. Adding 0.001 to the Y coord fixed the problem. | ||||
| * | cBlockArea: origin is initialized in the constructor and the loader. | madmaxoft | 2013-12-17 | 1 | -0/+6 |
| | | |||||
| * | Fixed naming and initialization. | madmaxoft | 2013-12-17 | 1 | -4/+12 |
| | | |||||
| * | Forgot to change one Vector3d to Vector3i. | STRWarrior | 2013-12-17 | 1 | -1/+1 |
| | | |||||
| * | Renamed Pos to m_Pos. | STRWarrior | 2013-12-17 | 1 | -3/+3 |
| | | |||||
| * | Using Recommendations. | STRWarrior | 2013-12-17 | 1 | -10/+23 |
| | | |||||
| * | Made buckets work when the player does not 'look' at a block. This fixes #265 | STRWarrior | 2013-12-17 | 1 | -32/+53 |
| | | |||||
| * | Merge pull request #438 from mc-server/Boats | Tiger Wang | 2013-12-16 | 5 | -14/+80 |
| |\ | | | | | | | Implemented boating functionality. | ||||
| | * | Boats spawn on top of a block. not between 4 blocks. | STRWarrior | 2013-12-16 | 1 | -1/+1 |
| | | | |||||
| | * | Using suggestions for Boat placing. | STRWarrior | 2013-12-16 | 1 | -1/+1 |
| | | | |||||
| | * | Boats drop a boat pickup when destroyed by hand. You can now actualy use boats. | STRWarrior | 2013-12-16 | 2 | -3/+33 |
| | | | |||||
| | * | Added HandleSpeedFromAttachee so an entity can override the function. | STRWarrior | 2013-12-16 | 2 | -4/+15 |
| | | | |||||
| | * | You can spawn boats on water. | STRWarrior | 2013-12-16 | 1 | -7/+32 |
| | | | |||||
| * | | Fixed multiple inheritance in ToLua++. | madmaxoft | 2013-12-16 | 8 | -36/+127 |
| | | | | | | | | | | | | This fixes #422. | ||||
| * | | Removed some old cRedstone remnants | Tiger Wang | 2013-12-16 | 3 | -30/+0 |
| |/ | |||||
| * | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 5 | -31/+48 |
| | | | | | | | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187. | ||||
| * | Fixed multiple player spawn broadcasts. | madmaxoft | 2013-12-16 | 1 | -3/+0 |
| | | |||||
| * | Server saves if a player is flying. | STRWarrior | 2013-12-15 | 1 | -1/+3 |
| | | |||||
| * | Merge pull request #437 from mc-server/ShootTo_function | STRWarrior | 2013-12-15 | 5 | -4/+49 |
| |\ | | | | | | | Shoot to function | ||||
| | * | Exported to Lua | STRWarrior | 2013-12-15 | 2 | -10/+10 |
| | | | |||||
| | * | Renamed ShootTo function to ForceSetSpeed. | STRWarrior | 2013-12-15 | 2 | -3/+3 |
| | | | |||||
| | * | This adds a function that allows you to 'shoot' a player towards a direction. | STRWarrior | 2013-12-15 | 5 | -4/+49 |
| | | | |||||
| * | | Fixed player spawning packet. | madmaxoft | 2013-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | The player was spawned 1.62 blocks below their pos. This fixes #323. | ||||
| * | | Fixed calling OnPlayerJoined() in the wrong place. | madmaxoft | 2013-12-15 | 1 | -6/+1 |
| | | | | | | | | | | | | This is the first part of a fix for #187. | ||||
| * | | Merge pull request #433 from mc-server/redstoneimprovements | Mattes D | 2013-12-15 | 1 | -1/+33 |
| |\ \ | | | | | | | | | Fixed more wire bugs | ||||
| | * | | Implemented xoft's suggestions | Tiger Wang | 2013-12-15 | 1 | -3/+16 |
| | | | | |||||
| | * | | Fixed wire repeater checking | Tiger Wang | 2013-12-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Wires now power repeaters properly | Tiger Wang | 2013-12-15 | 1 | -0/+7 |
| | | | | |||||
| | * | | Fixed the hopefully final wire self-powering bug | Tiger Wang | 2013-12-15 | 1 | -1/+13 |
| | | | | |||||
| * | | | Fixed indentation. | madmaxoft | 2013-12-15 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Moved reading flags to the protocol. | STRWarrior | 2013-12-15 | 3 | -19/+23 |
| | | | |||||
| * | | Exported Set and Get functions to Lua. | STRWarrior | 2013-12-15 | 2 | -2/+136 |
| | | | |||||
| * | | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 5 | -3/+90 |
| | | | |||||
| * | | Merge pull request #432 from mc-server/Broadcast_Effects | Mattes D | 2013-12-15 | 7 | -3/+92 |
| |\ \ | | | | | | | | | Broadcast effects | ||||
| | * | | cPlayer is using the broadcast functions. | STRWarrior | 2013-12-15 | 1 | -3/+3 |
| | | | | |||||
| | * | | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. | STRWarrior | 2013-12-15 | 6 | -0/+89 |
| | | | | |||||
| * | | | Fixed pre 1.7 clients crashing. | STRWarrior | 2013-12-15 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #431 from mc-server/Entity_Effects | Mattes D | 2013-12-14 | 15 | -4/+170 |
| |\ \ | | | | | | | | | Entity Effects | ||||
| | * | | Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h. | STRWarrior | 2013-12-14 | 5 | -4/+31 |
| | | | | |||||
| | * | | Added E_EFFECT_<Effect> | STRWarrior | 2013-12-14 | 2 | -3/+32 |
| | | | | |||||
| | * | | Forgot to commit the ClientHandle. | STRWarrior | 2013-12-14 | 2 | -0/+20 |
| | | | | |||||
| | * | | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. | STRWarrior | 2013-12-14 | 8 | -1/+91 |
| | | | | |||||
| * | | | Added tolua++ redirection include. | madmaxoft | 2013-12-14 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | This is needed because ToLua++ regenerates the Bindings file with bad #include, and it would be too difficult to fix ToLua++; this is an easier solution. Should fix PR #431. | ||||
| * | | | Removed leftover debugging messages from cProtocol172. | madmaxoft | 2013-12-14 | 1 | -4/+0 |
| | | | | |||||
| * | | | Merge pull request #430 from mc-server/redstoneimprovements | Mattes D | 2013-12-14 | 9 | -33/+162 |
| |\ \ \ | | |/ / | |/| / | | |/ | Implemented note block playing and fixed wire | ||||
| | * | Potentially fixed debug asserts | Tiger Wang | 2013-12-14 | 1 | -5/+5 |
| | | | |||||
| | * | Wires no longer power if a block cuts them off | Tiger Wang | 2013-12-14 | 1 | -23/+32 |
| | | | | | | | | | | | | Also reduced more unneeded code. | ||||
| | * | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 9 | -5/+125 |
| | | | | | | | | | | | | Game of Thrones music in Minecraft, here I come! | ||||
* | | | added zlib | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+1 |
| | | | |||||
* | | | moved generating to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | |||||
* | | | added UI folder | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+3 |
| | | | |||||
* | | | moved Worldstorage to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | |||||
* | | | Merge branch 'master' of github.com:mc-server/MCServer into cmake | Tycho Bickerstaff | 2013-12-11 | 2 | -8/+7 |
|\| | | |||||
| * | | Merge branch 'master' into quickfixs | Tycho Bickerstaff | 2013-12-11 | 27 | -514/+603 |
| |\ \ | |||||
| * | | | fixed unused expression warnings in blockFire | Tycho Bickerstaff | 2013-12-10 | 1 | -7/+6 |
| | | | | |||||
| * | | | fixed comparison of thread handle to Null point rather than null handle | Tycho Bickerstaff | 2013-12-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | moved entities to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | | |||||
* | | | | moved mobs to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | | |||||
* | | | | moved simulor to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | | |||||
* | | | | removed leakfinder form build | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-11 | 27 | -514/+603 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Exported the cTNTEntity | STRWarrior | 2013-12-14 | 4 | -9/+85 |
| | | | | |||||
| * | | | Merge pull request #423 from mc-server/redstoneimprovements | Mattes D | 2013-12-14 | 4 | -290/+158 |
| |\ \ \ | | | |/ | | |/| | Redstone and configuration improvements | ||||
| | * | | Fixed compilating! | Tiger Wang | 2013-12-14 | 1 | -5/+5 |
| | | | | |||||
| | * | | Improved player permissions logging | Tiger Wang | 2013-12-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixes to redstone wire and torches | Tiger Wang | 2013-12-14 | 3 | -21/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | + Wires now power blocks around the block beneath * Torches no longer power off if it is on a linked powered block * Enhanced code, split functions, etc. | ||||
| | * | | Groups.ini and Users.ini are now generated | Tiger Wang | 2013-12-14 | 2 | -3/+25 |
| | | | | |||||
| | * | | Removed loads of unneeded code again | Tiger Wang | 2013-12-14 | 1 | -86/+60 |
| | | | | |||||
| | * | | Reduced loads of unneeded code | Tiger Wang | 2013-12-14 | 1 | -188/+44 |
| | | | | | | | | | | | | | | | | Merged wire powering detection code into a single function. | ||||
| * | | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2013-12-14 | 6 | -194/+236 |
| |\| | | |||||
| | * | | Merge pull request #419 from mc-server/redstoneloading | Mattes D | 2013-12-13 | 2 | -3/+17 |
| | |\ \ | | | | | | | | | | | Redstone data is now loaded on chunk load | ||||
| | | * | | Improved redstone loading performance | Tiger Wang | 2013-12-13 | 1 | -2/+10 |
| | | | | | |||||
| | | * | | Fixed QueueSetBlock not sending to client changes | Tiger Wang | 2013-12-13 | 1 | -2/+1 |
| | | | | | |||||
| | | * | | Redstone data is now loaded on chunk load | Tiger Wang | 2013-12-13 | 2 | -0/+7 |
| | | | | | |||||
| | * | | | Fixed threading issues affecting cProtocol172. | madmaxoft | 2013-12-13 | 4 | -191/+219 |
| | | | | | |||||
| * | | | | Fixed not getting XP from mobs. | STRWarrior | 2013-12-14 | 2 | -1/+7 |
| |/ / / | |||||
| * / / | Using "a_ClosestPlayer != NULL" in cExpOrb. | STRWarrior | 2013-12-13 | 1 | -1/+1 |
| |/ / | |||||
| * | | Unknown packet type extended to 32 bits. | madmaxoft | 2013-12-12 | 2 | -4/+4 |
| | | | |||||
| * | | Fixed protocol 1.7 recovery after unknown packet. | madmaxoft | 2013-12-12 | 1 | -4/+0 |
| | | | |||||
| * | | Fixed pistons being viable middle block | Tiger Wang | 2013-12-11 | 1 | -0/+3 |
| | | | | | | | | | | | | Also an excuse to update submodules | ||||
| * | | Merge pull request #417 from mc-server/WorldUpdate | Mattes D | 2013-12-11 | 9 | -2/+99 |
| |\ \ | | | | | | | | | World update | ||||
| | * | | HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used. | STRWarrior | 2013-12-11 | 1 | -0/+1 |
| | | | | |||||
| | * | | Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins. | STRWarrior | 2013-12-11 | 9 | -2/+98 |
| | | | | |||||
| * | | | ExpOrbs now move. | STRWarrior | 2013-12-11 | 1 | -4/+8 |
| | | | | |||||
| * | | | Provides a possible fix for repeater timings | Tiger Wang | 2013-12-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | Not completely reliable, but at least some types of clock work. | ||||
| * | | | added abort to DeadlockDetector to generate core dumps on failure | Tycho Bickerstaff | 2013-12-10 | 1 | -5/+2 |
| | |/ | |/| | |||||
* | | | added tolua++ command and removed stackwalker from build | Tycho Bickerstaff | 2013-12-10 | 3 | -6/+8 |
| | | | |||||
* | | | more cmake changes | Tycho Bickerstaff | 2013-12-10 | 3 | -6/+15 |
| | | | |||||
* | | | removed more accedentailly commited object files | Tycho Bickerstaff | 2013-12-10 | 9 | -3985/+0 |
| | | | |||||
* | | | removed accedentailly commited object files | Tycho Bickerstaff | 2013-12-10 | 27 | -0/+0 |
| | | | |||||
* | | | more cmake | Tycho Bickerstaff | 2013-12-10 | 46 | -6/+4051 |
| | | | |||||
* | | | more cmake stuff | Tycho Bickerstaff | 2013-12-10 | 3 | -2/+18 |
| | | | |||||
* | | | started work on cmake | Tycho Bickerstaff | 2013-12-10 | 4 | -0/+36 |
|/ / | |||||
* | | Merge remote-tracking branch 'upstream/master' | Tycho Bickerstaff | 2013-12-10 | 5 | -13/+96 |
|\| | |||||
| * | Merge pull request #412 from mc-server/fixes | Mattes D | 2013-12-10 | 5 | -13/+96 |
| |\ | | | | | | | Main feature: repeater delays! | ||||
| | * | Readded initial line | Tiger Wang | 2013-12-10 | 1 | -0/+1 |
| | | | |||||
| | * | Fixed compile (alas, no more goto) | Tiger Wang | 2013-12-10 | 1 | -11/+14 |
| | | | |||||
| | * | Fixed Floody lava to stone fizzle | Tiger Wang | 2013-12-10 | 1 | -2/+16 |
| | | | |||||
| | * | Added repeater delays | Tiger Wang | 2013-12-10 | 2 | -1/+62 |
| | | | | | | | | | | | | They DO sometimes get stuck though :P | ||||
| | * | Slight redstone wire performance improvement | Tiger Wang | 2013-12-10 | 1 | -1/+6 |
| | | | |||||
| | * | Changed more FastSetBlocks to SetBlocks | Tiger Wang | 2013-12-10 | 1 | -3/+3 |
| | | | | | | | | | | | | Fixes duplication bugs. | ||||
| | * | Improved pickups spawning speed again | Tiger Wang | 2013-12-10 | 2 | -7/+6 |
| | | | |||||
* | | | moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741 | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+4 |
| | | | |||||
* | | | reordered initalisation order at src/Generating/Cave.h line 73 | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+2 |
|/ / | |||||
* | | fixed warnings in src/Generating/BioGen.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | removed unused variable at src/Generating/BioGen.cpp line 379 and added default fallthrough clause to switch at src/Generating/BioGen.cpp line 725 | ||||
* | | added default fallthrough clause to switch at line 178 of src/UI/Window.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -0/+4 |
| | | |||||
* | | Reordered Listed Initalisation order in src/UI/Window.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | Reordered the Listed Initalisation order for CWindow to the executed initalisation order. The compiler initalises values in the order the fields are declared not the initalisations listed | ||||
* | | Removed unused variable ResultSlot | Tycho Bickerstaff | 2013-12-08 | 1 | -1/+0 |
| | | |||||
* | | Fix Undefined behavior at Bindings/LuaWindow line 32 | worktycho | 2013-12-09 | 1 | -1/+4 |
| | | |||||
* | | Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176 | worktycho | 2013-12-09 | 1 | -4/+3 |
| | | |||||
* | | Fixed warning unchecked enum value at Chunk.cpp line 841 | worktycho | 2013-12-09 | 1 | -2/+4 |
| | | |||||
* | | Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54 | worktycho | 2013-12-09 | 1 | -1/+4 |
|/ | |||||
* | Fixed angle normalization typo. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | |||||
* | Fixed tolua++ compilation. | madmaxoft | 2013-12-08 | 7 | -192/+5 |
| | | | | Duplicate files, wrong includes, const-incorrect code... | ||||
* | Fixed VS2008 compilation after those huge changes. | madmaxoft | 2013-12-08 | 2 | -5/+7 |
| | |||||
* | 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 |
| | | |||||
* | | Readded redstone lamp handler | Tiger Wang | 2013-12-08 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 43 | -1251/+1348 |
|\| | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Fixed normalizing large angles. | madmaxoft | 2013-12-08 | 4 | -8/+51 |
| | | |||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 41 | -1238/+1237 |
| | | | | | | | | Ref.: #407 | ||||
| * | Fixed stationary water starting fires and flowing lava not. | madmaxoft | 2013-12-08 | 1 | -2/+2 |
| | | |||||
| * | Added a SpawnFallingBlock function so plugins can make other blocks fall. | STRWarrior | 2013-12-07 | 4 | -2/+93 |
| | | |||||
* | | Fixed tabcompletion packet, fixes #356 | Tiger Wang | 2013-12-08 | 1 | -8/+4 |
| | | |||||
* | | Fixed falling block metas, fixes #406 | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
| | | |||||
* | | Bonemeal has particles, fixes #393 | Tiger Wang | 2013-12-08 | 2 | -3/+8 |
| | | |||||
* | | Console trims its commands before executing 'em | Tiger Wang | 2013-12-07 | 1 | -3/+3 |
| | | |||||
* | | Fixed water starting fires | Tiger Wang | 2013-12-07 | 1 | -1/+0 |
| | | |||||
* | | Improved piston animations | Tiger Wang | 2013-12-07 | 1 | -4/+4 |
| | | |||||
* | | Fixed some new 1.7 client crash bugs | Tiger Wang | 2013-12-07 | 4 | -1/+37 |
| | | | | | | | | | | Some technical blocks were removed; trying to render them as items caused a crash. | ||||
* | | Changed some FastSetBlocks to SetBlock | Tiger Wang | 2013-12-07 | 1 | -3/+3 |
| | | | | | | | | Should fix some duplication glitches. | ||||
* | | Fixed trapdoors not toggling | Tiger Wang | 2013-12-07 | 3 | -17/+103 |
| | | | | | | | | The redstone simulator kept on resetting them. | ||||
* | | Added basic ender chests | Tiger Wang | 2013-12-07 | 10 | -14/+355 |
| | | | | | | | | Note that they just mirror chests now, so no per player inventory. | ||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 23 | -47/+82 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed bed leave animation | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Fixed duplication glitch with QueueSetBlock | Tiger Wang | 2013-12-06 | 7 | -16/+38 |
| | | | | | | | | | | | | | | If a coordinate was queued, and then the block there was broken, it would reappear: double items! Also now just sets meta if previous and current blocktypes matched. | ||||
* | | Added trapdoor cursor Y detection | Tiger Wang | 2013-12-06 | 1 | -2/+0 |
| | | |||||
* | | Puking now uses GetEyeHeight() | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | 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. | ||||
* | | Re-implemented redstone duplicate checking | Tiger Wang | 2013-12-06 | 1 | -0/+29 |
| | | |||||
* | | Fixed eating using wrong animation | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Fixed trapdoors not overriding OnUse | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Spawn eggs use IsGameMode() | Tiger Wang | 2013-12-06 | 1 | -2/+2 |
| | | | | | | | | Possible fix for #316. | ||||
* | | Tools make a sound when breaking, fixes #266 | Tiger Wang | 2013-12-06 | 2 | -2/+5 |
| | | |||||
* | | Cleaned up torch code and added comments | Tiger Wang | 2013-12-06 | 1 | -31/+7 |
| | | |||||
* | | Removed another export and inline'd stuff | Tiger Wang | 2013-12-06 | 1 | -5/+5 |
| | | |||||
* | | Removed exporting of a torch function | Tiger Wang | 2013-12-06 | 1 | -3/+3 |
| | | |||||
* | | Updated comments for slabs | Tiger Wang | 2013-12-06 | 1 | -5/+6 |
| | | |||||
* | | Fixed pickups spawning for BlockEntities | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #394 from SamJBarney/master | Mattes D | 2013-12-06 | 2 | -4/+8 |
|\ | | | | | Fire no longer goes out when on top of nether rack | ||||
| * | Merged if statements. | Samuel Barney | 2013-12-05 | 1 | -7/+1 |
| | | |||||
| * | Finished Merge | Samuel Barney | 2013-12-05 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of https://github.com/mc-server/MCServer | Samuel Barney | 2013-12-05 | 7 | -10/+97 |
| |\ | | | | | | | | | | | | | Conflicts: src/Simulator/FireSimulator.h | ||||
| * | | Made suggested changes | Samuel Barney | 2013-12-04 | 2 | -6/+11 |
| | | | |||||
| * | | Fire no longer goes out when on top of nether rack | Samuel Barney | 2013-12-02 | 1 | -1/+6 |
| | | | |||||
* | | | Added cPluginManager:GetCurrentPlugin() to Lua API. | madmaxoft | 2013-12-05 | 1 | -7/+22 |
| |/ |/| | |||||
* | | ByteBuffer: Fixed optimization failures with threading checks. | madmaxoft | 2013-12-05 | 1 | -1/+1 |
| | | |||||
* | | Hopefully fixed the sparc not being detected | Alexander Harkness | 2013-12-04 | 1 | -1/+3 |
| | | |||||
* | | Lava can spawn fire. | madmaxoft | 2013-12-04 | 5 | -8/+93 |
| | | | | | | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65. | ||||
* | | Fixed an error in cChunk's block ticking. | madmaxoft | 2013-12-04 | 1 | -2/+2 |
|/ | | | | Absolute coords were passed to a handler expecting relative coords. | ||||
* | Removed stray printf, again. | Samuel Barney | 2013-12-02 | 1 | -1/+0 |
| | |||||
* | Switched to using provided ReadItem function. | Samuel Barney | 2013-12-02 | 2 | -17/+12 |
| | | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs. | ||||
* | Removed stray printf. | Samuel Barney | 2013-12-02 | 1 | -1/+0 |
| | |||||
* | Fixed 1.7 slab and stair placement. | Samuel Barney | 2013-12-02 | 1 | -0/+19 |
| | |||||
* | Fixed compiler warnings in LightingThread.cpp. | madmaxoft | 2013-12-01 | 1 | -2/+2 |
| | |||||
* | Fixed linux compile errors and formatting in RedstoneSimulator.cpp | madmaxoft | 2013-12-01 | 1 | -14/+26 |
| | |||||
* | DeadlockDetect is configurable now. | madmaxoft | 2013-11-30 | 3 | -7/+15 |
| | | | | This is needed when debugging Lua plugins. | ||||
* | Fixed compiler warnings in IsBiomeNoDownfall(). | madmaxoft | 2013-11-30 | 1 | -1/+4 |
| | |||||
* | Merge pull request #387 from mc-server/trapdoors | Mattes D | 2013-11-30 | 20 | -330/+431 |
|\ | | | | | Trapdoors, redstone fixes, and snow | ||||
| * | Fixed pistons extending | Tiger Wang | 2013-11-30 | 1 | -0/+10 |
| | | | | | | | | They didn't when a source was in front, but now they do! Yay! | ||||
| * | Removed redstone duplicate power checking | Tiger Wang | 2013-11-30 | 1 | -2/+0 |
| | | | | | | | | There was no need for it, and it introduced some bugs. | ||||
| * | Improved piston direction checking | Tiger Wang | 2013-11-30 | 1 | -62/+8 |
| | | | | | | | | Now uses AddFaceDirection, as suggested by xoft. | ||||
| * | Pistons no longer accept power through front face | Tiger Wang | 2013-11-30 | 2 | -3/+96 |
| | | | | | | | | This fixes #60. | ||||
| * | Fixed thin snow CanBeAt checking | Tiger Wang | 2013-11-30 | 1 | -1/+13 |
| | | | | | | | | | | Now takes into account the possibility that thin snow can be on top of full thin snow. | ||||
| * | Properly fixed snow height, fixes #98 and #264 | Tiger Wang | 2013-11-30 | 3 | -25/+53 |
| | | |||||
| * | Improved redstone speed and fixed a wire bug | Tiger Wang | 2013-11-30 | 1 | -73/+83 |
| | | | | | | | | | | | | | | | | The redstone simulator no longer goes through the Powered and LinkedPowered blocks lists for EVERY item in the chunk data, instead, only at every tick. Also, wires powering each other that had the same data value is now fixed. | ||||
| * | Stairs reset meta when dropped, fixes #269 | Tiger Wang | 2013-11-29 | 1 | -2/+22 |
| | | | | | | | | Additionally, they now have walking sounds. | ||||
| * | Implemented trapdoors, fixes #43 and #105 | Tiger Wang | 2013-11-29 | 5 | -3/+131 |
| | | | | | | | | Also updated redstone simulator to support it | ||||
| * | Removed unneeded CPP files | Tiger Wang | 2013-11-29 | 11 | -221/+77 |
| | | | | | | | | Also removed unneeded #include in BlockStems | ||||
* | | Changed cBlockHandler->OnUpdate() to use cChunk directly. | madmaxoft | 2013-11-30 | 15 | -63/+117 |
| | | |||||
* | | Added IsBiomeNoDownfall() function. | madmaxoft | 2013-11-30 | 3 | -103/+164 |
| | | |||||
* | | 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 | 8 | -17/+34 |
| | | |||||
* | | Grass doesn't spread to podzol or grassless dirt blocks. | madmaxoft | 2013-11-30 | 1 | -2/+3 |
| | | |||||
* | | Added floor pattern for MegaTaiga biomes. | madmaxoft | 2013-11-30 | 1 | -1/+10 |
| | | |||||
* | | Implemented mesa biomes in DistortedHeightmap CompoGen. | madmaxoft | 2013-11-29 | 3 | -21/+106 |
| | | |||||
* | | Fixed CheckerboardBiomeGen in negative coords. | madmaxoft | 2013-11-29 | 1 | -2/+3 |
| | | |||||
* | | DistortedHeightmap: Improved speed, prepared for mesa biomes. | madmaxoft | 2013-11-29 | 2 | -157/+424 |
| | | | | | | | | This generates the rainbow-mesa as seen on the first mesa screenshot in the forum. | ||||
* | | Fixed an off-by-one error in cByteBuffer. | madmaxoft | 2013-11-29 | 1 | -1/+1 |
| | | | | | | | | Could have caused random protocol errors and maybe even crashes. | ||||
* | | Alpha-sorted BlockMetas, added red sand. | madmaxoft | 2013-11-29 | 1 | -125/+128 |
| | | |||||
* | | Trees will generate in the new biomes. | madmaxoft | 2013-11-28 | 2 | -14/+101 |
| | | | | | | | | Only the generic trees, the special variants haven't yet been implemented. | ||||
* | | Added new biomes to old composition generator. | madmaxoft | 2013-11-28 | 4 | -0/+145 |
| | | | | | | | | Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators. | ||||
* | | Added new biomes to old height generators. | madmaxoft | 2013-11-28 | 4 | -39/+179 |
| | | | | | | | | Now Biomal and DistortedHeight generators will work with new biomes. | ||||
* | | Moved BiomeGen creation from INI file data to BioGen.cpp. | madmaxoft | 2013-11-28 | 3 | -48/+74 |
| | | | | | | | | This way it can be shared between MCServer and BiomeVisualiser. | ||||
* | | Moved json includes to where they are really needed. | madmaxoft | 2013-11-28 | 3 | -1/+2 |
| | | |||||
* | | BiomeVisualiser: Added the TwoLevel biome generator. | madmaxoft | 2013-11-28 | 2 | -0/+229 |
|/ | |||||
* | Fixed a bug with TNT waking simulators | Tiger Wang | 2013-11-28 | 1 | -2/+2 |
| | |||||
* | Improved TNT pickup randomisation | Tiger Wang | 2013-11-28 | 1 | -1/+1 |
| | |||||
* | Made TNT pickups spawning chance 25% | Tiger Wang | 2013-11-27 | 2 | -3/+3 |
| | |||||
* | Merged master into redstonefixes | Tiger Wang | 2013-11-27 | 465 | -0/+138834 |
|\ | |||||
| * | Voronoi-related biomegens use the new cVoronoiMap class. | madmaxoft | 2013-11-27 | 3 | -54/+29 |
| | | |||||
| * | Fixed a load of issues, clang autodetection works now. | Alexander Harkness | 2013-11-27 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | This fixes issue #210. This also removes the disableasm option, so it would be wise to remove it from any scripts that use it. I also removed a random line in the middle of globals.h, why was it there? | ||||
| * | Added missing files for Voronoi map generation. | madmaxoft | 2013-11-27 | 2 | -0/+140 |
| | | |||||
| * | Fixed VC2008 compilation, normalized include paths. | madmaxoft | 2013-11-27 | 12 | -12/+12 |
| | | |||||
| * | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 26 | -30/+30 |
| | | |||||
| * | Fixed some of tiger's derpyness. | Alexander Harkness | 2013-11-27 | 9 | -11/+11 |
| | | |||||
| * | ANOTHER compile fix | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | | | | | | | | This one was broken by bear. :P | ||||
| * | Hopefully fixed last of the Linux compile errors | Tiger Wang | 2013-11-26 | 5 | -5/+5 |
| | | |||||
| * | Compile fix again | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Fixed Linux compile again | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Fixed tolua++ files | Tiger Wang | 2013-11-26 | 3 | -4/+4 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 18 | -6/+268 |
| |\ | |/ |/| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
| * | Merge branch 'master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -3/+0 |
| |\ | |/ |/| | |||||
| * | Fixed loads more of them. | Alexander Harkness | 2013-11-26 | 11 | -13/+13 |
| | | |||||
| * | Another | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | And another. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Fixed another. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Fixed another one. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Fixed a mis-include | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 24 | -27/+27 |
| | | |||||
| * | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 48 | -59/+58 |
| | | |||||
| * | Moved SQLite, LuaExpat, and MD5 to /lib | Tiger Wang | 2013-11-24 | 8 | -148557/+0 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 66 | -1497/+2365 |
| |\ | |/ |/| | | | | | Conflicts: GNUmakefile | ||||
| * | Moved source to src | Alexander Harkness | 2013-11-24 | 469 | -0/+285880 |
|/ | |||||
* | Android: Moved Android stuff to the ~/trunk/Android/ folder! | faketruth | 2012-08-19 | 1 | -267/+0 |
| | | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: Finally a log! :D | faketruth | 2012-08-19 | 1 | -32/+44 |
| | | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@754 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: Showing last MCServer related logcat message | faketruth | 2012-08-19 | 1 | -13/+63 |
| | | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@753 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: I'm probably using a lot of bad practices, but the app looks somewhat better now and polls the server status | faketruth | 2012-08-18 | 1 | -9/+146 |
| | | | | | | Android: Put quite some testing code in ToJava.h and app-android.cpp ... I still can't send log messages to Java. The issue is threads, I can't use JNI stuff from threads that were not created by Java (at least not easily) git-svn-id: http://mc-server.googlecode.com/svn/trunk@752 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: Pressing back button sends stop command to server | faketruth | 2012-08-18 | 1 | -9/+30 |
| | | | | | | | | Android: ToJava can call functions on Java by using JNI Android: Plugins work Android: Added android specific files to VS2008 project, but they are excluded from compiling git-svn-id: http://mc-server.googlecode.com/svn/trunk@747 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | MCServer should run just fine on Android now :D | faketruth | 2012-08-16 | 1 | -3/+13 |
| | | | | | | The server is also stoppable from Android git-svn-id: http://mc-server.googlecode.com/svn/trunk@743 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android! | faketruth | 2012-08-15 | 1 | -0/+37 |
Disabled Squirrel for Android cLog now logs to Android LogCat as well Fixed Lua so it compiles on Android Removed/commented out exceptions in JsonCpp so it compiles on Android git-svn-id: http://mc-server.googlecode.com/svn/trunk@741 0a769ca7-a7f5-676a-18bf-c427514a06d6 |