3f4abe8c95
Addeed OnSpawningEntity, OnSpawnedEntity, OnSpawningMonster, OnSpawnedMonster hooks.
...
As requested in FS 418.
2013-08-08 09:13:13 +02:00
be7a6d7a66
Merge branch 'master' of github.com:mc-server/MCServer
2013-08-07 18:37:03 +01:00
f29b2b8ea6
Drag in the latest core changes.
...
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
2013-08-07 18:36:38 +01:00
3d027a8928
Merge pull request #48 from mc-server/BlockTracing
...
Block tracing
2013-08-07 06:46:43 -07:00
5814025b11
Updated mobs health and damage
2013-08-07 14:41:09 +02:00
00ac16d92b
Debuggers plugin: added the "/spidey" command.
...
This showcases the cLineBlockTracer functionality exposed to Lua.
2013-08-07 14:34:56 +02:00
c55fabb5ad
cLuaScript now uses cLuaState
2013-08-06 19:28:09 +02:00
b522a9b262
Ignoring all .ini files in the MCServer folder.
...
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.
2013-08-04 16:05:45 +02:00
b3906500c7
Removed all example ini files from Install.
...
They are copied from MCServer by the nightbuild script.
2013-08-03 20:41:26 +02:00
a14f56720c
Merge pull request #38 from tigerw/master
...
Added README
2013-08-03 09:42:02 -07:00
046f4be006
Added README
...
Credits from startup sequence.
2013-08-03 17:40:56 +01:00
f14b0ec7fd
Lump in some core changes.
...
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
2013-08-03 08:37:43 +01:00
88ba86be57
Merge pull request #37 from tigerw/master
...
MagicCarpet now confirms to chat standards
2013-08-02 15:26:07 -07:00
ac062371ba
Added message standardisation
2013-08-02 13:48:59 +01:00
207a452171
Pull in the latest core changes.
...
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
2013-08-02 07:48:47 +01:00
3531bdb60b
Implemented OnPlayerRightClickingEntity() hook
...
Fixes FS 425
2013-08-02 08:44:06 +02:00
8ced99994b
Merged in the latest core changes.
...
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
2013-07-31 17:10:59 +01:00
c700108ab6
Merge branch 'master' of github.com:tigerw/MCServer into tigerw-master
...
Conflicts:
MCServer/webadmin/template.html
2013-07-31 08:22:34 +01:00
25abfb9476
Updated MagicCarpet to use new API [SEE DESC]
...
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.
2013-07-30 22:26:50 +01:00
fc1952f9a9
Dragged in the latest changes from core.
...
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
2013-07-30 20:03:31 +01:00
d0adae8553
Merge pull request #26 from mc-server/dumpapimove
...
Moved the dumpAPI function to a new plugin.
2013-07-30 09:41:41 -07:00
e57b4e1e59
Changed name and put the whitespace back, as per xoft's suggestion.
2013-07-30 16:26:06 +01:00
23b9f83fac
Moved the file to a more sensible name.
2013-07-30 16:24:13 +01:00
624c0a7554
Removed old features and fix #25 .
2013-07-30 15:07:40 +01:00
ad1bf3c36f
Fixed .gitignore up.
2013-07-30 15:03:55 +01:00
69bb6c28e2
Moved the dumpAPI function to a new plugin.
2013-07-30 15:02:20 +01:00
f9d9ba75ae
Removed settings.ini and webadmin.ini, made them into *.example.ini
2013-07-29 17:56:58 +02:00
59ea9ea92f
Deleted Unused terrain.ini
...
As per xoft's suggestions.
2013-07-29 15:38:00 +01:00
c4188ca09d
Another partial redesign of WebAdmin
...
Done due to strong persuasion from FakeTruth and xoft.
2013-07-29 14:18:35 +01:00
53e22b1185
Changed everyting to Unix line endings.
2013-07-29 12:13:03 +01:00
752e57108d
Merge remote-tracking branch 'origin/master' into hunger
2013-07-29 09:53:47 +02:00
4beb495f93
Merge remote-tracking branch 'origin/master' into hunger
2013-07-29 09:52:00 +02:00
5a9d4f89c2
WebAdmin templates can use Lua
...
New WebAdmin templates can use Lua to completely compose the pages
themselves. This should allow infinite WebAdmin design possibilities.
2013-07-29 02:37:59 +02:00
afa19d3bb4
Ignoring all items beginning with "world".
...
This is so that multiple worlds can exists without having to ignore each of them - simply name each worldSomething
2013-07-28 19:18:15 +02:00
64845e81b3
Debuggers: added the /starve and /fl (foodlevel) commands for manipulating player food level
2013-07-28 16:01:56 +02:00
bb421c0703
Merge branch 'master' of github.com:mc-server/MCServer
2013-07-28 14:06:31 +01:00
73f454ef37
Merged in the latest version of Core
...
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
2013-07-28 14:05:21 +01:00
18f3595f31
Merge pull request #13 from tigerw/master
...
Removed Deprecated Option
2013-07-28 04:57:40 -07:00
ea98cc59ed
Removed Deprecated Option
...
ShowHelpPluginNames: I have no idea what it does, and it is not referenced anywhere else, so...
2013-07-28 12:57:02 +01:00
e6c63f4281
Merge pull request #6 from mc-server/git-transition
...
Transition to git.
2013-07-28 02:40:58 -07:00
79a0afd953
Added a .gitignore for the MCServer directory.
2013-07-28 10:26:47 +01:00
0799661ff7
Updated Core to the latest version.
...
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
2013-07-27 19:45:44 +01:00
d4830df4ee
Fixed very minor issue in template.html
...
Removed extra space.
2013-07-27 18:56:18 +01:00
30ad617397
The tabs in the webadmin are not hardcoded in the template anymore but added using the Plugin:AddWebTab() function.
2013-07-27 10:15:26 -07:00
9633f0fac0
Merge pull request #8 from mc-server/master
...
Merge in new Core
2013-07-27 09:17:54 -07:00
20cb8221f9
Updated Webadmin Hugely
...
New CSS and stuffz!
2013-07-27 17:12:45 +01:00
67924b5941
Pulled in the latest version of core - fix the bugs that were stopping - #5
...
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
2013-07-27 17:07:28 +01:00
7d28f8bbff
Merged in latest version of CoreSquashed commit of the following:
...
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
2013-07-27 16:54:25 +01:00
983d87e443
Added correct core plugin
2013-07-27 16:24:03 +01:00
aa64450421
Removed all the pre-exising core files.
2013-07-27 16:15:29 +01:00
madmaxoft
Alexander Harkness
tonibm19
Tiger Wang
FakeTruth
STRWarrior