summaryrefslogtreecommitdiffstats
path: root/MCServer (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-144-7/+259
|\ | | | | | | | | Conflicts: src/World.h
| * Fixed ChunkWorx stop button giving an errorSTRWarrior2014-06-131-1/+1
| |
| * APIDump: Added the Info.lua article.madmaxoft2014-06-132-0/+247
| | | | | | | | Fixes #504.
| * Merge pull request #1082 from mc-server/cauldronfixesAlexander Harkness2014-06-121-3/+7
| |\ | | | | | | Add biome-aware downfall functions.
| | * Update APIDesc.luaAlexander Harkness2014-06-111-0/+1
| | |
| | * Update APIDesc.luaTiger Wang2014-06-111-3/+6
| | |
| * | Fix typo in handy_functions.luaQais Patankar2014-06-121-2/+2
| | |
| * | APIDump: Documented cBlockArea:GetCoordRange().madmaxoft2014-06-111-1/+2
| |/
* / Portals animate and delay correctlyTiger Wang2014-06-121-1/+1
|/
* Small change for easier understanding.Alexander Harkness2014-06-081-1/+1
|
* Corrected the furnace fuels. Solves #1071Alexander Harkness2014-06-071-15/+27
|
* APIDump: Fixed crashSTRWarrior2014-06-021-1/+1
|
* Added OnProjectileHitBlock example in DebuggersSTRWarrior2014-06-021-1/+13
|
* Updated OnProjectileHitBlock documentation.STRWarrior2014-06-021-0/+5
|
* Stuff.Alexander Harkness2014-05-271-1/+1
|
* Update main.cssAlexander Harkness2014-05-261-1/+2
|
* Updated CoreTiger Wang2014-05-251-0/+0
|
* Merge branch 'master' into SslWebAdminMattes D2014-05-103-8/+22
|\
| * Merge branch 'master' into SlabsHowaner2014-05-078-45/+234
| |\
| | * APIDump: Updated the OnDisconnect hook docs.madmaxoft2014-05-021-7/+17
| | | | | | | | | | | | Ref.: #655.
| | * APIDump: Improved error handling in API file loader.madmaxoft2014-05-021-1/+5
| | |
| * | Merge branch 'master' into SlabsHowaner2014-04-061-2/+18
| |\ \
| * \ \ Merge branch 'master' into SlabsHowaner2014-04-0319-550/+1326
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockDirt.h
* | | | | Fixed cert filename in Linux script.madmaxoft2014-05-072-2/+2
| | | | |
* | | | | Made the cert generation script executable on LinuxMattes D2014-05-021-0/+0
| | | | |
* | | | | Added a mention to run as admin.madmaxoft2014-05-011-0/+2
| | | | |
* | | | | Added scripts for generating HTTPS cert and key.madmaxoft2014-05-012-0/+19
| | | | |
* | | | | Implemented SSL connection for WebAdmin.madmaxoft2014-05-011-0/+4
| |_|_|/ |/| | | | | | | | | | | Fixes FS-319.
* | | | Fixed references to renamed files.archshift2014-04-241-1/+1
| | | |
* | | | Updated docs for StringToEnchantmentID.madmaxoft2014-04-231-1/+1
| | | | | | | | | | | | | | | | Ref.: mc-server/Core#67
* | | | Declaration that a mob is not fireproof is implicit.archshift2014-04-231-21/+0
| | | | | | | | | | | | | | | | Removed explicitly declaring mobs as not fireproof.
* | | | Added IsFireproof hook for monsters.iniarchshift2014-04-231-0/+26
| | | |
* | | | Fixed capitalization issuesarchshift2014-04-221-2/+2
| | | | | | | | | | | | | | | | Wasn't parsing correctly before, as some items were not capitalized correctly.
* | | | APIDump: Added a ChunkStay article.madmaxoft2014-04-193-27/+195
| | | | | | | | | | | | | | | | Fixes #772.
* | | | InfoReg uses cCompositeChat for subcommand lists.madmaxoft2014-04-101-6/+6
| | | | | | | | | | | | | | | | Also fixed an issue with console commands.
* | | | Added the generated ZBS API file to ignore list.madmaxoft2014-04-061-0/+2
| |_|/ |/| |
* | | Updated cWorld::CreateProjectile() documentationTiger Wang2014-04-061-1/+1
| | |
* | | Added more API documentation to cCompositeChat.madmaxoft2014-04-051-1/+17
| |/ |/|
* | APIDump: Added angular specifics.madmaxoft2014-04-031-2/+2
| |
* | Documented the units and range for entity rotations.madmaxoft2014-04-031-3/+3
| |
* | Debuggers: Added a Base64 API roundtrip test.madmaxoft2014-04-021-4/+23
| |
* | Merged branch 'msDifference'.madmaxoft2014-04-011-1/+17
|\ \
| * | APIDump: Gave msDifference it's own table.STRWarrior2014-04-011-9/+21
| | |
| * | Added extra table which should make it more clear what msDifference does.STRWarrior2014-03-311-1/+3
| | |
| * | Fixed typoSTRWarrior2014-03-311-1/+1
| | |
| * | Documented msDifferenceSTRWarrior2014-03-311-6/+8
| | |
* | | cBlockArea: Added the msMask merge strategy.madmaxoft2014-04-011-3/+20
| | |
* | | LOG() API reads the LogLevel from the cCompositeChat's MessageType.madmaxoft2014-04-011-2/+2
| | |
* | | APIDump: Documented the cCompositeChat support in logging functions.madmaxoft2014-03-311-5/+25
| | |
* | | Console logging supports cCompositeChat as its parameters.madmaxoft2014-03-311-0/+9
| | |
* | | APIDump: Added code completion support file to ZBS tutorial.madmaxoft2014-03-311-1/+2
| | |
* | | APIDump: Renamed the ZBS API dump file to mcserver_api.lua.madmaxoft2014-03-311-2/+2
| | | | | | | | | | | | This is to avoid confusion with ZBS, where two "mcserver.lua" files were present.
* | | Merge branch 'NetherFortGen'.madmaxoft2014-03-301-4/+20
|\| |
| * | Merge branch 'master' into NetherFortGenmadmaxoft2014-03-292-0/+49
| |\ \
| * | | Implemented the msSpongePrint merge strategy.madmaxoft2014-03-281-4/+20
| | | | | | | | | | | | | | | | Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block.
* | | | APIDump: Added article: Setting up ZeroBrane Studio.madmaxoft2014-03-304-0/+46
| |/ / |/| | | | | | | | Fixes #824.
* | | Documented both hooks.STRWarrior2014-03-292-0/+49
|/ /
* | Merge branch 'howaner/GlobalFixes'.madmaxoft2014-03-282-0/+49
|\ \
| * | Change documentation textHowaner2014-03-272-4/+4
| | |
| * | Change SpreadSource documentationHowaner2014-03-272-6/+6
| | |
| * | Add documentation for new Block spreadHowaner2014-03-272-0/+49
| | |
* | | Debuggers: Deactivated the chunk generator callback.madmaxoft2014-03-281-1/+3
|/ /
* | Ignoring the default GalExports folder.madmaxoft2014-03-251-0/+1
| |
* | InfoReg updated for multi-verb console commands.madmaxoft2014-03-251-12/+39
| |
* | Plugins can set flying speed.madmaxoft2014-03-201-3/+5
| |
* | APIDump: Fixed wrong escaped strings.madmaxoft2014-03-201-5/+5
| |
* | Rewritten player speeds to be relative unit-less.madmaxoft2014-03-201-5/+5
| | | | | | | | Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
* | APIDump: Updated comments to reflect current code.madmaxoft2014-03-191-1/+4
| |
* | APIDump: Added ZeroBraneStudio API export.madmaxoft2014-03-191-5/+128
| | | | | | | | Fixes #821.
* | APIDump: Reformatted the plugin to avoid all ZBS Analyzer issues.madmaxoft2014-03-191-443/+404
| |
* | Debuggers: Using binary file mode for .schematics.madmaxoft2014-03-181-2/+2
| |
* | Merge pull request #811 from mc-server/DumpInfoMattes D2014-03-161-0/+49
|\ \ | | | | | | Created a small plugin for InfoDump
| * | Only check for "Info.lua" with capital ISTRWarrior2014-03-161-1/+1
| | |
| * | Created a small plugin for InfoDumpSTRWarrior2014-03-151-0/+49
| | | | | | | | | | | | It allows you to dump the info of a plugin by pressing a button in the webadmin.
* | | Fixed InfoReg.lua's handling of multi-level commands.madmaxoft2014-03-161-2/+2
| | |
* | | Removed the @EnableMobDebug.lua file.madmaxoft2014-03-161-29/+0
|/ / | | | | | | It is not needed anymore, ZeroBrane Studio now has direct support for invoking the debugger in MCS plugins.
* | Debuggers: Added a test for WE selection API.madmaxoft2014-03-151-1/+39
| | | | | | | | This tests mc-server/WorldEdit#34.
* | APIDump: Documented a forgotten cCuboid constructor.madmaxoft2014-03-151-1/+2
| |
* | APIDump: Fixed missing return statement.madmaxoft2014-03-151-0/+1
| |
* | Added cCuboid:Assign(OtherCuboid) API function.madmaxoft2014-03-151-2/+6
| |
* | Ignoring all config and SQLite files in the output folder.madmaxoft2014-03-141-4/+2
| |
* | APIDump: Trigger the dump manually.madmaxoft2014-03-141-26/+64
| | | | | | | | Fixes #715. The dump can be triggerred by issuing an "api" console command, or in the webadmin.
* | cPluginManager:Bind[Console]Command returns true on success.madmaxoft2014-03-141-4/+4
| | | | | | | | Fixes #801.
* | APIDump: Removed old documentation, documented some new functions.madmaxoft2014-03-112-6/+17
| |
* | APIDump: Updated WEOffset-related docs.madmaxoft2014-03-121-7/+7
| |
* | Merge branch 'master' into cBlockArea_Offsetmadmaxoft2014-03-123-6/+57
|\ \
| * \ Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-091-3/+4
| |\ \ | | | | | | | | Add TNT load/save
| | * | Change tnt documentation to ticksHowaner2014-03-081-3/+3
| | | |
| | * | Merge branch 'master' into BlockEntitysHowaner2014-03-082-0/+40
| | |\ \
| | * | | Add new tnt documentationHowaner2014-03-081-2/+3
| | | | |
| * | | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-098-32/+308
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| | * | | | Updated CoreTiger Wang2014-03-091-0/+0
| | | |/ / | | |/| |
| * | | | Added extra dye rules to crafting.txtTiger Wang2014-03-091-1/+8
| | | | |
| * | | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-3/+46
| | | | | | | | | | | | | | | | | | | | + Added fireworks
* | | | | Fixed APIDumpSTRWarrior2014-03-111-1/+1
| | | | |
* | | | | Documented the functions.STRWarrior2014-03-111-0/+6
| |/ / / |/| | |
* | | | Fixed cBlockArea schematic string saving signature.madmaxoft2014-03-071-1/+1
| | | |
* | | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-072-0/+16
|\ \ \ \ | | |/ / | |/| | Add Flower Pots
| * | | Link cItem in the documentationHowaner2014-03-072-3/+3
| | | |
| * | | Add missing documentation filesHowaner2014-03-072-0/+16
| | | |
* | | | Debuggers: Added a test of the cBlockArea string-serialization.madmaxoft2014-03-071-0/+38
| | | |
* | | | APIDump: Documented cBlockArea string-serialization functions.madmaxoft2014-03-071-0/+2
|/ / /
* | | Merge pull request #747 from mc-server/InfoDump_GithubMattes D2014-03-061-19/+12
|\ \ \ | | | | | | | | Info dump github
| * | | The APIDump generates a list of all the permissions again.STRWarrior2014-03-051-7/+7
| | | |
| * | | Fixed typoSTRWarrior2014-03-021-1/+1
| | | | | | | | | | | | | | | | Discription => Description
| * | | Simplified and more clearer infodump for Github.STRWarrior2014-03-021-14/+7
| | | |
* | | | APIDump: Documented the cCompositeChat class.madmaxoft2014-03-051-0/+52
| | | |
* | | | APIDump: Ignoring classes by exact match.madmaxoft2014-03-051-10/+10
| | | | | | | | | | | | | | | | "cCompositeChat" was ignored because it matched "os".
* | | | Debuggers: Added simple test for cCompositeChat.madmaxoft2014-03-041-0/+15
| | | |
* | | | Merge pull request #738 from xdot/masterMattes D2014-03-021-0/+32
|\ \ \ \ | | | | | | | | | | Refactored global block property arrays
| * | | | GetById => Getandrew2014-03-021-10/+10
| | | | |
| * | | | APIDump: ID -> Typeandrew2014-03-021-10/+10
| | | | |
| * | | | Exported cBlockInfoandrew2014-03-021-0/+32
| | | | |
* | | | | Ignoring all plugin subfolders.madmaxoft2014-03-011-0/+1
|/ / / / | | | | | | | | | | | | Plugins developed directly with MCS have been added explicitly; other plugins are ignored.
* | | | Merge pull request #735 from xdot/masterMattes D2014-03-011-0/+92
|\ \ \ \ | |/ / / |/| | | Exported and documented cScoreboard
| * | | APIDump: Fixed cScoreboard enumsandrew2014-03-011-17/+17
| | | |
| * | | Exported cScoreboard::ForEachTeamandrew2014-03-011-0/+1
| | | |
| * | | Exported cScoreboard::ForEachObjectiveandrew2014-03-011-0/+1
| | | |
| * | | Exported and documented cScoreboardandrew2014-03-011-0/+90
| | | |
* | | | Using comma instead of string concatenation.STRWarrior2014-03-011-1/+1
| | | |
* | | | If there is a SourceLocation available the InfoDump will note it in the forum version.STRWarrior2014-03-011-1/+4
| | | |
* | | | APIDump: Documented cRoot:CreateAndInitializeWorld.STRWarrior2014-03-011-0/+1
|/ / /
* | / Documented the changes in cJukeboxEntity.madmaxoft2014-02-281-2/+4
| |/ |/|
* | Added a MobDebug enabler script.madmaxoft2014-02-281-0/+29
| | | | | | | | This file is to be copied to a plugin's folder in order to debug that plugin with MobDebug.
* | Fixed compatibility with ZeroBraneStudio and LuaRocks.madmaxoft2014-02-281-0/+0
|/ | | | Lua now compiles into lua51.dll and there's a lua5.1.dll that acts as a export-forwarding proxy to lua51.dll.
* APIDump: Added Geometry file to project.madmaxoft2014-02-261-0/+3
|
* APIDump: Documented new cCuboid functions.madmaxoft2014-02-261-1/+6
|
* APIDump: Separated out Geometry-related classes to their own file.madmaxoft2014-02-262-301/+320
|
* InfoReg: Subcommand aliases are handled properly.madmaxoft2014-02-251-1/+15
|
* Added useful parameter overloads to cBlockArea Lua API.madmaxoft2014-02-241-6/+31
|
* Merge pull request #669 from xdot/masterTiger Wang2014-02-242-2/+65
|\ | | | | Implementation of in-game maps :D
| * Maps: Improvementsandrew2014-02-231-2/+2
| |
| * Manually exported DoWithMapandrew2014-02-231-1/+1
| |
| * Documented and exported cMapManagerandrew2014-02-231-0/+14
| |
| * Documented and exported cMapandrew2014-02-221-0/+49
| |
| * Manual merge (Fixed conflicts)andrew2014-02-208-31/+344
| |\
| * | EmptyMap item handlerandrew2014-02-141-1/+1
| | |
* | | Documented cBlockArea:GetOrigin(), :GetSize() and :GetVolume().madmaxoft2014-02-231-0/+3
| | |
* | | APIDump: Documented cClientHandle:HasPluginChannel.madmaxoft2014-02-201-0/+1
| |/ |/|
* | APIDump: Fixed cBlockArea:GetRelBlockType() return types.madmaxoft2014-02-201-1/+1
| |
* | Merge pull request #696 from mc-server/paintingsMattes D2014-02-181-0/+18
|\ \ | | | | | | Implemented paintings, fixes #689
| * | Properly exported and documented paintingsTiger Wang2014-02-181-0/+18
| | |
* | | APIDump: Documented missing cWorld functions.madmaxoft2014-02-181-0/+8
| | |
* | | Debuggers: Added a test for the cWorld:SetAreaBiome() function.madmaxoft2014-02-181-0/+40
| | |
* | | Updated CoreTiger Wang2014-02-181-0/+0
| | |
* | | Merge pull request #695 from narroo/Issue673Mattes D2014-02-182-2/+2
|\ \ \ | |/ / |/| | ChunkWorx uses QueueUnloadUnusedChunks
| * | Fixed Chunkworx, Issue 673.narroo2014-02-181-1/+1
| | |
| * | Issue #673 Fix, Chunkworx now uses QueueUnloadUnusedChunks instead of UnloadUnusedChunks.narroo2014-02-181-1/+1
| | |
* | | Added the InfoReg plugin library file.madmaxoft2014-02-171-0/+157
| | | | | | | | | | | | This file should be used by all plugins that use Info.lua to register their commands. It defines the functions that register the commands and provide handling for the subcommands.
* | | Documented the cPluginManager:GetPluginsPath() API function.madmaxoft2014-02-171-0/+1
| | |
* | | Added files for eclipse and debug, fix a mistakeMuhammadWang2014-02-161-0/+1
| | | | | | | | | | | | src/Bindings/BindingsDependecies.txt is a mistake made in 45bc1ff033271bc0c6a9e5931a00c554e065c375
* | | Debuggers: Added code to test cCompositeChat functionality.madmaxoft2014-02-151-0/+23
|/ / | | | | | | Ref.: #678
* | Updated Plugin articleTiger Wang2014-02-151-14/+15
| | | | | | | | + Adds reference to new SendMessage() functions
* | Debuggers: Added a WebAdmin StressTest page.madmaxoft2014-02-151-13/+76
| | | | | | | | This page reloads content from the WebAdmin as fast as possible.
* | Merge pull request #677 from mc-server/BroadcastParticleEffectAlexander Harkness2014-02-151-0/+1
|\ \ | | | | | | Broadcast particle effect
| * | Documented BroadcastParticleEffectSTRWarrior2014-02-151-0/+1
| | |
* | | Updated Core.madmaxoft2014-02-131-0/+0
| | |
* | | Merged branch 'narroo/master'.madmaxoft2014-02-132-1/+1
|\ \ \ | |_|/ |/| | | | | This merges pull request #661.
| * | Fixed formatting issue in APIDesc.luanarroo2014-02-131-1/+1
| | |
| * | Fixed location of QueueUnloadUnusedChunks entry in APIDesc dump. Now is lexographically listed in cWorld, not cRoot.narroo2014-02-121-2/+2
| | |
| * | Alpha-Sorted List.narroo2014-02-111-1/+1
| | |
| * | Changed console.lua in core plugin.narroo2014-02-111-0/+0
| | |
| * | Updated APIDesc.lua to replace 'UnloadUnusedChunks' with 'QueueUnloadUnusedChunks'.narroo2014-02-111-1/+1
| | |
| * | Typo Fix in console.luanarroo2014-02-101-0/+0
| | |
* | | Decreased mobs attack rangetonibm192014-02-121-22/+22
| |/ |/| | | Mobs attack from too far and throught walls, this will reduce the bug.
* | Updated Core.madmaxoft2014-02-121-0/+0
| |
* | Fixed *nix attribs.Mattes D2014-02-112-0/+0
| |
* | Debuggers: Updated messaging functionsmadmaxoft2014-02-111-4/+9
| |
* | Merge branch 'master' into ChunkStaymadmaxoft2014-02-113-23/+4
|\ \
| * | Updated MagicCarpet and CoreTiger Wang2014-02-103-23/+4
| |/
* | APIDump: Documented cWorld:ChunkStay().madmaxoft2014-02-111-0/+1
| |
* | Debuggers: Updated to reflect the new API.madmaxoft2014-02-101-15/+9
| |
* | Debuggers: Added a cLuaChunkStay test code.madmaxoft2014-02-091-0/+72
| |
* | Debuggers: Disabled testing plugin calls.madmaxoft2014-02-091-1/+1
| |
* | Added air, farmland and tilleddirt to items.ini.madmaxoft2014-02-091-0/+3
|/ | | | Air hasn't been present at all, the others are usual synonyms.
* Merge branch 'master' into playerimprovementsmadmaxoft2014-02-091-0/+0
|\
| * Updated CoreTiger Wang2014-02-091-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-093-6/+232
|\| | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * InfoDump: Added github output.madmaxoft2014-02-051-5/+228
| |
| * Added cPluginManager:LogStackTrace() to the Lua API.madmaxoft2014-02-051-1/+2
| | | | | | | | Fixes #637.
| * InfoDump: Git-Ignoring all generated files.madmaxoft2014-02-051-0/+2
| |
* | Merge branch 'master' into playerimprovementsTiger Wang2014-02-092-2/+5
|\| | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * Fixed indent from previous commits.madmaxoft2014-02-041-1/+1
| |
| * Merge pull request #635 from tonibm19/masterMattes D2014-02-041-1/+3
| |\ | | | | | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
| | * Fixed indentationtonibm192014-02-041-1/+1
| | |
| | * Blank lines and indentation.tonibm192014-02-041-1/+0
| | | | | | | | | | | | Also removed GetClosestPlayer documentation
| | * Added documentationtonibm192014-02-031-1/+4
| | |
| * | InfoDump: Fixed export for undeclared command param combinations.madmaxoft2014-02-041-2/+2
| |/
* | Removed some unexported documentation.Tiger Wang2014-02-071-11/+5
| |
* | Improved chat messaging functionsTiger Wang2014-02-071-3/+24
| | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
* | Updated Core & PolarSSLTiger Wang2014-02-051-0/+0
| |
* | Server now handles join messages alsoTiger Wang2014-02-033-17/+17
|/ | | | * Revised as well hook documentation
* Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-021-0/+23
|\ | | | | | | | | Conflicts: src/Blocks/BlockTorch.h
| * Merge pull request #585 from daniel0916/hooksMattes D2014-02-011-0/+23
| |\ | | | | | | Added "player destroying" and "player destroyed" hooks
| | * Added PlayerDestroyedHook Documentationdaniel09162014-02-011-0/+23
| | |
* | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-012-17/+22
|\| | | | | | | | | | | | | | Conflicts: src/World.h
| * | Fixed some more.Alexander Harkness2014-01-311-4/+3
| | |
| * | Fixed at least a little of the plugin guide.Alexander Harkness2014-01-301-15/+7
| | |
| * | Update CoreAlexander Harkness2014-01-301-0/+0
| | |
| * | Documented cFloater.STRWarrior2014-01-291-0/+14
|/ /
* | Merge pull request #587 from mc-server/mobimprovementsMattes D2014-01-251-1/+1
|\ \ | | | | | | Mob improvements & rudimentary artificial intelligence
| * | Implemented creeper abilitiesTiger Wang2014-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | | Ignoring the Comm Logs.madmaxoft2014-01-251-0/+1
| | |
* | | Updated CoreTiger Wang2014-01-241-0/+0
|/ /
* | APIDump: Fixed indent after merge.madmaxoft2014-01-241-2/+2
| |
* | Merge remote-tracking branch 'MikeHunsinger/master'madmaxoft2014-01-241-3/+4
|\ \
| * | Fixed indentation and doxygen comments... For real this time.Mike Hunsinger2014-01-241-2/+2
| | |
| * | Fixed spacing and doxycomments.Mike Hunsinger2014-01-241-2/+2
| | |
| * | Split TossItem into three Toss functions (Held, Equipped and Pickup)Mike Hunsinger2014-01-231-3/+4
| |/
* | InfoDump: Can dump a single plugin without LFS.madmaxoft2014-01-221-47/+65
| |
* | InfoDump: Dump all referenced permissions.madmaxoft2014-01-221-4/+112
| |
* | Implemented cPluginManager:CallPlugin() API.madmaxoft2014-01-212-2/+36
|/ | | | 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.
* APIDump: Added notes about objects across cWorld's task execution.madmaxoft2014-01-191-2/+2
|
* APIDump: Updated cWorld:ScheduleTask()'s description.madmaxoft2014-01-191-1/+1
|
* Changed the cWorld::ScheduleTask() signature.madmaxoft2014-01-191-0/+40
| | | | 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.
* Updated Core.madmaxoft2014-01-191-0/+0
|
* Updated coreTiger Wang2014-01-191-0/+0
|
* APIDump: Updated cPluginManager:GetAllPlugins().madmaxoft2014-01-171-1/+1
|
* Updated core to the latest version and edited the submodules file to allow greater compatibility on restricted networks.Alexander Harkness2014-01-171-0/+0
|
* Finished exporting cWorld:ScheduleTask() to Lua API.madmaxoft2014-01-161-1/+1
|
* Merge pull request #548 from worktycho/documentionAlexander Harkness2014-01-161-0/+1
|\ | | | | Added Documention for a few features I've added
| * Documented the SchedualeTask functionTycho2014-01-161-0/+1
| |
* | APIDump: Explicitly listed static cPlayer functions.madmaxoft2014-01-151-2/+2
| |
* | Updated Core! ±±±___±±±Tiger Wang2014-01-151-0/+0
| |
* | Merge pull request #538 from mc-server/minecartsMattes D2014-01-151-0/+0
|\ \ | |/ |/| Minecarts
| * Fixed VS2013 compile and updated CoreTiger Wang2014-01-121-0/+0
| |
* | Moved profiling scripts into the MCServer folder.madmaxoft2014-01-142-0/+101
| | | | | | | | Also they default to the 2010 version of the tools, which is Win7-compatible, and should be 64-bit-compatible, too.
* | APIDump: Wrapped example code so that it displays well on small screens.madmaxoft2014-01-131-3/+8
| | | | | | | | The listing was pushing the resulting webpage too wide on my 19" screen, causing various distortions.
* | APIDump: Added OnPluginMessage.lua file to Decoda project.madmaxoft2014-01-131-0/+3
| |
* | APIDump: Added missing bits of documentation.madmaxoft2014-01-131-0/+15
| | | | | | | | The recent changes didn't document some of the new API functions.
* | APIDump: Documented the plugin messaging hook and function.madmaxoft2014-01-132-0/+26
|/
* Merge pull request #526 from mc-server/IniFileFixMattes D2014-01-121-0/+4
|\ | | | | Fixed cIniFile's SetValue().
| * Documented the cIniFile:AddValue* functions.madmaxoft2014-01-111-0/+4
| | | | | | | | Now the documentation really matches the implementation.
* | Merge pull request #522 from mc-server/LuaDlFixMattes D2014-01-101-1/+1
|\ \ | |/ |/| Lua dl fix
| * Fixed a typo in the TestLuaRocks test plugin.madmaxoft2014-01-091-1/+1
| |
* | Debuggers: Test code for WECUI plugin messaging.madmaxoft2014-01-091-0/+17
| |
* | Windows nightbuild updated to generate .example.ini files.madmaxoft2014-01-091-0/+30
|/ | | | Fixes #314.
* Added a known working favicon.madmaxoft2014-01-081-0/+0
|
* Updated CoreTiger Wang2014-01-071-0/+0
|
* Updated submodulesTiger Wang2014-01-072-0/+0
|
* Plugin messages are received and handed to plugins.madmaxoft2014-01-071-23/+12
| | | | Note that MCS doesn't currently handle any channel registrations, this will come later on.
* InfoDump: Removes indent and parses ParameterCombinations.madmaxoft2014-01-061-8/+27
| | | | The DetailedHelp was a bad name for what it really contained, so it has been renamed to ParameterCombinations.
* Fixed cPluginManager:AddHook() binding.madmaxoft2014-01-054-5/+24
| | | | Fixes #401. Old formats are still accepted, for compatibility reasons.
* InfoDump: Removed an unneeded function.madmaxoft2014-01-051-28/+0
|
* InfoDump: All reasonable strings are forumized.madmaxoft2014-01-041-5/+5
|
* Added forum output for commands' DetailedHelp array.madmaxoft2014-01-041-2/+31
| | | | Also added some coloring to simulate syntax highlighting.
* InfoDump: Implemented list and formatting Forumizing.madmaxoft2014-01-041-1/+6
| | | | The exported strings are now parsed for basic formatting and list-related tags.
* InfoDump: added AdditionalInfo to forum dumps.madmaxoft2014-01-041-4/+47
|
* Added an InfoDump script for dumping all plugins' Info.lua into forum description.madmaxoft2014-01-042-0/+299
| | | | GitHub description will follow later on.
* [Handy] updated for new API, fixed bugs, added warnings. Now v2.Tau2014-01-022-284/+145
|
* Merge branch 'FishingHook'madmaxoft2014-01-012-0/+41
|\
| * Little more documentation for OnPlayerFishing.STRWarrior2014-01-011-1/+1
| |
| * Using documentation Xoft recommended.STRWarrior2014-01-011-1/+1
| |
| * Fixed typo's in the documentation.STRWarrior2014-01-012-4/+4
| |
| * Documented OnPlayerFished and OnPlayerFishing.STRWarrior2013-12-312-0/+41
|/
* APIDump: Fixed a factual error in OnPluginsLoaded description.madmaxoft2013-12-291-2/+2
|
* APIDump: Static files overwrite their destination.madmaxoft2013-12-291-5/+13
|
* APIDump: The PRE html tag has tab width set to 2 spaces.madmaxoft2013-12-291-0/+5
|
* APIDump: Documented OnPluginsLoaded.madmaxoft2013-12-291-0/+79
|
* Added HOOK_PLUGINS_LOADED.madmaxoft2013-12-291-0/+9
| | | | This fixes #482.
* APIDump: Added the SettingUpDecoda article.madmaxoft2013-12-275-0/+50
| | | | This implements #383.
* APIDump: Articles eplicitly declare being UTF-8.madmaxoft2013-12-272-0/+2
| | | | This fixes display in firefox.
* APIDump: Added quick links to index to each class and hook file.madmaxoft2013-12-271-2/+14
| | | | Third part of #403.
* APIDump: Added a quick-nav menu to hook descriptions.madmaxoft2013-12-271-7/+22
| | | | Second part of #403.
* APIDump: Added a quick-nav menu to class descriptions.madmaxoft2013-12-271-6/+22
| | | | First part of #403.
* APIDump: Split the huge DumpAPIHtml function into smaller ones.madmaxoft2013-12-271-47/+61
|
* APIDump: Extra pages renamed to articles and moved to front.madmaxoft2013-12-271-24/+39
|
* APIDump: Fixed the WritingPlugin article.madmaxoft2013-12-271-98/+107
| | | | The code is no longer weirdly indented in the browser, and links are relative to the API docs root.
* APIDump: Added the WritingPlugin article to the exported pages.madmaxoft2013-12-271-0/+1
|
* APIDump: Fixed bad for-loop.madmaxoft2013-12-271-3/+3
| | | | How did I not see this before?
* Writing a plugin APIDump article (#382)Tiger Wang2013-12-263-49/+310
|
* Removed documentation for cChatColour:MakeColor()Alexander Harkness2013-12-241-7/+3
|
* Store plugin in a local variable to fix error on disableSam Mauldin2013-12-241-2/+5
|
* Or not. Fixes #384Alexander Harkness2013-12-201-1/+2
|
* done... finallyAlexander Harkness2013-12-201-2/+2
|
* fix the issues xoft pointed outAlexander Harkness2013-12-201-5/+4
|
* @madmaxoft now?Alexander Harkness2013-12-201-3/+3
|
* Possibly fixes #384Alexander Harkness2013-12-201-0/+6
| | | @madmaxoft, is this the right syntax for lua for loops?
* Create a static folder for adding static files.Alexander Harkness2013-12-201-0/+1
| | | .gitignore is basically just an empty file that might serve a purpose someday.
* APIDump: Ignoring the multi-inheritance members.madmaxoft2013-12-162-2/+20
| | | | We may get to documenting them one day, but for now they are unused anyway, so there's no point in documenting them. They are a by-product of multiple inheritance, re-introduced due to #422.
* Documented ForceSetSpeed.STRWarrior2013-12-151-0/+1
|
* APIDump: Documented New functionsSTRWarrior2013-12-151-0/+4
|
* Documented cTNTEntity.STRWarrior2013-12-141-0/+11
|
* Update CoreTiger Wang2013-12-141-0/+0
|
* Groups.ini and Users.ini are now generatedTiger Wang2013-12-144-49/+0
|
* Documented OnWorldStarted.STRWarrior2013-12-111-0/+24
|
* Ignoring Gallery plugin settings.madmaxoft2013-12-081-0/+3
|
* Updated core.Alexander Harkness2013-12-071-0/+0
|
* Documented SpawnFallingBlock()STRWarrior2013-12-071-0/+1
|
* Updated TRANSAPIAlexander Harkness2013-12-071-6/+0
|
* Merge pull request #394 from SamJBarney/masterMattes D2013-12-061-0/+6
|\ | | | | Fire no longer goes out when on top of nether rack
| * I don't know how this dissapeard.Samuel Barney2013-12-061-0/+49
| |
| * Merge branch 'master' of https://github.com/mc-server/MCServerSamuel Barney2013-12-052-0/+7
| |\ | | | | | | | | | | | | Conflicts: src/Simulator/FireSimulator.h
* | | APIDump: Documented the new cPluginManager:GetCurrentPlugin() function.madmaxoft2013-12-051-1/+2
| |/ |/|
* | Updated TransAPI, fixes #389Alexander Harkness2013-12-031-6/+0
| | | | | | | | @madmaxoft is this the right API usage?
* | Added a quick LuaRocks testing plugin.madmaxoft2013-12-031-0/+49
| | | | | | | | You need to install the luarocks system and through it the luasocket and 30log rocks.
* | The server builds and uses Lua as DLL in Debug mode.madmaxoft2013-12-021-0/+4
| | | | | | | | This is a test to see how LuaRocks will interact. Only debug mode on Windows is affected, all other platforms and modes are unchanged.
* | APIDump: Added missing params to OnPlayerRightClick() hook.madmaxoft2013-12-021-0/+3
|/
* APIDump: Updated the project file to include all partial docs files.madmaxoft2013-11-301-1/+154
|
* cWorld::SpawnExperienceOrb() now returns the entity ID of the spawned orb.STRWarrior2013-11-261-1/+2
| | | | Documented etExpOrb.
* Documented SpawnExperienceOrb in cWorldSTRWarrior2013-11-251-0/+1
|
* APIDump: Moved projectiles' documentation to a separate file.madmaxoft2013-11-242-110/+112
|
* APIDump: Removed needless whitespace output.madmaxoft2013-11-241-123/+108
|
* APIDump: Removed unwanted functions.madmaxoft2013-11-231-1/+2
|
* APIDump: Reformatted the sqlite docs.madmaxoft2013-11-231-4/+16
|
* APIDump: The descriptions are read from multiple files.madmaxoft2013-11-2352-1682/+2036
| | | | All the files in the Classes subfolder are read for class descriptions, and in the Hooks subfolder for the hook descriptions.
* Documented sqlite functions. Used: http://lua.sqlite.org/index.cgi/doc/tip/doc/lsqlite3.wiki#sqlite3_functionsSTRWarrior2013-11-231-0/+18
|
* APIDump: Added more constant groups.madmaxoft2013-11-232-20/+121
| | | | Also fixed the parsing of the Include data in the constant groups, and added linkification to group texts.
* APIDump: Added a few constant groups to the descriptions.madmaxoft2013-11-221-92/+78
|
* APIDump: Implemented constant groups.madmaxoft2013-11-222-18/+144
| | | | Fix #289.
* Added cFile:GetFolderContents().madmaxoft2013-11-222-10/+22
| | | | Fix 162.
* APIDump: Fixed cRoot's furnace query API.madmaxoft2013-11-221-1/+3
|
* Added cRoot:GetFurnaceFuelBurnTime() to Lua API.madmaxoft2013-11-221-1/+20
|
* APIDump: Documented new cRoot:GetFurnaceRecipe().madmaxoft2013-11-221-2/+27
|
* Debuggers: Added a test harness for cRoot:GetFurnaceRecipe().madmaxoft2013-11-221-0/+21
| | | | The "/fr" command lists the furnace recipe for the currently held item.
* APIDump: Documented cPlayer XP-related functions.madmaxoft2013-11-211-0/+8
|
* APIDump: Documented cWorld:ForEachBlockEntityInChunk() and cWorld:DoWithBlockEntityAt().madmaxoft2013-11-201-0/+2
|
* Debuggers: Test harness for cWorld:ForEachBlockEntityInChunk().madmaxoft2013-11-201-19/+59
| | | | The fill command will fill all empty slots in block entities with containment with gold nuggets, one per slot.
* Merge pull request #350 from mc-server/arrowsMattes D2013-11-191-0/+0
|\ | | | | Fixed arrow bugs
| * Fixed arrow bugsTiger Wang2013-11-141-0/+0
| | | | | | | | * Fixed arrows hitting blocks wrong
* | Merge branch 'master' of git://github.com/nesco/MCServer.madmaxoft2013-11-191-3/+11
|\ \
| * | flower=38nesco2013-11-181-4/+2
| | |
| * | Update items.ininesco2013-11-151-1/+15
| |/
* | APIDump: Slight performance improvement.madmaxoft2013-11-191-17/+17
| | | | | | | | Strings don't need concatenation when using write().
* | APIDump: Documented Vector3i.madmaxoft2013-11-191-5/+25
| |
* | APIDump: Documented Vector3f.madmaxoft2013-11-171-3/+33
| |
* | updated plugin again...Daniel O'Brien2013-11-161-1/+1
| |
* | updated pluginDaniel O'Brien2013-11-161-1/+1
| |
* | removed SpendExperience and changed AddExperience to handle removing XpDaniel O'Brien2013-11-161-1/+1
| |
* | Merge remote-tracking branch 'upstream/master' into playerxpDaniel O'Brien2013-11-162-7/+118
|\ \
| * | APIDump: Documented lxp, the XML parser class.madmaxoft2013-11-151-0/+106
| | |
| * | APIDump: Functions that are documented are never ignored.madmaxoft2013-11-151-7/+12
| | | | | | | | | | | | This simplifies exclude-filters for functions such as lxp.new() that need inclusion.
* | | finished #143 I believeDaniel O'Brien2013-11-151-0/+11
| | |
* | | Merge remote-tracking branch 'upstream/master' into playerxpDaniel O'Brien2013-11-153-88/+134
|\| |
| * | APIDump: Small fixes and additions.madmaxoft2013-11-151-1/+4
| | |
| * | APIDump: Documented cSignEntity.madmaxoft2013-11-151-7/+6
| | |
| * | APIDump: Documented cNoteEntity.madmaxoft2013-11-151-1/+20
| | |
| * | APIDump: Documented the cJukeboxEntity.madmaxoft2013-11-151-0/+16
| | |
| * | APIDump: Documented cChunkDesc:GetBlockEntity().madmaxoft2013-11-151-1/+37
| | |
| * | Debuggers: Removed the old OnChunkGenerated code testing the cBlockArea writing.madmaxoft2013-11-151-15/+0
| | |
| * | cRoot::SaveAllChunks() doesn't wait for the save (deadlocks).madmaxoft2013-11-151-1/+1
| | | | | | | | | | | | Rather, it only queues the save task onto each world's tick thread.
| * | APIDump: Removed the BlockEntity constructors' docs.madmaxoft2013-11-151-62/+24
| | |
| * | Re-added rose to items.ini.madmaxoft2013-11-151-1/+5
| | |
| * | Debuggers: Added the BlockEntity test harness when generating chunks.madmaxoft2013-11-151-0/+22
| |/
* | added cProtocol function to pass xp to clientDaniel O'Brien2013-11-151-1/+1
| |
* | cProtocol add SendExperience() and debuggingDaniel O'Brien2013-11-141-0/+6
|/
* Updated the Core.madmaxoft2013-11-131-0/+0
|
* Update items.ininesco2013-11-131-1/+1
|
* Update items.ininesco2013-11-131-3/+59
|
* Update crafting.txt with StainedGlass and StainedGlassPanenesco2013-11-131-2/+38
|
* APIDump: Documented Vector3d.madmaxoft2013-11-111-8/+43
|
* APIDump: Documented cServer:IsHardCore()madmaxoft2013-11-091-0/+1
|
* APIDump: Documented TakeDamageInfo.madmaxoft2013-11-091-5/+29
|
* APIDump: Documented the relevant tolua functions.madmaxoft2013-11-091-2/+48
|
* APIDump: Added logging to see what takes so long.madmaxoft2013-11-091-0/+5
|
* Updated Core and ProtectionAreas.madmaxoft2013-11-092-0/+0
|
* Merge pull request #309 from mc-server/configautogenMattes D2013-11-052-38/+0
|\ | | | | Autogeneration of settings.ini and webadmin.ini
| * Removed settings/webadmin.example.ini filesTiger Wang2013-11-042-38/+0
| | | | | | | | | | Additionally, added some default plugins to autogeneration. Also moved nbt examples to docs/NBT Examples.
* | APIDump: Documented ItemCategory.madmaxoft2013-11-051-0/+38
| |
* | Merge pull request #307 from mc-server/MobImprovementsMattes D2013-11-051-6/+5
|\ \ | |/ |/| Mob projectiles
| * Small update to the monster.ini.STRWarrior2013-11-021-6/+5
| |
* | APIDump: Fixed HOOK_LOGIN short desc.madmaxoft2013-10-311-1/+1
|/
* Debuggers: Fixed after the cWindow API change.madmaxoft2013-10-281-2/+2
|
* APIDump: Documented cWindow.madmaxoft2013-10-281-21/+33
|
* APIDump: Documented HTTPFormData and HTTPRequest.madmaxoft2013-10-281-5/+39
|
* APIDump: Fixed a failure in documented classes with no functions.madmaxoft2013-10-281-0/+1
|
* APIDump: Documented cWorld.madmaxoft2013-10-271-0/+1
|
* APIDump: Documented cRoot.madmaxoft2013-10-271-3/+12
|
* APIDump: Documented cProjectileEntity.madmaxoft2013-10-271-3/+21
|
* APIDump: Documented cPickup.madmaxoft2013-10-261-1/+2
|
* APIDump: Documented cIniFile.madmaxoft2013-10-261-81/+135
|
* ChunkWorx: Updated for the cIniFile changes.madmaxoft2013-10-252-52/+62
|
* APIDump: Documented cMonster.madmaxoft2013-10-241-3/+52
|
* APIDump: Documented cEnchantments.madmaxoft2013-10-241-4/+37
| | | | The constants are self-documenting, no need to describe them further.
* APIDump: Documented cPickup.madmaxoft2013-10-241-8/+10
|
* APIDump: Documented cItemGrid and cPlayer.madmaxoft2013-10-241-30/+75
|
* APIDump: Added cChatColor constants.madmaxoft2013-10-231-3/+23
| | | | They don't really need much documentation, so just ignoring them in the Undocumented output.
* APIDump: Documented the cHopperEntity class.madmaxoft2013-10-231-0/+22
|
* APIDump: Linkified cEntity returns.madmaxoft2013-10-231-4/+7
|
* APIDump: member variables without a setter are considered constants.madmaxoft2013-10-221-1/+8
| | | | This fixes cChatColor constants being reported erroneously as member variables.
* APIDump: Inheritance is tested properly.madmaxoft2013-10-221-6/+4
| | | | This fixes #195 's second iteration.
* Ignoring a few generated files.madmaxoft2013-10-211-0/+1
|
* APIDump: Added link from cItem to the global ItemToString() et al.madmaxoft2013-10-201-1/+5
|
* APIDump: Fixed link in cPawn's desc.madmaxoft2013-10-201-1/+1
|
* APIDump: Various small fixes and additions.madmaxoft2013-10-201-6/+53
|
* APIDump: Fixed a few broken links.madmaxoft2013-10-201-4/+4
|
* APIDump: Statistics have a graphical meter; added hooks.madmaxoft2013-10-201-9/+39
|
* APIDump: Added basic statistics about the docs.madmaxoft2013-10-202-6/+83
|
* APIDump: Fixed listing undocumented objects.madmaxoft2013-10-201-5/+27
| | | | Classes with undefined "Functions" section would not list their functions as undocumented; similar for "Constants" and "Variables".
* Merge branch 'htmlescape'.madmaxoft2013-10-201-62/+65
|\
| * Added a APIDump description for GetHTMLEscapedString.Alexander Harkness2013-10-191-63/+66
| |
* | APIDump: Undocumented member variables are listed.madmaxoft2013-10-191-4/+16
| |
* | APIDump: Extra pages use the local prettify and CSS.madmaxoft2013-10-191-2/+7
| |
* | APIDump: Added member-variable filtering.madmaxoft2013-10-192-0/+14
| |
* | APIDump: Member variables are read from the API.madmaxoft2013-10-191-10/+48
| |
* | APIDump: Better header text for classes.madmaxoft2013-10-191-1/+1
|/
* APIDump: Added cIniFile additional info.madmaxoft2013-10-182-1/+29
|
* APIDump: Offline prettify is working.madmaxoft2013-10-181-1/+11
|
* APIDump: Added example code to cItem.madmaxoft2013-10-181-0/+32
|
* APIDump: Documented cItem's variables.madmaxoft2013-10-181-4/+11
|
* APIDump: Added support for member variables.madmaxoft2013-10-182-4/+59
|
* APIDump: Added prettify's license.madmaxoft2013-10-181-0/+191
|
* APIDump: Fixed offline JS.madmaxoft2013-10-185-108/+41
| | | | This time it's really offline :)
* APIDump: Do not list empty Constants or Functions sections.madmaxoft2013-10-181-14/+46
| | | | Also implemented writing inherited constants.
* APIDump: Split long code into functions.madmaxoft2013-10-182-94/+110
|
* APIDump: Ignore internal APIDump stuff.madmaxoft2013-10-181-0/+2
|
* APIDump: using local JS files instead of networked.madmaxoft2013-10-183-4/+100
| | | | This allows offline API browsing.
* APIDump: Renamed output for helper stuff.madmaxoft2013-10-181-2/+2
| | | | | | Undocumented objects are output to _undocumented.lua Overdocumented objects are output to _unexported-documented.txt Missing pages are output to _missingPages.txt
* APIDump: Makes a list of bad links.madmaxoft2013-10-181-17/+78
| | | | This fixes #219.
* APIDump: Improved page titles.madmaxoft2013-10-181-2/+2
|
* APIDump: Documented HOOK_PLAYER_RIGHT_CLICKING_ENTITY.madmaxoft2013-10-181-0/+20
|
* APIDump: Documented HOOK_PLAYER_SHOOTING.madmaxoft2013-10-181-0/+25
|
* APIDump: Documented HOOK_PLAYER_SPAWNED.madmaxoft2013-10-181-0/+25
|
* APIDump: Documented HOOK_PLAYER_TOSSING_ITEM.madmaxoft2013-10-181-0/+23
|
* APIDump: Documented HOOK_PLAYER_USED_BLOCK.madmaxoft2013-10-171-0/+39
|
* APIDump: Documented HOOK_PLAYER_USED_ITEM.madmaxoft2013-10-171-0/+39
|
* APIDump: Documented HOOK_PLAYER_USING_BLOCK.madmaxoft2013-10-171-2/+45
|
* APIDump: Documented HOOK_PLAYER_USING_ITEM.madmaxoft2013-10-171-0/+36
|
* APIDump: Documented HOOK_UPDATED_SIGN.madmaxoft2013-10-171-0/+30
|
* APIDump: Documented HOOK_TICK.madmaxoft2013-10-171-0/+22
|
* APIDump: Documented HOOK_TAKE_DAMAGE.madmaxoft2013-10-171-0/+24
|
* APIDump: Documented HOOK_UPDATING_SIGN.madmaxoft2013-10-171-0/+50
|
* APIDump: More robust against missing APIDesc items.madmaxoft2013-10-171-3/+3
|
* APIDump: Documented HOOK_WEATHER_CHANGED.madmaxoft2013-10-161-0/+21
|
* APIDump: Documented HOOK_WEATHER_CHANGING.madmaxoft2013-10-161-0/+24
|
* APIDump: Documented HOOK_WORLD_TICK.madmaxoft2013-10-161-0/+24
|
* APIDump: Nicer HTML visage.madmaxoft2013-10-163-158/+230
| | | | | | * Fixed whacky HTML indentation + Added fancy CSS! + Now HTML5 compatible!
* Merge remote-tracking branch 'upstream/master'Tiger Wang2013-10-153-15/+978
|\
| * Added HOOK_PLAYER_RIGHT_CLICKAlexander Harkness2013-10-151-8/+38
| |
| * APIDump: Linkification supports #anchors.madmaxoft2013-10-151-2/+33
| | | | | | | | This implements #198.
| * APIDump: Documented HOOK_SPAWNING_MONSTER.madmaxoft2013-10-151-0/+26
| |
| * APIDump: Documented HOOK_SPAWNING_ENTITY.madmaxoft2013-10-151-2/+34
| |
| * APIDump: Documented HOOK_SPAWNED_MONSTER.madmaxoft2013-10-151-1/+21
| |
| * APIDump: Documented HOOK_SPAWNED_ENTITY.madmaxoft2013-10-151-0/+20
| |
| * APIDump: Documented HOOK_PRE_CRAFTING.madmaxoft2013-10-151-0/+30
| |
| * APIDump: Documented HOOK_POST_CRAFTING.madmaxoft2013-10-151-0/+29
| |
| * APIDump: Documented HOOK_PLAYER_PLACING_BLOCK.madmaxoft2013-10-151-0/+38
| |
| * APIDump: Documented HOOK_PLAYER_MOVING and HOOK_PLAYER_PLACED_BLOCK.madmaxoft2013-10-151-0/+53
| |
| * APIDump: Documented HOOK_PLAYER_LEFT_CLICK.madmaxoft2013-10-151-0/+40
| |
| * APIDump: Documented HOOK_PLAYER_JOINED.madmaxoft2013-10-151-0/+22
| |
| * APIDump: Documented HOOK_PLAYER_EATING.madmaxoft2013-10-151-0/+20
| |
| * APIDump: Documented HOOK_PLAYER_BROKEN_BLOCK.madmaxoft2013-10-151-2/+31
| |
| * APIDump: Documented HOOK_PLAYER_BREAKING_BLOCK.madmaxoft2013-10-151-0/+30
| |
| * APIDump: Documented HOOK_PLAYER_ANIMATION.madmaxoft2013-10-141-0/+21
| |
| * APIDump: Removed HOOK_MAX and HOOK_NUM_HOOKS from documentation.madmaxoft2013-10-141-1/+6
| | | | | | | | They're not really hooks, just constants for the maximum.
| * APIDump: Documented HOOK_LOGIN.madmaxoft2013-10-141-0/+25
| |
| * APIDump: Documented HOOK_KILLING.madmaxoft2013-10-141-0/+27
| |
| * APIDump: Documented HOOK_HOPPER_PUSHING_ITEM.madmaxoft2013-10-141-3/+28
| |
| * APIDump: Documented HOOK_HOPPER_PULLING_ITEM.madmaxoft2013-10-141-0/+23
| |
| * Add the first line back.Alexander Harkness2013-10-141-0/+1
| |
| * Stairs crafting fixestonibm192013-10-141-1/+4
| | | | | | | | Fixes #233 Added Stone Brick Stairs crafting recipe and added alternative crafting recipes for Nether Brick Stairs and Quartz Stairs
| * APIDump: Documented HOOK_HANDSHAKE.madmaxoft2013-10-141-0/+23
| |
| * APIDump: Documented HOOK_EXPLODING.madmaxoft2013-10-141-0/+44
| |
| * APIDump: Documented HOOK_EXPLODED.madmaxoft2013-10-141-0/+43
| |
| * APIDump: Documented HOOK_EXECUTE_COMMAND.madmaxoft2013-10-141-0/+25
| |
| * APIDump: Updated the template for undocumented hooks.madmaxoft2013-10-141-2/+2
| |
| * APIDump: Documented HOOK_DISCONNECT.madmaxoft2013-10-141-0/+26
| |
| * APIDump: Fixed info missing from cCraftingRecipe.madmaxoft2013-10-141-1/+1
| |
| * APIDump: Documented HOOK_CRAFTING_NO_RECIPE.madmaxoft2013-10-141-0/+26
| |
| * APIDump: Documented HOOK_COLLECTING_PICKUP.madmaxoft2013-10-141-0/+27
| |
| * APIDump: Documented HOOK_CHUNK_UNLOADING.madmaxoft2013-10-141-0/+23
| |
| * APIDump: Documented HOOK_CHUNK_UNLOADED.madmaxoft2013-10-141-0/+22
| |
| * APIDump: Documented HOOK_CHUNK_GENERATING.madmaxoft2013-10-141-1/+33
| |
| * APIDump: Fixed undocumented hook param generator.madmaxoft2013-10-141-8/+9
| |
| * APIDump: Added example to HOOK_CHUNK_GENERATED.madmaxoft2013-10-141-0/+37
| |
| * APIDump: Documented HOOK_CHUNK_GENERATED.madmaxoft2013-10-141-0/+26
| |
| * APIDump: The undocumented hooks template now has 8 params.madmaxoft2013-10-141-0/+7
| | | | | | | | This allows for easier copypasting, hooks with less than 9 params don't need an extra copy-paste for a new param entry.
| * APIDump: Documented HOOK_CHUNK_AVAILABLE.madmaxoft2013-10-141-0/+21
| |
* | Merge submodule changesTiger Wang2013-10-133-0/+6
|/
* APIDump: Documented the webserver vs world threads.madmaxoft2013-10-121-2/+58
| | | | This fixes #12.
* APIDump: Added pretty-printing to code examples.madmaxoft2013-10-122-30/+35
|
* APIDump: Added an OnBlockToPickups() code example.madmaxoft2013-10-121-0/+26
|
* APIDump: Added the possibility of extra code examples for hooks.madmaxoft2013-10-121-2/+8
|
* APIDump: Documented OnBlockToPickups.madmaxoft2013-10-121-0/+30
|
* APIDump: Hook notes are linkified.madmaxoft2013-10-121-1/+1
|
* APIDump: Fixed extra pages copying.madmaxoft2013-10-091-1/+7
|
* APIDump: Implemented basic hook documentation.madmaxoft2013-10-092-11/+152
|
* APIDump: Documented the new cFile API functions.madmaxoft2013-10-091-0/+24
|
* APIDump: Added support for extra pages.madmaxoft2013-10-093-3/+52
| | | | Referenced by file links and titles and copied directly from the plugin folder to the dest folder.
* APIDump: Taking advantage of the new cFile API.madmaxoft2013-10-091-9/+7
|
* Merge branch 'magicalcarpets' of git://github.com/tigerw/MCServer into tigerw-magicalcarpetsmadmaxoft2013-10-082-8/+26
|\
| * Some additional changesTiger Wang2013-10-082-18/+7
| | | | | | | | | | * Revert to Core:Call() - Removed variable
| * Made MagicCarpet more magical!Tiger Wang2013-10-042-6/+32
| |
| * Fixed discrepancyTiger Wang2013-10-021-1/+1
| |
| * MagicCarpet Fixes [SEE DESC]Tiger Wang2013-10-021-6/+9
| | | | | | | | | | | | + Version 2! * Fixed loading plugin + Now uses Core messaging functions
* | Fixed WebAdmin template after moving the memory stats functions to cRoot.madmaxoft2013-10-081-1/+1
| |
* | Updated plugins.Alexander Harkness2013-10-073-6/+0
| |
* | APIDump: Brought cItem docs up-to-date.madmaxoft2013-10-051-5/+7
| |
* | APIDump: Added cLineBlockTracer documentation.madmaxoft2013-10-041-4/+86
| |
* | APIDump: Documented cPluginSTRWarrior2013-10-041-5/+9
| |
* | APIDump: Added the cWorld:IsWeatherXXX() functions.madmaxoft2013-10-041-1/+5
| |
* | APIDump: Removed ignored classes logging.madmaxoft2013-10-021-2/+0
| |
* | APIDump: Fixed operator == rename having bad DocID.madmaxoft2013-10-022-3/+7
| |
* | Merge pull request #193 from tigerw/bugfixesMattes D2013-10-011-9/+11
|\ \ | | | | | | Startup messages revision.
| * | Updated READMETiger Wang2013-09-281-9/+11
| |/ | | | | | | See for yourself :)
* | APIDump: Added equality operator renaming.madmaxoft2013-09-301-0/+3
| |
* | APIDump: Fixed overloaded functions' docs.madmaxoft2013-09-291-18/+45
| |
* | APIDump: Added more inheritance and linkification.madmaxoft2013-09-291-4/+6
| |
* | APIDump: Linkified cDropSpenser constants.madmaxoft2013-09-291-2/+2
| |
* | APIDump: Added the possibility to ignore classes. Ignoring Lua builtins.madmaxoft2013-09-292-1/+40
| |
* | APIDump: Updated cEntity docs.madmaxoft2013-09-271-33/+115
| |
* | APIDump: Documented cServerSTRWarrior2013-09-271-1/+6
| |
* | APIDump: Completed cCuboid docs.madmaxoft2013-09-261-6/+28
| |
* | APIDump: Completed cCraftingGrid's documentation.madmaxoft2013-09-261-3/+8
| |
* | APIDump: completed cChestEntity docs.madmaxoft2013-09-261-1/+30
| |
* | APIDump: Updated cBlockArea docs.madmaxoft2013-09-251-0/+3
| |
* | APIDump: Updated cChunkDesc docs.madmaxoft2013-09-251-2/+25
| |
* | APIDump: Updated cClientHandle documentationmadmaxoft2013-09-251-5/+7
| |
* | APIDump: Documented the cBoundingBox class.madmaxoft2013-09-241-2/+35
| |
* | Added a simple valgrind script for easier testing.madmaxoft2013-09-223-0/+8
| |
* | APIDump: Forgot a function in globals.STRWarrior2013-09-221-0/+1
| |
* | APIDump: Documented the globals.STRWarrior2013-09-221-0/+37
| |
* | Implemented cWebAdmin:GetMemoryUsage() on Linux proper.madmaxoft2013-09-211-2/+2
| | | | | | | | Also the function now returns an int, number of KiB used, or -1 on failure.
* | Merge pull request #179 from tonibm19/patch-6Mattes D2013-09-211-0/+30
|\ \ | | | | | | Added new mobs health.
| * | Added new mobs health.tonibm192013-09-191-0/+30
| | | | | | | | | | | | Don't merge until tigerw PR is merged. Health set according to minecraftwiki.
* | | APIDump: Automatic corrections.madmaxoft2013-09-191-83/+78
|/ /
* | APIDump: Updated cPluginManager documentation.madmaxoft2013-09-181-16/+88
| |
* | APIDump: Small cRoot improvement.STRWarrior2013-09-181-17/+17
| |
* | Documented cRoot.STRWarrior2013-09-171-0/+19
| |
* | APIDump: Additional information is linkified, too.madmaxoft2013-09-161-1/+1
| |
* | APIDump: Added a slight visual style to <pre> tagsmadmaxoft2013-09-161-0/+5
| |
* | Updated the Core to the latest.madmaxoft2013-09-161-0/+0
|/ | | | Does this even matter in any way?
* APIDump: Added callback examples to cWorld.madmaxoft2013-09-161-0/+60
|
* APIDump: All cWorld functions are documented.madmaxoft2013-09-161-25/+44
|
* APIDump: Next batch of cWorld documentation.madmaxoft2013-09-151-35/+34
|
* APIDump: Added a first part of cWorld documentation.madmaxoft2013-09-151-2/+118
|
* APIDump: Fixed linkification with multiple links in one string.madmaxoft2013-09-151-2/+2
|
* APIDump: Undescribed classes are listed as undocumented.madmaxoft2013-09-141-14/+16
| | | | Previously class that was not listed in APIDesc was not listed in Undocumented.
* APIDump: Added most missing classes as empty templates.madmaxoft2013-09-141-1/+93
|
* APIDump: Removed most unexported-documented classes.madmaxoft2013-09-141-232/+53
| | | | Also fixed most functions that were erroneously parsed as constants by the automatic wiki import.
* APIDump: Fixed dumping when APIDesc doesn't contain Constants section.madmaxoft2013-09-141-10/+14
|
* APIDump: Fixed cLuaWindow documentation.madmaxoft2013-09-141-62/+64
|
* APIDump: Added creating the list of unexported-documented API objects.madmaxoft2013-09-141-0/+24
|
* APIDump: Implemented creating the list of undocumented API objects.madmaxoft2013-09-141-3/+65
|
* APIDump: Added a simple header to the class index.madmaxoft2013-09-141-2/+3
|
* APIDump: Added cArrowEntity documentationmadmaxoft2013-09-141-0/+29
|
* APIDump: Added an example on how to fill in the documentation.madmaxoft2013-09-141-8/+55
|
* APIDump: Added support for additional info exported with each class.madmaxoft2013-09-142-1/+91
|
* APIDump: Added support for overloaded functions.madmaxoft2013-09-142-13/+57
|
* APIDump: Do not dump the g_APIDesc and APIDump's functions.madmaxoft2013-09-142-4/+13
|
* APIDump: Moved sorting after the renaming.madmaxoft2013-09-142-21/+25
|
* APIDump: Linkifications works for simple {{link}} too.madmaxoft2013-09-141-1/+3
|
* APIDump: Added special-function renaming (constructor, operators).madmaxoft2013-09-142-5/+22
|
* APIDump: Added more globally-ignored functions.madmaxoft2013-09-141-1/+4
|
* APIDump: Ignored functions are removed from undocumented classes, too.madmaxoft2013-09-141-10/+9
|
* Updated default permissionstonibm192013-09-131-1/+1
| | | Added 2 vanilla commands (/me and /tell) permissions to default.
* APIDump: Ignoring some Lua internal stuff from API-scanning.madmaxoft2013-09-131-4/+10
|
* APIDump: Fixed link in cBlockArea's docsmadmaxoft2013-09-131-3/+3
|
* APIDump: Basic CSS file makes tables visiblemadmaxoft2013-09-132-0/+35
|
* APIDump: Constructors are renamed and can have documentationmadmaxoft2013-09-132-2/+7
|
* APIDump: Added support for ignoring functions; ignoring the lua/tolua internals.madmaxoft2013-09-132-14/+30
|
* APIDump: Fixed cItem's description.madmaxoft2013-09-131-12/+17
|
* APIDump: Linkification works.madmaxoft2013-09-131-4/+3
|
* APIDump: Added descendants specified through inheritance.madmaxoft2013-09-131-27/+59
|
* APIDump: Added support for inheritancemadmaxoft2013-09-131-29/+68
|
* APIDump: Read through and fixed the first few classes desc.madmaxoft2013-09-121-92/+71
|
* APIDump: Imported the descriptions from the wiki.madmaxoft2013-09-122-156/+1268
|
* APIDump: Fixed nestingmadmaxoft2013-09-121-3/+2
|
* APIDump: Processing wiki-style bullets (" * ") into <li> tagmadmaxoft2013-09-121-0/+4
|
* APIDump: Added parsing for older wiki format, "Class Definition" header.madmaxoft2013-09-121-6/+44
|
* APIDump: The APIDesc from wiki can be read back by Lua.madmaxoft2013-09-121-10/+21
|
* APIDump: replacing wiki-style markup with APIDump-style markupmadmaxoft2013-09-121-0/+3
|
* APIDump: Fixed parsing tables with wiki-links.madmaxoft2013-09-121-10/+33
| | | | Also added real class name, description and constructor renaming.
* APIDump: Fixed a missing tabmadmaxoft2013-09-111-1/+1
|
* APIDump: Added a testing constant descriptionmadmaxoft2013-09-111-0/+4
|
* APIDump: Initial implementation of wiki-to-lua conversionmadmaxoft2013-09-111-3/+85
|
* APIDump: First attempt at outputting annotations in the HTML formatmadmaxoft2013-09-113-85/+179
|
* DumpAPI: Basic HTML output for classesmadmaxoft2013-09-102-36/+149
|
* APIDump now produces wiki-style tables of functions and constants.madmaxoft2013-09-093-6/+146
| | | | Part of #116.
* Merged branch 'Projectiles'.madmaxoft2013-09-071-4/+18
|\
| * Implemented ghast fireball and firecharge projectilesmadmaxoft2013-09-071-0/+16
| |
| * Debuggers plugin: Removed unneeded globalmadmaxoft2013-09-071-4/+2
| |
* | Updated Core and ProtectionTiger Wang2013-09-022-0/+0
|/
* Updated ProtectionAreas to the latest version.madmaxoft2013-08-301-0/+0
|
* Debuggers: added a test cmd to spawn arrows.madmaxoft2013-08-221-0/+18
|
* Updated Core and ProtectionAreas to their latest versions.madmaxoft2013-08-212-0/+0
|
* Updated Core to the latest versionmadmaxoft2013-08-211-0/+0
|
* Updated internal plugins to the #121 API.madmaxoft2013-08-215-54/+51
|
* Updated the Debuggers plugin to the #121 API.madmaxoft2013-08-211-9/+33
|
* Ignoring all memdump files.madmaxoft2013-08-211-1/+1
|
* Updated to the latest Core.madmaxoft2013-08-201-0/+0
|
* Debuggers: Added continuous hunger reporting.madmaxoft2013-08-191-20/+49
| | | | Showcases the OnWorldTick() hook to fire events at regular intervals. Will be used for debugging the issues related to hyper-hunger.
* Debuggers plugin: Added details about pickups to the "/le" command.madmaxoft2013-08-191-1/+7
|
* TransAPI disappeared!Tiger Wang2013-08-181-0/+6
|
* Merge branch 'master' of https://github.com/tigerw/MCServer into tigerw-masterTiger Wang2013-08-182-7/+4
|\ | | | | | | | | | | | | Conflicts: source/Piston.cpp Merged pull request and fixed merge conflicts
| * Enhancements to Tabcompletion and Compile FixTiger Wang2013-08-181-6/+0
| | | | | | | | | | | | Tab complete now finds the last word and matches accordingly, with a 20% increase in speed! Fixed missing comma breaking compilation
| * Merge remote-tracking branch 'upstream/master'Tiger Wang2013-08-187-133/+6
| |\
| * | Bugfix Update [SEE DESC}Tiger Wang2013-08-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added stained clay, coal block, and hardened clay Block IDs Added stained clay and carpet block Metas Fixed bug with sticky retract bailing out but not unsetting arm Fixed autocomplete not working when not at the first character, fixes #64 Added furnace recipes for hardened clay and coal and coal blocks
* | | Added cWindow property manipulation API.madmaxoft2013-08-181-0/+9
| |/ |/| | | | | Now enchantment table and furnace properties can be set by a plugin
* | Added transapi as a submodule - so it more accurately reflects the source origin.Alexander Harkness2013-08-164-131/+6
| |
* | Added the removed plugins as submodules.Alexander Harkness2013-08-163-2/+0
|/
* Removed squirrel plugin remnantsmadmaxoft2013-08-161-13/+0
|
* Moved ProtectionAreas into a separate repositorymadmaxoft2013-08-1611-1446/+2
|
* No more Core in the MCServer repomadmaxoft2013-08-1643-3549/+1
|
* Fixed the Reload and Save-all console commands.madmaxoft2013-08-151-7/+74
| | | | They were broken by the PerWorldThreads update removing cServer:BroadcastMessage() and cServer:SendMessage()
* Exported cWorld:BroadcastChat() to the Lua API; used in the Core.madmaxoft2013-08-131-19/+18
|
* Fixed new crafting recipes.tonibm192013-08-131-1/+7
| | | I forgot to change items.ini in my latest merged PR, sorry for that
* Added the transapi permission because yay!Alexander Harkness2013-08-131-2/+2
|
* Added TransAPI as a default plugin.Alexander Harkness2013-08-131-0/+1
|
* Add TransAPI plugin in.Alexander Harkness2013-08-133-0/+131
| | | | Merge remote-tracking branch 'transapirem/master' into transapi
* Squashed commit of the following:Alexander Harkness2013-08-139-165/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 322b33d95a8486b22c3c259ce241976516a88a4b Merge: b3d6dc7 954b682 Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 13 09:54:51 2013 -0700 Merge pull request #24 from mc-server/sudo Added sudo and do. commit 954b682450503815a2a81e1ab51a190aeeb0bd8d Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 13 17:00:56 2013 +0100 Added sudo and do. commit b3d6dc73347c3ec9e49502a2250aff4ab664e870 Merge: 735f1da b39b144 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 23:00:24 2013 -0700 Merge pull request #22 from mc-server/functions-squashing Squash helper functions around the source into just one file. commit 735f1dac5e0d5a9d98dd2e0b5833e01d925487a0 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 19:42:42 2013 +0100 Re-added the downfall command. commit b39b144c6afc246647d46ed0ac1b66f9b46e2cd3 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 19:01:05 2013 +0100 Dragged out TeleportToPlayer and dumped it in the new functions.lua. commit 5ea91abb6b9a85d91ba82d125b6897a2e743937e Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 19:00:01 2013 +0100 Dragged out the CheckHardcore function. commit dc00e218cdf55252e5e8d5984e4e63bf11457d5e Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 18:58:42 2013 +0100 Dragged yet more functions out. commit 1e95ca25d71770382074d5e379cbfea7288f6e0d Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 18:57:36 2013 +0100 Dragged some functions out of kick. commit 9168dee74d0b3c9f3c7a6fdb756798095ae444a4 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 18:56:37 2013 +0100 Dragged the helper functions out of console.lua. commit 0f48daf02c0b823ae7fe0863d2a1292e53f0fa22 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 18:54:40 2013 +0100 Dumped messages in the functions file, removed it's own special one. commit 9dc3f0d18af4a411f8a40b525e49e7598159f450 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:46:05 2013 +0100 Alpha-sorted the command bindings. commit e22d2fcf3dd840b1a051f3b5b529040213c151c6 Merge: 3ff68e9 9e285ea Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:35:46 2013 +0100 Merge branch 'vanilla-commands' Conflicts: main.lua weather.lua commit 3ff68e9690ff365fd57343dd8d0609bdc6b6bb54 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:22:33 2013 +0100 Cleaned up some files and also killed some demons that had survived the messaging update. commit 9e285ea6ceb3f2e279052fd10227a6dfeb48c062 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 15:09:28 2013 +0100 Fixed tabs and conforms to standards commit e092a35988074b7ebd58068c0b24a235a98596df Merge: f4038d2 c1c563b Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:06:35 2013 +0100 Merge branch 'message-standards' Conflicts: console.lua item.lua main.lua commit d68c84b8b74a54cc15965036d27ad0b1dde2d603 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:56:08 2013 +0100 Added /msg alias commit c1c563bda69d51cf5454c7584a25fa3968f0e3ad Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:55:56 2013 +0100 Cleaned up console a little and switched to new message system. Also fixed missing eof newline. commit dc6c5fafc32034321f6827b0c21e99212e2d559b Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:54:47 2013 +0100 Cleaned up web-perms and switched to new message system. Also added missing eof newline. commit f739fc83ace22cf1ee966ad5514bd3c708d08c20 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:54:10 2013 +0100 Remove command commit dc5ce476e871b425f79e510522e35db5608161d4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:52:40 2013 +0100 Now conforms to chat standards commit 41e15803541f4a20ee5baf92106e2ba1cb40cbd7 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:51:21 2013 +0100 Cleaned up weather and switched to new message system. Also added missing eof newline. commit d19caacaad67addaa30d1b6f48ec47c265b4832e Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:50:07 2013 +0100 Cleaned up viewdistance and switched to new messaging system. Also added missing eof newline. commit d6f6603773ae7beb87cb951988e7738ba9c1e538 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:48:34 2013 +0100 Cleaned up top and changed to new messaging system. Also fixed missing eof newline. commit f50fb793a1332c1cc87b3c6e0dfa283f9dfc9e61 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:47:28 2013 +0100 Cleaned up the time file and switched to new messaging system. commit aff076175ded4823da817547349537f3c33d4a43 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:43:38 2013 +0100 Now comforms to help standards commit 4c416d1d1944fa00d4bf07f2580b29b530545bb3 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 14:09:29 2013 +0200 Added /tell [playername] [message] commit 56db86812bfa7c4482b563af71846616a1716434 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 14:06:47 2013 +0200 Added /tell [playername] [message] commit 1b5f32e3b577474b0878dfe9211cafbdb00790bb Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 12:58:53 2013 +0100 Cleaned up teleport and switched to new message system. Also added missing eof newline. commit fb96b73831679735a9677d7f520d19d8276a15d6 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 13:33:49 2013 +0200 Added /weather [Clear/Rain/Thunder] commit 1e4676965a3ce6dc79912e0c8686b7de5026eb42 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 13:32:04 2013 +0200 Added /weather [Clear/Rain/Thunder] commit f4038d2f9d748df54af054661a18630219ebd25c Author: STRWarrior <niels.breuker@hotmail.nl> Date: Sun Aug 11 13:08:24 2013 +0200 changed /downfall to /toggledownfall becouse thats the way it is in vanilla. commit acdcefe61919e9ecbace1ee2f56dc24c94ffa4dc Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 13:02:35 2013 +0200 Fixed /tpa and /tpaccept commit 9f526a63f07497fa7542515aa17afce9adc34abb Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 12:59:22 2013 +0200 Updated README (new commands added) commit 717239095c638d86859f1b1b449e6bea0d093f02 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:37:11 2013 +0100 Cleaned up spawn.lua and changed to new message system. Also fixed missing eof newline. commit 2a6a693efcffa1145270bc79ce403e5038a88308 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:35:58 2013 +0100 Cleaned up the save-reload-stop file. Also fixed missing eof newline. commit d32223e4361509a598ee528261b113d92f402e7e Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:35:08 2013 +0100 Cleaned up the regen file and changed to the new message system. Also fixed missing eof newline. commit 7635e0cd1be051d60bbb6127f04b5b9b8decf51f Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:30:47 2013 +0100 Cleaned up rank-groups.lua and changed to new message system. Also fixed missing eof newline. commit 204e38aa33541794745a671092a3b5b37388f6d2 Merge: 42e95a6 a319162 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 00:54:49 2013 -0700 Merge pull request #19 from mc-server/vanilla-commands Added /kill and /clear commit a31916277fcef2925fc96ce6833dac1ab7c62905 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 23:11:21 2013 +0200 You die if you dont specify a player commit 0aca0d8431cc69f841a3e3f3a0ada81c1d8b1fbb Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 21:05:03 2013 +0100 Cleaned up the portal and worlds file and added new message system. Also fixed missing eof newline. commit 9f4a1fe0ef18a3ee48ea5629969854e5a60616a0 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 21:01:23 2013 +0100 Cleaned up plugins file and added new message system. also fixed missing eof newline. commit 9f04dfef81e8705597aac8fbc8912e3c3b9be6e8 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:23:41 2013 +0200 fixed /clear commit 13e9007844f15050ad4ecea79246d31426975898 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 20:17:06 2013 +0100 Cleaned up the motd file. commit 6c8de9b3594221fbb092d9989166826754641eda Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:13:42 2013 +0200 Added /clear command commit 97fe00aac1bf7d497e08a9622bb32786d64b4c0b Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:11:31 2013 +0200 Added /clear command commit 8dec3c04acb9814db1c89cba2094494fd321e40a Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 20:11:26 2013 +0100 Cleaned up the me file and changed to new message system. commit 72c401fe65589adce446e7de59b3c47ac2147fc9 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 20:09:26 2013 +0100 Cleaned up the main file, and changed to the new message system. commit c48604becd8da56590c9374a641a665d1d6dedab Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:05:24 2013 +0200 Added /kill commit 41b90ad60fc944aa307447491e511879e64f108a Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:03:47 2013 +0200 added /kill commit b2ffcfb1ea36758b013e1ea85c2515485ed30543 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:57:50 2013 +0100 Added new messaging system to locate.lua. Also added the eof newline. commit 318e4dc85eb10d7d97279a19f2d21f3ec75c4598 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:53:51 2013 +0100 Cleaned up the kick command and added new message system. Also fixed missing eof newline. commit 3d864b47a826911181604f83ea72ca0416ff25ce Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:49:56 2013 +0100 Cleaned the /i a bit more. commit 7c26e76048885e2cbc7bc5b57d6ba38b7475e2a5 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:48:19 2013 +0100 Changed to the new message system for /i. Also fixed eof newline. commit 1bc7f1844942a4a675c125b06c81b418b009c037 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:37:35 2013 +0100 Cleaned up help massively and implemented the new messages. Also added new eof newline. commit 150c88ccfe2d6e5210f95c31e56f824832a0c98c Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:36:14 2013 +0100 Added spaces after the tag for the messages so the results look good. commit a144b535cd51805ef8badfc6645aa654370913ed Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:30:21 2013 +0100 Added new messages to gm.lua. Also added spaces in functions and added a eof newline. commit 2237f62c1c6e40d7b2a2986916b2a6e1879f6bfd Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:23:29 2013 +0100 Removed a semicolon that was creeping around in the messages file. commit fbe68a2c28f0b7d54d8527b54a737218bc9a6da4 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:22:48 2013 +0100 Fixed derpy spelling and added new messages to the give command. Also cleaned up the functions in the give command file. commit 66b33c0436d084a2fed1248d63f074c768545ad0 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:04:55 2013 +0100 Added new messages to the ban and unban command. Also cleaned up the function calls and added the eof newline. commit c90dda25990de8ab6d529e83c9620d9bc8c9b9f1 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 17:56:43 2013 +0100 Added new messages to /back command. Also fixed newline at end of file. commit 42e95a6d32da7227a84a5202a2e72fcf4007aaf2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 17:04:36 2013 +0100 Fix concatenation issue commit 7432c25306b8125fca13100048b693bebad92d3d Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:44:47 2013 +0100 Fix of bracket commit 4e0b3f905e2f937951eebd322b204f8da3e745cd Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 16:38:53 2013 +0100 Fixed bugs in the console command file that were stopping it from working. There was an extra `end` and an extra `)` commit ea1215da739e65585b448103e0bf1bebec00dfac Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:06:30 2013 +0100 Fixed duplicate leave messages commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132 Merge: b273df1 1a6f70f Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 06:05:32 2013 -0700 Merge pull request #13 from mc-server/give-console Added a console command for giving players items. commit b273df17c759eba82342466cf6e2291d84b77ab3 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 08:27:14 2013 +0100 Hopefully fixed the /i command not working. I had not defined the newSplit variable before using it. commit 8a74037cc092d048364299f18e07c02c85ae3737 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:18:48 2013 +0100 Fixed the contributors not being on their own lines. commit 57d842cbc61464a613c248d043a3fe7254d931a2 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:17:03 2013 +0100 Added temporary messages.lua, seeing if people like it. commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:26:12 2013 +0100 Fix the README - fixes #15 commit cc438b3229cdb730d308479c59491b5e66130118 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:01:48 2013 +0100 Alpha-sort the console commands. commit aa22f647c27d50b3ccf7e763927bd24329da3a56 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:00:44 2013 +0100 Alpha-sort the commands when they are bound. commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab Merge: a485101 01ccfaa Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:41:38 2013 -0700 Merge pull request #14 from mc-server/ireplace Told the player receiving items what they are getting, and fixed the console log. commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:39:36 2013 +0100 Told the player reveiving items what they are getting, and fixed the console log. commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:35:48 2013 +0100 Added a console command for giving players items. commit a4851010b2ff29bb55feb6331ea6ddec28532a0f Merge: 0ffbd4a ba923e4 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:01:47 2013 -0700 Merge pull request #12 from mc-server/ireplace Re-implement the /i command and make /give conform to the vanilla standards commit ba923e4764b6a3064be6aacea86e059828b2d0e6 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:59:53 2013 +0100 Added /item and made /i an alias of it. commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:46:14 2013 +0100 Kept the stuff alpha-sorted. commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:45:09 2013 +0100 Removed some extra semicolons. commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:44:06 2013 +0100 Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good. commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add Author: tonibm19 <tonibm19@gmail.com> Date: Wed Aug 7 13:52:02 2013 +0200 Fixed typo commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 6 18:23:51 2013 +0100 Re-implement the /i command and make /give conform to the vanilla standards. This commit is experimental and may fail. Please test it! commit f4ac029a0f1903fc9e49365117a81293303c8811 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Aug 2 23:23:15 2013 +0100 Miscellaneous Changes Reduced ban/unban code size a little. Clarified console commands. Added commented code to onjoin when bugs are fixed. Removed embarrassing server wide messages. commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* Recipe Updatestonibm192013-08-131-3/+10
| | | Added almost all 1.6 recipes
* Dragged in the latest core changes.Alexander Harkness2013-08-111-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 735f1dac5e0d5a9d98dd2e0b5833e01d925487a0 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 19:42:42 2013 +0100 Re-added the downfall command. commit 9dc3f0d18af4a411f8a40b525e49e7598159f450 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:46:05 2013 +0100 Alpha-sorted the command bindings. commit e22d2fcf3dd840b1a051f3b5b529040213c151c6 Merge: 3ff68e9 9e285ea Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:35:46 2013 +0100 Merge branch 'vanilla-commands' Conflicts: main.lua weather.lua commit 3ff68e9690ff365fd57343dd8d0609bdc6b6bb54 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:22:33 2013 +0100 Cleaned up some files and also killed some demons that had survived the messaging update. commit 9e285ea6ceb3f2e279052fd10227a6dfeb48c062 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 15:09:28 2013 +0100 Fixed tabs and conforms to standards commit e092a35988074b7ebd58068c0b24a235a98596df Merge: f4038d2 c1c563b Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:06:35 2013 +0100 Merge branch 'message-standards' Conflicts: console.lua item.lua main.lua commit d68c84b8b74a54cc15965036d27ad0b1dde2d603 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:56:08 2013 +0100 Added /msg alias commit c1c563bda69d51cf5454c7584a25fa3968f0e3ad Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:55:56 2013 +0100 Cleaned up console a little and switched to new message system. Also fixed missing eof newline. commit dc6c5fafc32034321f6827b0c21e99212e2d559b Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:54:47 2013 +0100 Cleaned up web-perms and switched to new message system. Also added missing eof newline. commit f739fc83ace22cf1ee966ad5514bd3c708d08c20 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:54:10 2013 +0100 Remove command commit dc5ce476e871b425f79e510522e35db5608161d4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:52:40 2013 +0100 Now conforms to chat standards commit 41e15803541f4a20ee5baf92106e2ba1cb40cbd7 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:51:21 2013 +0100 Cleaned up weather and switched to new message system. Also added missing eof newline. commit d19caacaad67addaa30d1b6f48ec47c265b4832e Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:50:07 2013 +0100 Cleaned up viewdistance and switched to new messaging system. Also added missing eof newline. commit d6f6603773ae7beb87cb951988e7738ba9c1e538 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:48:34 2013 +0100 Cleaned up top and changed to new messaging system. Also fixed missing eof newline. commit f50fb793a1332c1cc87b3c6e0dfa283f9dfc9e61 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:47:28 2013 +0100 Cleaned up the time file and switched to new messaging system. commit aff076175ded4823da817547349537f3c33d4a43 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:43:38 2013 +0100 Now comforms to help standards commit 4c416d1d1944fa00d4bf07f2580b29b530545bb3 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 14:09:29 2013 +0200 Added /tell [playername] [message] commit 56db86812bfa7c4482b563af71846616a1716434 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 14:06:47 2013 +0200 Added /tell [playername] [message] commit 1b5f32e3b577474b0878dfe9211cafbdb00790bb Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 12:58:53 2013 +0100 Cleaned up teleport and switched to new message system. Also added missing eof newline. commit fb96b73831679735a9677d7f520d19d8276a15d6 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 13:33:49 2013 +0200 Added /weather [Clear/Rain/Thunder] commit 1e4676965a3ce6dc79912e0c8686b7de5026eb42 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 13:32:04 2013 +0200 Added /weather [Clear/Rain/Thunder] commit f4038d2f9d748df54af054661a18630219ebd25c Author: STRWarrior <niels.breuker@hotmail.nl> Date: Sun Aug 11 13:08:24 2013 +0200 changed /downfall to /toggledownfall becouse thats the way it is in vanilla. commit acdcefe61919e9ecbace1ee2f56dc24c94ffa4dc Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 13:02:35 2013 +0200 Fixed /tpa and /tpaccept commit 9f526a63f07497fa7542515aa17afce9adc34abb Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 12:59:22 2013 +0200 Updated README (new commands added) commit 717239095c638d86859f1b1b449e6bea0d093f02 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:37:11 2013 +0100 Cleaned up spawn.lua and changed to new message system. Also fixed missing eof newline. commit 2a6a693efcffa1145270bc79ce403e5038a88308 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:35:58 2013 +0100 Cleaned up the save-reload-stop file. Also fixed missing eof newline. commit d32223e4361509a598ee528261b113d92f402e7e Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:35:08 2013 +0100 Cleaned up the regen file and changed to the new message system. Also fixed missing eof newline. commit 7635e0cd1be051d60bbb6127f04b5b9b8decf51f Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:30:47 2013 +0100 Cleaned up rank-groups.lua and changed to new message system. Also fixed missing eof newline. commit 204e38aa33541794745a671092a3b5b37388f6d2 Merge: 42e95a6 a319162 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 00:54:49 2013 -0700 Merge pull request #19 from mc-server/vanilla-commands Added /kill and /clear commit a31916277fcef2925fc96ce6833dac1ab7c62905 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 23:11:21 2013 +0200 You die if you dont specify a player commit 0aca0d8431cc69f841a3e3f3a0ada81c1d8b1fbb Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 21:05:03 2013 +0100 Cleaned up the portal and worlds file and added new message system. Also fixed missing eof newline. commit 9f4a1fe0ef18a3ee48ea5629969854e5a60616a0 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 21:01:23 2013 +0100 Cleaned up plugins file and added new message system. also fixed missing eof newline. commit 9f04dfef81e8705597aac8fbc8912e3c3b9be6e8 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:23:41 2013 +0200 fixed /clear commit 13e9007844f15050ad4ecea79246d31426975898 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 20:17:06 2013 +0100 Cleaned up the motd file. commit 6c8de9b3594221fbb092d9989166826754641eda Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:13:42 2013 +0200 Added /clear command commit 97fe00aac1bf7d497e08a9622bb32786d64b4c0b Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:11:31 2013 +0200 Added /clear command commit 8dec3c04acb9814db1c89cba2094494fd321e40a Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 20:11:26 2013 +0100 Cleaned up the me file and changed to new message system. commit 72c401fe65589adce446e7de59b3c47ac2147fc9 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 20:09:26 2013 +0100 Cleaned up the main file, and changed to the new message system. commit c48604becd8da56590c9374a641a665d1d6dedab Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:05:24 2013 +0200 Added /kill commit 41b90ad60fc944aa307447491e511879e64f108a Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:03:47 2013 +0200 added /kill commit b2ffcfb1ea36758b013e1ea85c2515485ed30543 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:57:50 2013 +0100 Added new messaging system to locate.lua. Also added the eof newline. commit 318e4dc85eb10d7d97279a19f2d21f3ec75c4598 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:53:51 2013 +0100 Cleaned up the kick command and added new message system. Also fixed missing eof newline. commit 3d864b47a826911181604f83ea72ca0416ff25ce Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:49:56 2013 +0100 Cleaned the /i a bit more. commit 7c26e76048885e2cbc7bc5b57d6ba38b7475e2a5 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:48:19 2013 +0100 Changed to the new message system for /i. Also fixed eof newline. commit 1bc7f1844942a4a675c125b06c81b418b009c037 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:37:35 2013 +0100 Cleaned up help massively and implemented the new messages. Also added new eof newline. commit 150c88ccfe2d6e5210f95c31e56f824832a0c98c Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:36:14 2013 +0100 Added spaces after the tag for the messages so the results look good. commit a144b535cd51805ef8badfc6645aa654370913ed Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:30:21 2013 +0100 Added new messages to gm.lua. Also added spaces in functions and added a eof newline. commit 2237f62c1c6e40d7b2a2986916b2a6e1879f6bfd Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:23:29 2013 +0100 Removed a semicolon that was creeping around in the messages file. commit fbe68a2c28f0b7d54d8527b54a737218bc9a6da4 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:22:48 2013 +0100 Fixed derpy spelling and added new messages to the give command. Also cleaned up the functions in the give command file. commit 66b33c0436d084a2fed1248d63f074c768545ad0 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:04:55 2013 +0100 Added new messages to the ban and unban command. Also cleaned up the function calls and added the eof newline. commit c90dda25990de8ab6d529e83c9620d9bc8c9b9f1 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 17:56:43 2013 +0100 Added new messages to /back command. Also fixed newline at end of file. commit 42e95a6d32da7227a84a5202a2e72fcf4007aaf2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 17:04:36 2013 +0100 Fix concatenation issue commit 7432c25306b8125fca13100048b693bebad92d3d Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:44:47 2013 +0100 Fix of bracket commit 4e0b3f905e2f937951eebd322b204f8da3e745cd Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 16:38:53 2013 +0100 Fixed bugs in the console command file that were stopping it from working. There was an extra `end` and an extra `)` commit ea1215da739e65585b448103e0bf1bebec00dfac Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:06:30 2013 +0100 Fixed duplicate leave messages commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132 Merge: b273df1 1a6f70f Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 06:05:32 2013 -0700 Merge pull request #13 from mc-server/give-console Added a console command for giving players items. commit b273df17c759eba82342466cf6e2291d84b77ab3 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 08:27:14 2013 +0100 Hopefully fixed the /i command not working. I had not defined the newSplit variable before using it. commit 8a74037cc092d048364299f18e07c02c85ae3737 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:18:48 2013 +0100 Fixed the contributors not being on their own lines. commit 57d842cbc61464a613c248d043a3fe7254d931a2 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:17:03 2013 +0100 Added temporary messages.lua, seeing if people like it. commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:26:12 2013 +0100 Fix the README - fixes #15 commit cc438b3229cdb730d308479c59491b5e66130118 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:01:48 2013 +0100 Alpha-sort the console commands. commit aa22f647c27d50b3ccf7e763927bd24329da3a56 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:00:44 2013 +0100 Alpha-sort the commands when they are bound. commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab Merge: a485101 01ccfaa Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:41:38 2013 -0700 Merge pull request #14 from mc-server/ireplace Told the player receiving items what they are getting, and fixed the console log. commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:39:36 2013 +0100 Told the player reveiving items what they are getting, and fixed the console log. commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:35:48 2013 +0100 Added a console command for giving players items. commit a4851010b2ff29bb55feb6331ea6ddec28532a0f Merge: 0ffbd4a ba923e4 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:01:47 2013 -0700 Merge pull request #12 from mc-server/ireplace Re-implement the /i command and make /give conform to the vanilla standards commit ba923e4764b6a3064be6aacea86e059828b2d0e6 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:59:53 2013 +0100 Added /item and made /i an alias of it. commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:46:14 2013 +0100 Kept the stuff alpha-sorted. commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:45:09 2013 +0100 Removed some extra semicolons. commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:44:06 2013 +0100 Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good. commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add Author: tonibm19 <tonibm19@gmail.com> Date: Wed Aug 7 13:52:02 2013 +0200 Fixed typo commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 6 18:23:51 2013 +0100 Re-implement the /i command and make /give conform to the vanilla standards. This commit is experimental and may fail. Please test it! commit f4ac029a0f1903fc9e49365117a81293303c8811 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Aug 2 23:23:15 2013 +0100 Miscellaneous Changes Reduced ban/unban code size a little. Clarified console commands. Added commented code to onjoin when bugs are fixed. Removed embarrassing server wide messages. commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* Dragged in the latest changes for Core.Alexander Harkness2013-08-1129-368/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 9dc3f0d18af4a411f8a40b525e49e7598159f450 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:46:05 2013 +0100 Alpha-sorted the command bindings. commit e22d2fcf3dd840b1a051f3b5b529040213c151c6 Merge: 3ff68e9 9e285ea Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:35:46 2013 +0100 Merge branch 'vanilla-commands' Conflicts: main.lua weather.lua commit 3ff68e9690ff365fd57343dd8d0609bdc6b6bb54 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:22:33 2013 +0100 Cleaned up some files and also killed some demons that had survived the messaging update. commit 9e285ea6ceb3f2e279052fd10227a6dfeb48c062 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 15:09:28 2013 +0100 Fixed tabs and conforms to standards commit e092a35988074b7ebd58068c0b24a235a98596df Merge: f4038d2 c1c563b Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 15:06:35 2013 +0100 Merge branch 'message-standards' Conflicts: console.lua item.lua main.lua commit d68c84b8b74a54cc15965036d27ad0b1dde2d603 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:56:08 2013 +0100 Added /msg alias commit c1c563bda69d51cf5454c7584a25fa3968f0e3ad Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:55:56 2013 +0100 Cleaned up console a little and switched to new message system. Also fixed missing eof newline. commit dc6c5fafc32034321f6827b0c21e99212e2d559b Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:54:47 2013 +0100 Cleaned up web-perms and switched to new message system. Also added missing eof newline. commit f739fc83ace22cf1ee966ad5514bd3c708d08c20 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:54:10 2013 +0100 Remove command commit dc5ce476e871b425f79e510522e35db5608161d4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:52:40 2013 +0100 Now conforms to chat standards commit 41e15803541f4a20ee5baf92106e2ba1cb40cbd7 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:51:21 2013 +0100 Cleaned up weather and switched to new message system. Also added missing eof newline. commit d19caacaad67addaa30d1b6f48ec47c265b4832e Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:50:07 2013 +0100 Cleaned up viewdistance and switched to new messaging system. Also added missing eof newline. commit d6f6603773ae7beb87cb951988e7738ba9c1e538 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:48:34 2013 +0100 Cleaned up top and changed to new messaging system. Also fixed missing eof newline. commit f50fb793a1332c1cc87b3c6e0dfa283f9dfc9e61 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 14:47:28 2013 +0100 Cleaned up the time file and switched to new messaging system. commit aff076175ded4823da817547349537f3c33d4a43 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Aug 11 14:43:38 2013 +0100 Now comforms to help standards commit 4c416d1d1944fa00d4bf07f2580b29b530545bb3 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 14:09:29 2013 +0200 Added /tell [playername] [message] commit 56db86812bfa7c4482b563af71846616a1716434 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 14:06:47 2013 +0200 Added /tell [playername] [message] commit 1b5f32e3b577474b0878dfe9211cafbdb00790bb Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 12:58:53 2013 +0100 Cleaned up teleport and switched to new message system. Also added missing eof newline. commit fb96b73831679735a9677d7f520d19d8276a15d6 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 13:33:49 2013 +0200 Added /weather [Clear/Rain/Thunder] commit 1e4676965a3ce6dc79912e0c8686b7de5026eb42 Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 13:32:04 2013 +0200 Added /weather [Clear/Rain/Thunder] commit f4038d2f9d748df54af054661a18630219ebd25c Author: STRWarrior <niels.breuker@hotmail.nl> Date: Sun Aug 11 13:08:24 2013 +0200 changed /downfall to /toggledownfall becouse thats the way it is in vanilla. commit acdcefe61919e9ecbace1ee2f56dc24c94ffa4dc Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 13:02:35 2013 +0200 Fixed /tpa and /tpaccept commit 9f526a63f07497fa7542515aa17afce9adc34abb Author: tonibm19 <tonibm19@gmail.com> Date: Sun Aug 11 12:59:22 2013 +0200 Updated README (new commands added) commit 717239095c638d86859f1b1b449e6bea0d093f02 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:37:11 2013 +0100 Cleaned up spawn.lua and changed to new message system. Also fixed missing eof newline. commit 2a6a693efcffa1145270bc79ce403e5038a88308 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:35:58 2013 +0100 Cleaned up the save-reload-stop file. Also fixed missing eof newline. commit d32223e4361509a598ee528261b113d92f402e7e Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:35:08 2013 +0100 Cleaned up the regen file and changed to the new message system. Also fixed missing eof newline. commit 7635e0cd1be051d60bbb6127f04b5b9b8decf51f Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 11:30:47 2013 +0100 Cleaned up rank-groups.lua and changed to new message system. Also fixed missing eof newline. commit 204e38aa33541794745a671092a3b5b37388f6d2 Merge: 42e95a6 a319162 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Aug 11 00:54:49 2013 -0700 Merge pull request #19 from mc-server/vanilla-commands Added /kill and /clear commit a31916277fcef2925fc96ce6833dac1ab7c62905 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 23:11:21 2013 +0200 You die if you dont specify a player commit 0aca0d8431cc69f841a3e3f3a0ada81c1d8b1fbb Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 21:05:03 2013 +0100 Cleaned up the portal and worlds file and added new message system. Also fixed missing eof newline. commit 9f4a1fe0ef18a3ee48ea5629969854e5a60616a0 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 21:01:23 2013 +0100 Cleaned up plugins file and added new message system. also fixed missing eof newline. commit 9f04dfef81e8705597aac8fbc8912e3c3b9be6e8 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:23:41 2013 +0200 fixed /clear commit 13e9007844f15050ad4ecea79246d31426975898 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 20:17:06 2013 +0100 Cleaned up the motd file. commit 6c8de9b3594221fbb092d9989166826754641eda Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:13:42 2013 +0200 Added /clear command commit 97fe00aac1bf7d497e08a9622bb32786d64b4c0b Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:11:31 2013 +0200 Added /clear command commit 8dec3c04acb9814db1c89cba2094494fd321e40a Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 20:11:26 2013 +0100 Cleaned up the me file and changed to new message system. commit 72c401fe65589adce446e7de59b3c47ac2147fc9 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 20:09:26 2013 +0100 Cleaned up the main file, and changed to the new message system. commit c48604becd8da56590c9374a641a665d1d6dedab Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:05:24 2013 +0200 Added /kill commit 41b90ad60fc944aa307447491e511879e64f108a Author: tonibm19 <tonibm19@gmail.com> Date: Sat Aug 10 21:03:47 2013 +0200 added /kill commit b2ffcfb1ea36758b013e1ea85c2515485ed30543 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:57:50 2013 +0100 Added new messaging system to locate.lua. Also added the eof newline. commit 318e4dc85eb10d7d97279a19f2d21f3ec75c4598 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:53:51 2013 +0100 Cleaned up the kick command and added new message system. Also fixed missing eof newline. commit 3d864b47a826911181604f83ea72ca0416ff25ce Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:49:56 2013 +0100 Cleaned the /i a bit more. commit 7c26e76048885e2cbc7bc5b57d6ba38b7475e2a5 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 19:48:19 2013 +0100 Changed to the new message system for /i. Also fixed eof newline. commit 1bc7f1844942a4a675c125b06c81b418b009c037 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:37:35 2013 +0100 Cleaned up help massively and implemented the new messages. Also added new eof newline. commit 150c88ccfe2d6e5210f95c31e56f824832a0c98c Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:36:14 2013 +0100 Added spaces after the tag for the messages so the results look good. commit a144b535cd51805ef8badfc6645aa654370913ed Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:30:21 2013 +0100 Added new messages to gm.lua. Also added spaces in functions and added a eof newline. commit 2237f62c1c6e40d7b2a2986916b2a6e1879f6bfd Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:23:29 2013 +0100 Removed a semicolon that was creeping around in the messages file. commit fbe68a2c28f0b7d54d8527b54a737218bc9a6da4 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:22:48 2013 +0100 Fixed derpy spelling and added new messages to the give command. Also cleaned up the functions in the give command file. commit 66b33c0436d084a2fed1248d63f074c768545ad0 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 18:04:55 2013 +0100 Added new messages to the ban and unban command. Also cleaned up the function calls and added the eof newline. commit c90dda25990de8ab6d529e83c9620d9bc8c9b9f1 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 17:56:43 2013 +0100 Added new messages to /back command. Also fixed newline at end of file. commit 42e95a6d32da7227a84a5202a2e72fcf4007aaf2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 17:04:36 2013 +0100 Fix concatenation issue commit 7432c25306b8125fca13100048b693bebad92d3d Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:44:47 2013 +0100 Fix of bracket commit 4e0b3f905e2f937951eebd322b204f8da3e745cd Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 16:38:53 2013 +0100 Fixed bugs in the console command file that were stopping it from working. There was an extra `end` and an extra `)` commit ea1215da739e65585b448103e0bf1bebec00dfac Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:06:30 2013 +0100 Fixed duplicate leave messages commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132 Merge: b273df1 1a6f70f Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 06:05:32 2013 -0700 Merge pull request #13 from mc-server/give-console Added a console command for giving players items. commit b273df17c759eba82342466cf6e2291d84b77ab3 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 08:27:14 2013 +0100 Hopefully fixed the /i command not working. I had not defined the newSplit variable before using it. commit 8a74037cc092d048364299f18e07c02c85ae3737 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:18:48 2013 +0100 Fixed the contributors not being on their own lines. commit 57d842cbc61464a613c248d043a3fe7254d931a2 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:17:03 2013 +0100 Added temporary messages.lua, seeing if people like it. commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:26:12 2013 +0100 Fix the README - fixes #15 commit cc438b3229cdb730d308479c59491b5e66130118 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:01:48 2013 +0100 Alpha-sort the console commands. commit aa22f647c27d50b3ccf7e763927bd24329da3a56 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:00:44 2013 +0100 Alpha-sort the commands when they are bound. commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab Merge: a485101 01ccfaa Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:41:38 2013 -0700 Merge pull request #14 from mc-server/ireplace Told the player receiving items what they are getting, and fixed the console log. commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:39:36 2013 +0100 Told the player reveiving items what they are getting, and fixed the console log. commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:35:48 2013 +0100 Added a console command for giving players items. commit a4851010b2ff29bb55feb6331ea6ddec28532a0f Merge: 0ffbd4a ba923e4 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:01:47 2013 -0700 Merge pull request #12 from mc-server/ireplace Re-implement the /i command and make /give conform to the vanilla standards commit ba923e4764b6a3064be6aacea86e059828b2d0e6 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:59:53 2013 +0100 Added /item and made /i an alias of it. commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:46:14 2013 +0100 Kept the stuff alpha-sorted. commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:45:09 2013 +0100 Removed some extra semicolons. commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:44:06 2013 +0100 Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good. commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add Author: tonibm19 <tonibm19@gmail.com> Date: Wed Aug 7 13:52:02 2013 +0200 Fixed typo commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 6 18:23:51 2013 +0100 Re-implement the /i command and make /give conform to the vanilla standards. This commit is experimental and may fail. Please test it! commit f4ac029a0f1903fc9e49365117a81293303c8811 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Aug 2 23:23:15 2013 +0100 Miscellaneous Changes Reduced ban/unban code size a little. Clarified console commands. Added commented code to onjoin when bugs are fixed. Removed embarrassing server wide messages. commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* Dragged in the latest core changes - got to automate this sometime.Alexander Harkness2013-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 42e95a6d32da7227a84a5202a2e72fcf4007aaf2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 17:04:36 2013 +0100 Fix concatenation issue commit 7432c25306b8125fca13100048b693bebad92d3d Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:44:47 2013 +0100 Fix of bracket commit 4e0b3f905e2f937951eebd322b204f8da3e745cd Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 16:38:53 2013 +0100 Fixed bugs in the console command file that were stopping it from working. There was an extra `end` and an extra `)` commit ea1215da739e65585b448103e0bf1bebec00dfac Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:06:30 2013 +0100 Fixed duplicate leave messages commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132 Merge: b273df1 1a6f70f Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 06:05:32 2013 -0700 Merge pull request #13 from mc-server/give-console Added a console command for giving players items. commit b273df17c759eba82342466cf6e2291d84b77ab3 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 08:27:14 2013 +0100 Hopefully fixed the /i command not working. I had not defined the newSplit variable before using it. commit 8a74037cc092d048364299f18e07c02c85ae3737 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:18:48 2013 +0100 Fixed the contributors not being on their own lines. commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:26:12 2013 +0100 Fix the README - fixes #15 commit cc438b3229cdb730d308479c59491b5e66130118 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:01:48 2013 +0100 Alpha-sort the console commands. commit aa22f647c27d50b3ccf7e763927bd24329da3a56 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:00:44 2013 +0100 Alpha-sort the commands when they are bound. commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab Merge: a485101 01ccfaa Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:41:38 2013 -0700 Merge pull request #14 from mc-server/ireplace Told the player receiving items what they are getting, and fixed the console log. commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:39:36 2013 +0100 Told the player reveiving items what they are getting, and fixed the console log. commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:35:48 2013 +0100 Added a console command for giving players items. commit a4851010b2ff29bb55feb6331ea6ddec28532a0f Merge: 0ffbd4a ba923e4 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:01:47 2013 -0700 Merge pull request #12 from mc-server/ireplace Re-implement the /i command and make /give conform to the vanilla standards commit ba923e4764b6a3064be6aacea86e059828b2d0e6 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:59:53 2013 +0100 Added /item and made /i an alias of it. commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:46:14 2013 +0100 Kept the stuff alpha-sorted. commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:45:09 2013 +0100 Removed some extra semicolons. commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:44:06 2013 +0100 Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good. commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add Author: tonibm19 <tonibm19@gmail.com> Date: Wed Aug 7 13:52:02 2013 +0200 Fixed typo commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 6 18:23:51 2013 +0100 Re-implement the /i command and make /give conform to the vanilla standards. This commit is experimental and may fail. Please test it! commit f4ac029a0f1903fc9e49365117a81293303c8811 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Aug 2 23:23:15 2013 +0100 Miscellaneous Changes Reduced ban/unban code size a little. Clarified console commands. Added commented code to onjoin when bugs are fixed. Removed embarrassing server wide messages. commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* Merged in another fix for core...Alexander Harkness2013-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 7432c25306b8125fca13100048b693bebad92d3d Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:44:47 2013 +0100 Fix of bracket commit 4e0b3f905e2f937951eebd322b204f8da3e745cd Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 16:38:53 2013 +0100 Fixed bugs in the console command file that were stopping it from working. There was an extra `end` and an extra `)` commit ea1215da739e65585b448103e0bf1bebec00dfac Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:06:30 2013 +0100 Fixed duplicate leave messages commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132 Merge: b273df1 1a6f70f Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 06:05:32 2013 -0700 Merge pull request #13 from mc-server/give-console Added a console command for giving players items. commit b273df17c759eba82342466cf6e2291d84b77ab3 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 08:27:14 2013 +0100 Hopefully fixed the /i command not working. I had not defined the newSplit variable before using it. commit 8a74037cc092d048364299f18e07c02c85ae3737 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:18:48 2013 +0100 Fixed the contributors not being on their own lines. commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:26:12 2013 +0100 Fix the README - fixes #15 commit cc438b3229cdb730d308479c59491b5e66130118 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:01:48 2013 +0100 Alpha-sort the console commands. commit aa22f647c27d50b3ccf7e763927bd24329da3a56 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:00:44 2013 +0100 Alpha-sort the commands when they are bound. commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab Merge: a485101 01ccfaa Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:41:38 2013 -0700 Merge pull request #14 from mc-server/ireplace Told the player receiving items what they are getting, and fixed the console log. commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:39:36 2013 +0100 Told the player reveiving items what they are getting, and fixed the console log. commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:35:48 2013 +0100 Added a console command for giving players items. commit a4851010b2ff29bb55feb6331ea6ddec28532a0f Merge: 0ffbd4a ba923e4 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:01:47 2013 -0700 Merge pull request #12 from mc-server/ireplace Re-implement the /i command and make /give conform to the vanilla standards commit ba923e4764b6a3064be6aacea86e059828b2d0e6 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:59:53 2013 +0100 Added /item and made /i an alias of it. commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:46:14 2013 +0100 Kept the stuff alpha-sorted. commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:45:09 2013 +0100 Removed some extra semicolons. commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:44:06 2013 +0100 Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good. commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add Author: tonibm19 <tonibm19@gmail.com> Date: Wed Aug 7 13:52:02 2013 +0200 Fixed typo commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 6 18:23:51 2013 +0100 Re-implement the /i command and make /give conform to the vanilla standards. This commit is experimental and may fail. Please test it! commit f4ac029a0f1903fc9e49365117a81293303c8811 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Aug 2 23:23:15 2013 +0100 Miscellaneous Changes Reduced ban/unban code size a little. Clarified console commands. Added commented code to onjoin when bugs are fixed. Removed embarrassing server wide messages. commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* Bring in a fix for CoreAlexander Harkness2013-08-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 4e0b3f905e2f937951eebd322b204f8da3e745cd Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 16:38:53 2013 +0100 Fixed bugs in the console command file that were stopping it from working. There was an extra `end` and an extra `)` commit ea1215da739e65585b448103e0bf1bebec00dfac Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:06:30 2013 +0100 Fixed duplicate leave messages commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132 Merge: b273df1 1a6f70f Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 06:05:32 2013 -0700 Merge pull request #13 from mc-server/give-console Added a console command for giving players items. commit b273df17c759eba82342466cf6e2291d84b77ab3 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 08:27:14 2013 +0100 Hopefully fixed the /i command not working. I had not defined the newSplit variable before using it. commit 8a74037cc092d048364299f18e07c02c85ae3737 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:18:48 2013 +0100 Fixed the contributors not being on their own lines. commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:26:12 2013 +0100 Fix the README - fixes #15 commit cc438b3229cdb730d308479c59491b5e66130118 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:01:48 2013 +0100 Alpha-sort the console commands. commit aa22f647c27d50b3ccf7e763927bd24329da3a56 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:00:44 2013 +0100 Alpha-sort the commands when they are bound. commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab Merge: a485101 01ccfaa Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:41:38 2013 -0700 Merge pull request #14 from mc-server/ireplace Told the player receiving items what they are getting, and fixed the console log. commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:39:36 2013 +0100 Told the player reveiving items what they are getting, and fixed the console log. commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:35:48 2013 +0100 Added a console command for giving players items. commit a4851010b2ff29bb55feb6331ea6ddec28532a0f Merge: 0ffbd4a ba923e4 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:01:47 2013 -0700 Merge pull request #12 from mc-server/ireplace Re-implement the /i command and make /give conform to the vanilla standards commit ba923e4764b6a3064be6aacea86e059828b2d0e6 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:59:53 2013 +0100 Added /item and made /i an alias of it. commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:46:14 2013 +0100 Kept the stuff alpha-sorted. commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:45:09 2013 +0100 Removed some extra semicolons. commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:44:06 2013 +0100 Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good. commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add Author: tonibm19 <tonibm19@gmail.com> Date: Wed Aug 7 13:52:02 2013 +0200 Fixed typo commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 6 18:23:51 2013 +0100 Re-implement the /i command and make /give conform to the vanilla standards. This commit is experimental and may fail. Please test it! commit f4ac029a0f1903fc9e49365117a81293303c8811 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Aug 2 23:23:15 2013 +0100 Miscellaneous Changes Reduced ban/unban code size a little. Clarified console commands. Added commented code to onjoin when bugs are fixed. Removed embarrassing server wide messages. commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* Merge in the latest version of Core.Alexander Harkness2013-08-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit ea1215da739e65585b448103e0bf1bebec00dfac Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Aug 10 16:06:30 2013 +0100 Fixed duplicate leave messages commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132 Merge: b273df1 1a6f70f Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 06:05:32 2013 -0700 Merge pull request #13 from mc-server/give-console Added a console command for giving players items. commit b273df17c759eba82342466cf6e2291d84b77ab3 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 08:27:14 2013 +0100 Hopefully fixed the /i command not working. I had not defined the newSplit variable before using it. commit 8a74037cc092d048364299f18e07c02c85ae3737 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:18:48 2013 +0100 Fixed the contributors not being on their own lines. commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:26:12 2013 +0100 Fix the README - fixes #15 commit cc438b3229cdb730d308479c59491b5e66130118 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:01:48 2013 +0100 Alpha-sort the console commands. commit aa22f647c27d50b3ccf7e763927bd24329da3a56 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:00:44 2013 +0100 Alpha-sort the commands when they are bound. commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab Merge: a485101 01ccfaa Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:41:38 2013 -0700 Merge pull request #14 from mc-server/ireplace Told the player receiving items what they are getting, and fixed the console log. commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:39:36 2013 +0100 Told the player reveiving items what they are getting, and fixed the console log. commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:35:48 2013 +0100 Added a console command for giving players items. commit a4851010b2ff29bb55feb6331ea6ddec28532a0f Merge: 0ffbd4a ba923e4 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:01:47 2013 -0700 Merge pull request #12 from mc-server/ireplace Re-implement the /i command and make /give conform to the vanilla standards commit ba923e4764b6a3064be6aacea86e059828b2d0e6 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:59:53 2013 +0100 Added /item and made /i an alias of it. commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:46:14 2013 +0100 Kept the stuff alpha-sorted. commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:45:09 2013 +0100 Removed some extra semicolons. commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:44:06 2013 +0100 Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good. commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add Author: tonibm19 <tonibm19@gmail.com> Date: Wed Aug 7 13:52:02 2013 +0200 Fixed typo commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 6 18:23:51 2013 +0100 Re-implement the /i command and make /give conform to the vanilla standards. This commit is experimental and may fail. Please test it! commit f4ac029a0f1903fc9e49365117a81293303c8811 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Aug 2 23:23:15 2013 +0100 Miscellaneous Changes Reduced ban/unban code size a little. Clarified console commands. Added commented code to onjoin when bugs are fixed. Removed embarrassing server wide messages. commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* Merge all the latest stuff from Core.Alexander Harkness2013-08-103-7/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit b6ecb378ca6f213b4676ca17efcb5baa64f2f132 Merge: b273df1 1a6f70f Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 06:05:32 2013 -0700 Merge pull request #13 from mc-server/give-console Added a console command for giving players items. commit b273df17c759eba82342466cf6e2291d84b77ab3 Author: Alexander Harkness <bearbin@gmail.com> Date: Sat Aug 10 08:27:14 2013 +0100 Hopefully fixed the /i command not working. I had not defined the newSplit variable before using it. commit 8a74037cc092d048364299f18e07c02c85ae3737 Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 8 10:18:48 2013 +0100 Fixed the contributors not being on their own lines. commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:26:12 2013 +0100 Fix the README - fixes #15 commit cc438b3229cdb730d308479c59491b5e66130118 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:01:48 2013 +0100 Alpha-sort the console commands. commit aa22f647c27d50b3ccf7e763927bd24329da3a56 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:00:44 2013 +0100 Alpha-sort the commands when they are bound. commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab Merge: a485101 01ccfaa Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:41:38 2013 -0700 Merge pull request #14 from mc-server/ireplace Told the player receiving items what they are getting, and fixed the console log. commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:39:36 2013 +0100 Told the player reveiving items what they are getting, and fixed the console log. commit 1a6f70f25ffa4c12a0d738c97435ae2c30cdb6a9 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:35:48 2013 +0100 Added a console command for giving players items. commit a4851010b2ff29bb55feb6331ea6ddec28532a0f Merge: 0ffbd4a ba923e4 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:01:47 2013 -0700 Merge pull request #12 from mc-server/ireplace Re-implement the /i command and make /give conform to the vanilla standards commit ba923e4764b6a3064be6aacea86e059828b2d0e6 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:59:53 2013 +0100 Added /item and made /i an alias of it. commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:46:14 2013 +0100 Kept the stuff alpha-sorted. commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:45:09 2013 +0100 Removed some extra semicolons. commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:44:06 2013 +0100 Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good. commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add Author: tonibm19 <tonibm19@gmail.com> Date: Wed Aug 7 13:52:02 2013 +0200 Fixed typo commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 6 18:23:51 2013 +0100 Re-implement the /i command and make /give conform to the vanilla standards. This commit is experimental and may fail. Please test it! commit f4ac029a0f1903fc9e49365117a81293303c8811 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Aug 2 23:23:15 2013 +0100 Miscellaneous Changes Reduced ban/unban code size a little. Clarified console commands. Added commented code to onjoin when bugs are fixed. Removed embarrassing server wide messages. commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks.madmaxoft2013-08-081-0/+36
| | | | As requested in FS 418.
* Merge branch 'master' of github.com:mc-server/MCServerAlexander Harkness2013-08-074-30/+113
|\
| * Merge pull request #48 from mc-server/BlockTracingmadmaxoft2013-08-073-19/+59
| |\ | | | | | | Block tracing
| | * Debuggers plugin: added the "/spidey" command.madmaxoft2013-08-071-11/+43
| | | | | | | | | | | | This showcases the cLineBlockTracer functionality exposed to Lua.
| | * cLuaScript now uses cLuaStatemadmaxoft2013-08-061-1/+15
| | |
| | * Ignoring all .ini files in the MCServer folder.madmaxoft2013-08-041-7/+1
| | | | | | | | | | | | Only the .example.ini files are supposed to be in the repository and they must be added specifically by name (git add -f <filename>). All the other .ini files are considered instance-specific and are not to be put into the repo.
| * | Updated mobs health and damagetonibm192013-08-071-11/+54
| |/
* / Drag in the latest core changes.Alexander Harkness2013-08-076-57/+157
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 0f61781047fbe3a4986dde3079be4fc1fb9ff14d Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:26:12 2013 +0100 Fix the README - fixes #15 commit cc438b3229cdb730d308479c59491b5e66130118 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:01:48 2013 +0100 Alpha-sort the console commands. commit aa22f647c27d50b3ccf7e763927bd24329da3a56 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 18:00:44 2013 +0100 Alpha-sort the commands when they are bound. commit 5d9367fcdeeb8a5e1485aac539147edb7a0cd0ab Merge: a485101 01ccfaa Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:41:38 2013 -0700 Merge pull request #14 from mc-server/ireplace Told the player receiving items what they are getting, and fixed the console log. commit 01ccfaa340afa8a4b909a923702da48b8b5f0d4a Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 17:39:36 2013 +0100 Told the player reveiving items what they are getting, and fixed the console log. commit a4851010b2ff29bb55feb6331ea6ddec28532a0f Merge: 0ffbd4a ba923e4 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 09:01:47 2013 -0700 Merge pull request #12 from mc-server/ireplace Re-implement the /i command and make /give conform to the vanilla standards commit ba923e4764b6a3064be6aacea86e059828b2d0e6 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:59:53 2013 +0100 Added /item and made /i an alias of it. commit 25652d2d5390d46a9cfe8bc80ab702b831bb49ed Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:46:14 2013 +0100 Kept the stuff alpha-sorted. commit 7fc56322420c0f99c1d0f0e6ba5df6169ef57fcc Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:45:09 2013 +0100 Removed some extra semicolons. commit 06b1adbcde3d4d610f9d3646ac3dd912b4071ea7 Author: Alexander Harkness <bearbin@gmail.com> Date: Wed Aug 7 16:44:06 2013 +0100 Cleaned up the code a little and fixed the messed up stuff that tried to make sure a player was good. commit 0ffbd4adb80edf51cf7eb5117b0287c7ed286add Author: tonibm19 <tonibm19@gmail.com> Date: Wed Aug 7 13:52:02 2013 +0200 Fixed typo commit b9503b977bdfeed8795fcacd8c6d15bc2e6a723a Author: Alexander Harkness <bearbin@gmail.com> Date: Tue Aug 6 18:23:51 2013 +0100 Re-implement the /i command and make /give conform to the vanilla standards. This commit is experimental and may fail. Please test it! commit f4ac029a0f1903fc9e49365117a81293303c8811 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Aug 2 23:23:15 2013 +0100 Miscellaneous Changes Reduced ban/unban code size a little. Clarified console commands. Added commented code to onjoin when bugs are fixed. Removed embarrassing server wide messages. commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* Removed all example ini files from Install.madmaxoft2013-08-034-0/+9
| | | | They are copied from MCServer by the nightbuild script.
* Merge pull request #38 from tigerw/masterTiger Wang2013-08-031-0/+18
|\ | | | | Added README
| * Added READMETiger Wang2013-08-031-0/+18
| | | | | | | | Credits from startup sequence.
* | Lump in some core changes.Alexander Harkness2013-08-034-65/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit f4ac029a0f1903fc9e49365117a81293303c8811 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Aug 2 23:23:15 2013 +0100 Miscellaneous Changes Reduced ban/unban code size a little. Clarified console commands. Added commented code to onjoin when bugs are fixed. Removed embarrassing server wide messages. commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* | Merge pull request #37 from tigerw/masterTiger Wang2013-08-031-8/+5
|\| | | | | MagicCarpet now confirms to chat standards
| * Added message standardisationTiger Wang2013-08-021-8/+5
| |
* | Pull in the latest core changes.Alexander Harkness2013-08-0216-202/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit da84f4977522ab48ead4af7a71efd43cdd4e3d0a Merge: cc77056 a631484 Author: bearbin <bearbin@gmail.com> Date: Thu Aug 1 10:58:05 2013 -0700 Merge pull request #10 from mc-server/tabmix Fix the inconsistency of spaces and tabs. commit a6314849c2b474b6e17a245c91a2ac74c7acf7bf Author: Alexander Harkness <bearbin@gmail.com> Date: Thu Aug 1 16:47:15 2013 +0100 Changed everything to use the correct system of tabs. commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* | Implemented OnPlayerRightClickingEntity() hookmadmaxoft2013-08-021-1/+11
| | | | | | | | Fixes FS 425
* | Merged in the latest core changes.Alexander Harkness2013-07-3127-160/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit cc7705645b6b387c618c9448fa6b0d5c789370c6 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Wed Jul 31 16:56:41 2013 +0100 Rewrote Info Messages + Implemented #7 [SEE DESC] Standardisation of info messages: [INFO] [WARNING] [JOIN] [LEAVE] [FATALITY] with colours Green, Gold, Red, Rose, and Yellow. Individual worlds have individual LimitWorld setting, with individual WebAdmin setting as well. commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* | Merge branch 'master' of github.com:tigerw/MCServer into tigerw-masterAlexander Harkness2013-07-312-41/+25
|\| | | | | | | | | Conflicts: MCServer/webadmin/template.html
| * Updated MagicCarpet to use new API [SEE DESC]Tiger Wang2013-07-301-2/+2
| | | | | | | | | | | | | | Fixed non-teleportation upon falling through carpet due to use of deprecated function. Fixed spam of console upon falling through carpet. Added descriptive upon-enable message.
| * Another partial redesign of WebAdminTiger Wang2013-07-291-47/+24
| | | | | | | | Done due to strong persuasion from FakeTruth and xoft.
* | Dragged in the latest changes from core.Alexander Harkness2013-07-302-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 16cae4cdc0ec067e7e71fa5c5a3ba8c248ce063b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 14:47:45 2013 +0100 Fix of nil value in SpawnProtect commit 7c33f75e7da7fc104112c17fcb53bc9f06fe09fc Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:19:11 2013 +0100 Fixed potential SpawnProtect nil value issue Now detects if PROTECTRADIUS is zero, and if so, cancels checks. commit 0c4a9d427620ab04ca01b5f31ed9b90530353d96 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 13:07:50 2013 +0100 Enhanced SpawnProtect greatly (thanks xoft) Wow. Who knew ~30 lines of code could become one? commit 17f5ef4fed0b6f32900cc7473563848466139655 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 11:11:22 2013 +0100 Removed Development LOGINFOs commit 02034bf2d67f2ae62092b0688d81338f7b0788df Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Mon Jul 29 10:40:57 2013 +0100 Implemented Issue #5 Enhancement [SEE DESC] Made spawn protection configurable in each world's world file. World has to be listed in settings.ini! commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* | Merge pull request #26 from mc-server/dumpapimovebearbin2013-07-302-46/+62
|\ \ | | | | | | Moved the dumpAPI function to a new plugin.
| * | Changed name and put the whitespace back, as per xoft's suggestion.Alexander Harkness2013-07-302-3/+22
| | |
| * | Moved the file to a more sensible name.Alexander Harkness2013-07-301-0/+0
| | |
| * | Removed old features and fix #25.Alexander Harkness2013-07-301-55/+0
| | |
| * | Moved the dumpAPI function to a new plugin.Alexander Harkness2013-07-301-0/+52
| | |
* | | Fixed .gitignore up.Alexander Harkness2013-07-301-1/+2
|/ /
* | Removed settings.ini and webadmin.ini, made them into *.example.inimadmaxoft2013-07-293-0/+2
| |
* | Deleted Unused terrain.iniTiger Wang2013-07-291-8/+0
| | | | | | As per xoft's suggestions.
* | Changed everyting to Unix line endings.Alexander Harkness2013-07-2929-4793/+4793
| |
* | Merge remote-tracking branch 'origin/master' into hungermadmaxoft2013-07-291-0/+453
|\ \
| * | WebAdmin templates can use LuaFakeTruth2013-07-291-0/+453
| | | | | | | | | | | | | | | New WebAdmin templates can use Lua to completely compose the pages themselves. This should allow infinite WebAdmin design possibilities.
* | | Merge remote-tracking branch 'origin/master' into hungermadmaxoft2013-07-292-8/+3
|\| |
| * | Merge branch 'master' of github.com:mc-server/MCServerAlexander Harkness2013-07-282-3/+20
| |\ \
| | * | Merge pull request #13 from tigerw/masterTiger Wang2013-07-281-3/+0
| | |\| | | | | | | | | Removed Deprecated Option
| | | * Removed Deprecated OptionTiger Wang2013-07-281-3/+0
| | | | | | | | | | | | ShowHelpPluginNames: I have no idea what it does, and it is not referenced anywhere else, so...
| * | | Merged in the latest version of CoreAlexander Harkness2013-07-281-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit ccc73db8c51e45372069ec0a42f437cfb25253b1 Merge: 6bf4b40 21c7c68 Author: Alexander Harkness <bearbin@gmail.com> Date: Sun Jul 28 14:00:15 2013 +0100 Merge branch 'master' of github.com:tigerw/MCSCore into tigerw-master Conflicts: main.lua commit 21c7c68d20782a7dfd0d8f9ce0996397549dd425 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:55:50 2013 +0100 Default WorldLimiter = Off commit 141298481f3adef30b68d0c4200204aa264cb3e2 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sun Jul 28 12:47:24 2013 +0100 Fixed Potential WorldLimit & OnDisable Bugs Changed WorldLimiter if detection from nil value to config boolean. Changed OnDisable to use hardcoded name as Plugin:GetName was apparently a nil value. ?? commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* | | | Ignoring all items beginning with "world".madmaxoft2013-07-281-1/+1
| | | | | | | | | | | | | | | | This is so that multiple worlds can exists without having to ignore each of them - simply name each worldSomething
* | | | Debuggers: added the /starve and /fl (foodlevel) commands for manipulating player food levelmadmaxoft2013-07-281-0/+27
| |/ / |/| |
* | | Merge pull request #6 from mc-server/git-transitionbearbin2013-07-281-0/+20
|\ \ \ | |/ / |/| | Transition to git.
| * | Added a .gitignore for the MCServer directory.Alexander Harkness2013-07-281-0/+20
| | |
* | | Updated Core to the latest version.Alexander Harkness2013-07-272-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 6bf4b40a0e27677afa6df9cb3521266e6b99c4f7 Merge: 1ca4217 bfd6c5f Author: bearbin <bearbin@gmail.com> Date: Sat Jul 27 11:44:18 2013 -0700 Merge pull request #3 from tonibm19/master Added /me command commit bfd6c5f2a47cda4ac98a7225736e2669eaf61849 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:35:22 2013 +0200 Added /me command commit d25abaf44a6f5828b90297ff80003d2cd2a90be5 Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:30:31 2013 +0200 Added /me command commit 9047f7778aa1cdd42d22c4dcf925db792b4d684e Author: tonibm19 <tonibm19@gmail.com> Date: Sat Jul 27 20:29:24 2013 +0200 added /me command commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* | | Fixed very minor issue in template.htmlTiger Wang2013-07-271-1/+0
| | | | | | | | | Removed extra space.
* | | The tabs in the webadmin are not hardcoded in the template anymore but added using the Plugin:AddWebTab() function.STRWarrior2013-07-271-7/+1
| | |
* | | Merge pull request #8 from mc-server/masterbearbin2013-07-272-368/+519
|\ \ \ | | |/ | |/| Merge in new Core
| * | Updated Webadmin HugelyTiger Wang2013-07-272-368/+519
| |/ | | | | | | New CSS and stuffz!
* | Pulled in the latest version of core - fix the bugs that were stopping - #5Alexander Harkness2013-07-273-528/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 1ca42172391d41ba71c65a3f15d3a96d15a80496 Merge: 52a6f4e 7a40336 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 09:01:45 2013 -0700 Merge pull request #2 from tigerw/master Fixed /give descriptor & removed webadmin commit 7a40336437525c447adae3d9800e75b39c0300c4 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 17:00:38 2013 +0100 Fixed /give descriptor & removed webadmin commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* | Merged in latest version of CoreSquashed commit of the following:Alexander Harkness2013-07-272-26/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 52a6f4e35bdea2ae9f33977928b6693f5800e515 Merge: f5d56ff 2af1da8 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 08:51:45 2013 -0700 Merge pull request #1 from tigerw/master Added TPA (tonibm9's fork) commit 2af1da8a3cd8e94674b22805662b83de87ac4a95 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 16:38:10 2013 +0100 Added TPA (tonibm9's fork) With code from STR_Warrior. commit f5d56ffeb02fef4735e846661fa71d15622d25b9 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Sat Jul 27 15:51:18 2013 +0100 Integrated SpawnProtect & Bugfixes [SEE DESC.] Integrated bearbin's SpawnProtect. Fixed config file bugs. Improved SpawnProtect to use settings.ini. Variable cleanup (SHOW_PLUGIN_NAMES). File and filename cleanup. commit 56dc51c00af4514253c04e38b5ccc9fbed2f0022 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 23:14:40 2013 +0100 Update README.md Added info. commit acd7e2849dcd7f3ee7bdc6b0f9b777ee1d9cbb3c Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 19:37:59 2013 +0100 Implemented Block Property checking for Collisions Used g_BlockIsSolid, instead of checking data values. commit 246d423ff9660a2b00a1c51e6276ec74eb3419de Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Fri Jul 26 15:49:55 2013 +0100 Updated Files Buildpermandcollision: updated collision code to check for torches and redstone torches. Help: attempt at always showing page number Web_serversettings: attempt at introducing a check for Maximum Players (must be above zero). commit 868f99ab49edeee78f4fc1c212c6bf614b860378 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:46:08 2013 +0100 Update README.md Extended 'GUI Redesign' section. commit e0df40bd082bdeb5c6823b485bc5001103a77502 Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:43:00 2013 +0100 Update README.md Added features and fixes and instructions for use. commit 332d8221f753f1a38d6c21bfc30af5890f48e3bb Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 19:35:27 2013 +0100 Uploaded All Files All Core files, both modified and unmodified. commit 3dd191f6bed71c863ee264856fbc3660e52cf88b Author: Tiger Wang <ziwei.tiger@hotmail.co.uk> Date: Thu Jul 25 04:59:50 2013 -0700 Initial commit
* | Added correct core pluginAlexander Harkness2013-07-2740-0/+3530
| |
* | Removed all the pre-exising core files.Alexander Harkness2013-07-2744-3099/+0
|/
* Added a shortcut for running under helgrind with the most common parameters and suppressionsmadmaxoft@gmail.com2013-07-262-0/+29
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1682 0a769ca7-a7f5-676a-18bf-c427514a06d6
* First implementation of movement-related hunger and APImadmaxoft@gmail.com2013-07-121-2/+41
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1673 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Core: /tp command can teleport either to a player or to a set of XYZ coordsmadmaxoft@gmail.com2013-07-071-15/+37
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1663 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added StringUtils functions to Lua API; added StripColorCodes(); ChatLog now strips color codes from logged messages.madmaxoft@gmail.com2013-07-071-1/+1
| | | | | | Fixes FS #398 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1661 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed sprinting in 1.6.1, made speeds available through API; fixed messages containing quotes.madmaxoft@gmail.com2013-07-071-0/+36
| | | | | | Fixes FS #415 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1660 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added missing "Colors", Documented the code + Cleanup.nielsbreu@gmail.com2013-07-061-21/+47
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1654 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Just a tiny speedup for the motd loading.nielsbreu@gmail.com2013-07-061-17/+17
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1653 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Simplefied the motd loading function.nielsbreu@gmail.com2013-07-061-39/+22
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1652 0a769ca7-a7f5-676a-18bf-c427514a06d6
* The motd is now loaded from a file in the root dir called motd.txt. You can easily edit the modt and add colors to it.nielsbreu@gmail.com2013-07-052-3/+83
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1647 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Reduced the amount of tables.nielsbreu@gmail.com2013-07-053-8/+4
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1644 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Updated LimitWorld. (Patch by tonibm19)nielsbreu@gmail.com2013-07-031-4/+4
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1642 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added DamageType translation to APImadmaxoft@gmail.com2013-07-011-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1639 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed /stop command. The console still doesn't get closed though(FS#249).nielsbreu@gmail.com2013-07-011-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1637 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Updated the /back and /top command.nielsbreu@gmail.com2013-07-012-2/+2
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1636 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Rewritten entity-on-fire management ("forever on fire" bugs)madmaxoft@gmail.com2013-07-011-4/+4
| | | | | | | | | Fixes FS #297 and part of FS #403. Added sizes to all entities. Moved all damage-related functions from cPawn to cEntity API change: renamed cPawn:TeleportTo() to cEntity:TeleportToCoords() git-svn-id: http://mc-server.googlecode.com/svn/trunk@1635 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Changed the crafting recipe for book to match vanilla since 1.3.1 (fix contributed by mgueydan)madmaxoft@gmail.com2013-06-301-1/+1
| | | | | | Fixes FS #404 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1634 0a769ca7-a7f5-676a-18bf-c427514a06d6
* The LimitWorlds function now uses cCuboidnielsbreu@gmail.com2013-06-302-12/+16
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1633 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Advanced RCON: Command output is sent to the RCON client.madmaxoft@gmail.com2013-06-294-112/+216
| | | | | | | | | RCON authentication is now required before executing commands. Console command handlers now return two values, bool (IsHandled) and string (CommandOutput). API change: removed cRoot:ExecuteConsoleCommand(), added cRoot:QueueExecuteConsoleCommand(). API change: removed cPluginManager:ExecuteConsoleCommand(), use cRoot:QueueExecuteConsoleCommand() instead git-svn-id: http://mc-server.googlecode.com/svn/trunk@1631 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added a function that allows you to change the /back coordinates.nielsbreu@gmail.com2013-06-285-9/+9
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1630 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added /listworlds command and fixed bug in /listgroups where you have an extra comma at the end.nielsbreu@gmail.com2013-06-283-1/+22
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1629 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ActivatorRail is craftable (Patch by tonibm19) nielsbreu@gmail.com2013-06-241-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1625 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed piston crafting and redstone blocks can be crafted. (Patch by tonibm19)nielsbreu@gmail.com2013-06-241-1/+2
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1623 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Plugins can modify message in the OnChat() hook handler.madmaxoft@gmail.com2013-06-221-0/+9
| | | | | | FS #376 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1622 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Rewritten furnacesmadmaxoft@gmail.com2013-06-161-48/+53
| | | | | | | | | | | | Furnaces now smelt the correct number of items. Furnaces store their contents in a cItemGrid. Furnace window is updated with correct items and progressbars. Furnace recipes now use ticks instead of milliseconds. Furnaces save and load their state completely, not missing a smelt operation. Hoppers take items out of furnaces. Dropped the cSlotAreaDropSpenser class, replaced it with generic cSlotAreaItemGrid git-svn-id: http://mc-server.googlecode.com/svn/trunk@1601 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Core: fixed a warning message when using the /item commandmadmaxoft@gmail.com2013-06-161-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1600 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed The MagicCarpet pluginmadmaxoft@gmail.com2013-06-151-83/+83
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1590 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the option of saving all the chunks of a world using the webadmin.nielsbreu@gmail.com2013-06-131-9/+20
| | | | | | FS #354 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1588 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Added a license file.madmaxoft@gmail.com2013-06-111-0/+7
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1581 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Improved command help stringsmadmaxoft@gmail.com2013-06-111-9/+9
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1580 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Moved all strings sent to players to a separate language filemadmaxoft@gmail.com2013-06-113-45/+90
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1579 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: usernames are now handled case-insensitivemadmaxoft@gmail.com2013-06-111-13/+28
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1578 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectinoAreas: Configuratino is now loaded from an INI filemadmaxoft@gmail.com2013-06-104-4/+25
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1576 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Implemented reloading areas when a player movesmadmaxoft@gmail.com2013-06-104-13/+78
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1575 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Fixed area reloadingmadmaxoft@gmail.com2013-06-102-2/+9
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1574 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Added asserts to cStorage functions so that logic errors are found fastermadmaxoft@gmail.com2013-06-091-1/+36
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1568 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Implemented the ProtRemUserAll command's DB accessmadmaxoft@gmail.com2013-06-082-3/+11
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1567 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Implemented adding users to an area in the DBmadmaxoft@gmail.com2013-06-082-2/+58
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1566 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Added ProtListUsers, implemented ProtRemoveUser, fixed ProtDelID commandsmadmaxoft@gmail.com2013-06-083-7/+132
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1565 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: ProtList works directly above the DB, displays areas' IDs and creators. ProtAdd and ProtAddCoords commands show the ID of the new areamadmaxoft@gmail.com2013-06-082-20/+52
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1564 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: The areas are now read from the DB (once)madmaxoft@gmail.com2013-06-073-14/+58
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1563 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Fixed cCommandState's detection of not-selectedmadmaxoft@gmail.com2013-06-071-4/+7
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1562 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Implemented all command handlers.madmaxoft@gmail.com2013-06-076-76/+327
| | | | | | They still call unimplemented methods in the DB, and haven't been properly tested git-svn-id: http://mc-server.googlecode.com/svn/trunk@1561 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Newly added areas are stored in the DBmadmaxoft@gmail.com2013-06-063-6/+85
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1560 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Added cStorage initializationmadmaxoft@gmail.com2013-06-062-1/+118
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1559 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Actual protection is now working, areas are hard-coded (10,10) - (20,20)madmaxoft@gmail.com2013-06-045-12/+72
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1557 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added cItem copy-constructor to Lua API, made cItem::IsEqual() and IsStackable() enchantment-awaremadmaxoft@gmail.com2013-06-041-3/+3
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1546 0a769ca7-a7f5-676a-18bf-c427514a06d6
* LuaWindow: Fixed memory leaks with unclosed windowsmadmaxoft@gmail.com2013-06-021-3/+3
| | | | | | | A player disconnecting will now force all windows to close, not respecting any plugin's overrides. http://forum.mc-server.org/showthread.php?tid=1146&pid=8350#pid8350 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1543 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the possibility to specify enchantments by name in the constructor and AddFromString() functionmadmaxoft@gmail.com2013-06-021-0/+2
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1542 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Enchantments are now stored in Anvil world and in player inventorymadmaxoft@gmail.com2013-06-021-1/+9
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1541 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Enchantments: API and sending to clientmadmaxoft@gmail.com2013-06-021-0/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1539 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added cLuaWindow:SetOnSlotChanged(); the callback is called only for non-inventory slotsmadmaxoft@gmail.com2013-05-311-0/+6
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1535 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the OnClosing callback to cLuaWindow APImadmaxoft@gmail.com2013-05-301-0/+9
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1534 0a769ca7-a7f5-676a-18bf-c427514a06d6
* LuaWindow: Initial code, the window can be opened, but not much manipulatedmadmaxoft@gmail.com2013-05-301-5/+64
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1532 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Fixed a mistyped variable namemadmaxoft@gmail.com2013-05-261-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1518 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: missed 2 filesmadmaxoft@gmail.com2013-05-262-0/+122
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1517 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ProtectionAreas: Initial project import, skeleton codemadmaxoft@gmail.com2013-05-267-0/+353
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1516 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Implemented droppersmadmaxoft@gmail.com2013-05-261-13/+12
| | | | | | Added a common ancestor class "DropSpenser" that has the common code for dropper and dispenser and is Lua-accessible, too. The Debuggers plugin now triggers both droppers and dispensers when rclking them with a redstone torch. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1514 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added all new bindings, refactored Debuggers; new Debuggers function.madmaxoft@gmail.com2013-05-252-104/+194
| | | | | | Rclk with a redstone torch on a dispenser causes the dispenser to spit out one item each tick. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1509 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Refactored cInventory to use cItemGrid for the actual Storagemadmaxoft@gmail.com2013-05-242-24/+27
| | | | | | This makes the API more orthogonal and is easier to use in the plugins. Also changes in the inventory are now propagated to the needed places (armor updates to BroadcastEntityEquipment etc.) even when the inventory is changed by a plugin. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1503 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added Decoda projects for ChunkWorx and Coremadmaxoft@gmail.com2013-05-212-0/+135
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1500 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Inventory changes made by plugins are now propagated to the clientmadmaxoft@gmail.com2013-05-191-0/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1495 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Debuggers: a simple test of armor slot settingmadmaxoft@gmail.com2013-05-191-2/+12
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1494 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Debuggers: sorted things into separate functions, commented out most of them; added ForEachEntity() testing - list all and kill all entities.madmaxoft@gmail.com2013-05-191-33/+130
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1492 0a769ca7-a7f5-676a-18bf-c427514a06d6
* WebAdmin: The plugin list is sorted alphabetically and if they are enabled or disabled. nielsbreu@gmail.com2013-05-171-4/+18
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1488 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Updated the core's settings.ini settings tabnielsbreu@gmail.com2013-05-081-4/+6
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1462 0a769ca7-a7f5-676a-18bf-c427514a06d6
* made the permission page more manageable.nielsbreu@gmail.com2013-05-061-2/+21
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1453 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed the stop and restart button in the manage server tab.nielsbreu@gmail.com2013-05-061-2/+2
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1450 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added lots of new options in the world config tab.nielsbreu@gmail.com2013-05-031-1/+335
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1440 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed bug where you could not use /time day/nightnielsbreu@gmail.com2013-04-231-3/+2
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1407 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Simplified onkilling.lua and added /time set and /time addnielsbreu@gmail.com2013-04-202-35/+18
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1398 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added Expat and LuaExpat, XML parsing now available in the API.madmaxoft2013-04-091-0/+27
| | | | | | | FS #336 Windows version only, Linux to be fixed soon. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1374 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added SQLite and LuaSQLite, Lua plugins can now use SQLite.madmaxoft@gmail.com2013-04-071-0/+30
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1368 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added a tab in the serversettings where you can edit the world.ini of all your worlds.nielsbreu@gmail.com2013-04-061-9/+332
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1364 0a769ca7-a7f5-676a-18bf-c427514a06d6
* for some reason TortoiseSVN didn't commit listgroups.luanielsbreu@gmail.com2013-04-031-0/+14
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1354 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added a /listgroups where you can see... a list of the groups ;)nielsbreu@gmail.com2013-04-032-0/+28
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1352 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added missing crafting recipes.nielsbreu@gmail.com2013-04-012-1/+9
| | | | | | Quartz Slabs, Chiseled Quartz Block and Pillar Quartz Block git-svn-id: http://mc-server.googlecode.com/svn/trunk@1343 0a769ca7-a7f5-676a-18bf-c427514a06d6
* BlockArea: Finished rotation and mirroring with meta. Implemented example meta handling for vines, stairs and torches.madmaxoft@gmail.com2013-03-261-0/+31
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1319 0a769ca7-a7f5-676a-18bf-c427514a06d6
* BlockArea: Implemented rotation without meta manipulationmadmaxoft@gmail.com2013-03-251-0/+12
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1317 0a769ca7-a7f5-676a-18bf-c427514a06d6
* BlockArea: Implemented mirroring without meta manipulationmadmaxoft@gmail.com2013-03-251-0/+18
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1316 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added a /toggledownfall command that toggles the weather.nielsbreu@gmail.com2013-03-243-3/+12
| | | | | | changed back the stop.lua git-svn-id: http://mc-server.googlecode.com/svn/trunk@1312 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Updated core plugin.nielsbreu@gmail.com2013-03-2410-36/+291
| | | | | | | | | | | Added limited world. Configurable through webadmin. Added a Manage server page in webadmin where you can reload/restart/stop the server. You can add players to groups with the webadmin. without the player have to relog first You can change someone's group in-game with a command, without the player have to relog first Hardcore mode Improved death messages git-svn-id: http://mc-server.googlecode.com/svn/trunk@1306 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Core: added PortsIPv6 setting to webadmin (contributed by STR_Warrior)madmaxoft2013-03-081-0/+5
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1261 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Debuggers plugin no longer performs generator / blockarea interface testing by default, but writes the current API.txt file.madmaxoft@gmail.com2013-03-031-2/+4
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1245 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Core: Updated with new features (contributed by STR_Warrior)madmaxoft@gmail.com2013-03-028-11/+56
| | | | | | http://forum.mc-server.org/showthread.php?tid=4&pid=6634#pid6634 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1235 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added HOOK_EXECUTE_COMMAND for intercepting executed commands and console commands.madmaxoft@gmail.com2013-02-211-0/+16
| | | | | | Note that built-in console commands are exempt to this hook - they are always performed and the hook is not called. Also note that, for reasons unknown, the HookNotify plugin doesn't list the callback arguments. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1221 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Core: Players console command now shows players' IP addresses (patch contributed by STR_Warrior)madmaxoft@gmail.com2013-02-191-1/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1220 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Block and recipe update by STR_Warrior.madmaxoft2013-02-153-5/+39
| | | | | | | | | Adds missing fuels Adds missing furnace recipes (FS #304) Fixes some recipes (FS #305) Adds current 1.5 weekly snapshot blocks and items. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1215 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Plugins can now bind console commandsmadmaxoft@gmail.com2013-02-152-6/+196
| | | | | | | FS #300 Most console commands are now implemented in the Core plugin. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1214 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Implemented the cBlockArea:RelLine() API function.madmaxoft@gmail.com2013-02-131-0/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1211 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added HOOK_WEATHER_CHANGING.madmaxoft@gmail.com2013-02-131-3/+12
| | | | | | http://www.mc-server.org/support/index.php?do=details&task_id=299 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1210 0a769ca7-a7f5-676a-18bf-c427514a06d6
* More API functions in cBlockArea: Create(), Fill(), FillRelArea()madmaxoft@gmail.com2013-02-111-0/+4
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1208 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added cBlockArea:Merge() API function to merge two block areas using different strategies.madmaxoft@gmail.com2013-02-101-0/+14
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1207 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added cBlockArea:Expand() API function (untested)madmaxoft@gmail.com2013-02-091-4/+18
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1203 0a769ca7-a7f5-676a-18bf-c427514a06d6
* cChunkDesc can now read and write cBlockAreas.madmaxoft@gmail.com2013-02-081-2/+18
| | | | | | A simple example is provided in the Debuggers plugin. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1201 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added cBlockArea:CopyTo() and :CopyFrom(), so now block areas can be duplicated easily.madmaxoft@gmail.com2013-02-071-3/+6
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1199 0a769ca7-a7f5-676a-18bf-c427514a06d6
* cBlockArea can now be saved as a .schematic file.madmaxoft@gmail.com2013-02-071-0/+19
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1198 0a769ca7-a7f5-676a-18bf-c427514a06d6
* cBlockArea can now be loaded from a .schematic file.madmaxoft@gmail.com2013-02-061-0/+17
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1195 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added a new API call to cBlockArea: Crop().madmaxoft@gmail.com2013-02-061-1/+30
| | | | | | Also fixed cBlockArea:MakeIndex(), the indexing was wrong. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1194 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added new hooks: OnChunkAvailable(), OnChunkUnloaded() and OnChunkUnloading(). Modified OnChunkGenerated() signature.madmaxoft@gmail.com2013-02-051-0/+27
| | | | | | http://forum.mc-server.org/showthread.php?tid=464&pid=6312#pid6312 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1193 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Debuggers plugin dumps entire API into a file, API.txt. Enabled by default.madmaxoft@gmail.com2013-02-021-6/+17
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1188 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Updated MagicCarpet to work with current APImadmaxoft@gmail.com2013-02-012-9/+27
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1185 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Moved command API into cPluginManager.madmaxoft@gmail.com2013-02-013-104/+71
| | | | | | As specified in http://forum.mc-server.org/showthread.php?tid=765 , commands are now bound using a single function, cPluginManager:BindCommand(). git-svn-id: http://mc-server.googlecode.com/svn/trunk@1183 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Renamed HOOK_KILLED to HOOK_KILLING to match naming conventions.madmaxoft@gmail.com2013-01-283-9/+9
| | | | | | Also tweaked the mechanics so that plugins may revive without dropping other plugins out of the picture. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1182 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Updated HookNotify with the hook renaming.madmaxoft@gmail.com2013-01-281-3/+3
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1181 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added cItems to Lua API.madmaxoft@gmail.com2013-01-271-2/+10
| | | | | | Now HOOK_BLOCK_TO_PICKUPS is fully functional, as demonstrated by HookNotify. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1178 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Debuggers: added some filtering to the API output, but still not good enough.madmaxoft@gmail.com2013-01-271-7/+9
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1177 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the HOOK_BLOCK_TO_PICKUPS hook that fires when a block is dug up and should be converted to pickups.madmaxoft@gmail.com2013-01-271-0/+11
| | | | | | Note that cItems is used in the function signature but not yet exported in the API, TODO! git-svn-id: http://mc-server.googlecode.com/svn/trunk@1176 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Changed HOOK_PLAYER_MOVED to HOOK_PLAYER_MOVING to match the scheme used for names.madmaxoft@gmail.com2013-01-261-3/+3
| | | | | | -ING means the event is being processed and may be refused by a plugin, -ED means it has already happenned and the plugin cannot do anything about it. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1174 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added a function to dump all available Lua API functions into the Debuggers plugin.madmaxoft@gmail.com2013-01-261-0/+23
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1173 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Renamed rclk hook to HOOK_PLAYER_RIGHT_CLICK.madmaxoft@gmail.com2013-01-181-1/+1
| | | | | | http://forum.mc-server.org/showthread.php?tid=464&pid=6163#pid6163 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1158 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added Handy plugintau.tihon@gmail.com2013-01-162-0/+383
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1153 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Disabled dev / debugging plugins by defaultmadmaxoft@gmail.com2013-01-141-3/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1142 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Forgotten files for previous merge commit (rev 1139)madmaxoft@gmail.com2013-01-1313-53/+410
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1140 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the offline playername "Player" to admins in the debugging users.inimadmaxoft@gmail.com2012-12-241-0/+3
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1102 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added 1.4.6 items (patch contributed by STR_Warrior)madmaxoft@gmail.com2012-12-241-0/+3
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1101 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added Netherbrick slab (patch contributed by STR_Warrior)madmaxoft@gmail.com2012-12-222-0/+2
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1098 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added "Latest version" to the PrimaryServerVersion in webadmin settings (patch contributed by STR_Warrior)madmaxoft@gmail.com2012-12-211-4/+5
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1091 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added TakeDamage logging to the Debuggers plugin.madmaxoft@gmail.com2012-12-211-0/+11
| | | | | | http://forum.mc-server.org/showthread.php?tid=625&pid=5720#pid5720 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1089 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added PrimaryServerVersion to the webadmin (patch contributed by STR_Warrior)madmaxoft@gmail.com2012-12-211-4/+18
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1088 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added initial adventure mode supportluksor111@gmail.com2012-11-271-0/+1
| | | | | | | | | Added missing Emerald crafting recipe You get more fall damage when jumping Torch no longer protects players from fall damage Fixed Ender Chest drops git-svn-id: http://mc-server.googlecode.com/svn/trunk@1070 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Recipe update by STR_Warriormadmaxoft@gmail.com2012-11-201-2/+5
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1056 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Updated crafting and items to 1.4.4 (initial patch by STR_Warrior)madmaxoft@gmail.com2012-11-172-2/+41
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1051 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Removed the protocol restriction from default debugging settings.inimadmaxoft@gmail.com2012-11-101-1/+0
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1026 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Refactored the world time.madmaxoft@gmail.com2012-11-011-2/+2
| | | | | | Now it is stored in two values - WorldAge (only incremented, plugins cannot change) and TimeOfDay (plugins can change). Since sub-tick precision is needed in Tick(), we store it both as number of seconds (double) and number of ticks (Int64) is calculated off of that. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1022 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the [Server].PrimaryServerVersion setting to settings.ini; 1.4.2 gets the correct versionmadmaxoft@gmail.com2012-10-311-0/+1
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@1018 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Removed unused [Physics].Water section from settings.ini.madmaxoft@gmail.com2012-10-191-3/+0
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@982 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Turned sTick plugin into general Debuggers plugin, added the Blaze Rod Of Enquiry (rclk with a blaze rod prints out the blocktypes and metas)madmaxoft@gmail.com2012-10-164-40/+70
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@968 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Core: fixed /help and /pluginlistfaketruth2012-10-162-22/+26
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@967 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Biomal CompoGen now generates sea with STATIONARY_WATER instead of regular WATER.madmaxoft@gmail.com2012-10-141-0/+2
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@962 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Completely removed support for old style Lua plugins (can use both Plugin and NewPlugin in settings.ini for now)faketruth2012-10-142-49/+99
| | | | | | | | | | | | Removed cPlugin_Lua, obviously cPluginManager stores plugins by their (folder)name cPluginManager now scans the Plugins folder for potential plugins and adds them as non-loaded plugins Added a DisablePlugin and LoadPlugin to disable and load plugins on a per-plugin basis instead of all at once cPluginManager::FindPlugins refreshes the plugin list by removing non-existing plugins and adding new plugins Made it incredibly easy to use new plugins from the WebAdmin Exposed some food/hunger related functions in cPlayer to Lua git-svn-id: http://mc-server.googlecode.com/svn/trunk@959 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Core: Removed /home since other plugins want to use itfaketruth2012-10-111-1/+0
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@951 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed chatlog pluginfaketruth2012-10-111-1/+1
| | | | | | Fixed references to settings files in VS2008 project git-svn-id: http://mc-server.googlecode.com/svn/trunk@948 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Core: made ban and kick functions accessible to other pluginsfaketruth2012-10-113-34/+57
| | | | | | Core: fixed banning and whitelisting in OnLogin git-svn-id: http://mc-server.googlecode.com/svn/trunk@947 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Removed redstone from settings.ini, added a note about wiki and webadminmadmaxoft@gmail.com2012-10-061-9/+7
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@938 0a769ca7-a7f5-676a-18bf-c427514a06d6
* New example plugin using the BlockArea functionality.madmaxoft@gmail.com2012-10-061-0/+83
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@934 0a769ca7-a7f5-676a-18bf-c427514a06d6
* sTick: Updated the plugin to work with current codemadmaxoft@gmail.com2012-10-032-10/+11
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@920 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed axe crafting (cannot use asterisk)madmaxoft@gmail.com2012-09-291-5/+10
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@907 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Removed the extra world from default settings.ini madmaxoft@gmail.com2012-09-291-2/+1
| | | | | | (Probably an accident from rev 900) git-svn-id: http://mc-server.googlecode.com/svn/trunk@906 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Crafting recipes for 1.3.2 (patch submitted by STR_Warrior)madmaxoft@gmail.com2012-09-292-20/+35
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@903 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Made beds placeablefaketruth2012-09-291-4/+4
| | | | | | Android: Updated some stuff and set default view distance lower git-svn-id: http://mc-server.googlecode.com/svn/trunk@900 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Core now uses built in item functions ( StringToItem() ) for the /item commandfaketruth2012-09-082-65/+8
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@855 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added cPlugin_NewLua::GetLocalDirectory() and exported it to Lua so plugins can store their settings in their own folder.faketruth2012-09-081-2/+2
| | | | | | Core now stores banned players and whitelist data in its own directory git-svn-id: http://mc-server.googlecode.com/svn/trunk@850 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Updated to V6 - "Stop" and "Progress report" functionalitytau.tihon@gmail.com2012-08-302-185/+228
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@807 0a769ca7-a7f5-676a-18bf-c427514a06d6
* ChunkWorx: fixed API change breaking exact and 3x3 playerpos regeneration (fix contributed by Taugeshtu)madmaxoft@gmail.com2012-08-302-5/+11
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@806 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added the ChunkWorx plugin to SVN (contributed by Taugeshtu)madmaxoft@gmail.com2012-08-272-0/+344
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@797 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Added a RateCompareString function to StringUtilsfaketruth2012-08-234-21/+25
| | | | | | | | | | | Created a preprocessor template (define) for DoWith* functions Exported cWorld::FindAndDoWithPlayer(), cRoot::FindAndDoWithPlayer() and cRoot::ForEachPlayer() to Lua Added a function FindAndDoWithPlayer to cRoot and cWorld. It takes a part of a player name and finds a single player based on that. Fixed Core's MOTD to contain the correct URL to the MCServer site Fixed Core /kick command Fixed Core's WebAdmin kick git-svn-id: http://mc-server.googlecode.com/svn/trunk@779 0a769ca7-a7f5-676a-18bf-c427514a06d6
* WebAdmin should not cause crashes anymorefaketruth2012-08-221-8/+6
| | | | | | | | Got rid of cWebPlugin_Lua cPlugin_Lua is also a cWebPlugin now, so plugins don't need a separate cWebPlugin object Changed some stuff to use AString instead of char* git-svn-id: http://mc-server.googlecode.com/svn/trunk@777 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed cWebPlugin_Lua being not thread safe. And I don't know why, but it still crashes in Lua sometimes o_Ofaketruth2012-08-221-18/+40
| | | | | | WebAdmin chat now supports infinite number of chat messages (only client side). The client requests only NEW chat messages from the server. git-svn-id: http://mc-server.googlecode.com/svn/trunk@776 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Chat history limit on the WebAdmin chatfaketruth2012-08-221-62/+70
| | | | | | | | Did some refactoring on the JavaScript side of the WebAdmin chat Got rid of cRoot::sRootState Fixed a crash on the WebAdmin when a page is loaded before a world exists git-svn-id: http://mc-server.googlecode.com/svn/trunk@775 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Web chat for the WebAdmin :Dfaketruth2012-08-222-0/+112
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@773 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed nightbuild script after files move.madmaxoft@gmail.com2012-08-216-71/+0
| | | | | | | Also moved licenses and Install-related files to Install folder. The 7z archives are now built inside the Install folder, instead of the root git-svn-id: http://mc-server.googlecode.com/svn/trunk@771 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Can add/remove worlds from WebAdminfaketruth2012-08-211-2/+77
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@770 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Using multi line strings for Core's WebAdmin interfacefaketruth2012-08-211-51/+52
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@769 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Fixed server settings on FireFoxfaketruth2012-08-211-2/+2
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@768 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Can change monster settings in WebAdmin toofaketruth2012-08-201-5/+48
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@767 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Can now edit some generic server settings through the WebAdmin (port, description, etc)faketruth2012-08-202-0/+111
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@766 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Updated clean.bat for cleaning MCServer filesfaketruth2012-08-201-1/+0
| | | | | | Removed accidentally added "ini editor" from Core git-svn-id: http://mc-server.googlecode.com/svn/trunk@765 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Moved files used by MCServer to a special MCServer folderfaketruth2012-08-2052-0/+2897
git-svn-id: http://mc-server.googlecode.com/svn/trunk@763 0a769ca7-a7f5-676a-18bf-c427514a06d6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:35:16 +0100