3920e872f7
Updated the nightbuild script for Git
2013-07-29 19:53:41 +02: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
fb1044c4e5
Merge pull request #19 from mc-server/lineendings
...
Changed everyting to Unix line endings.
2013-07-29 05:55:26 -07:00
53e22b1185
Changed everyting to Unix line endings.
2013-07-29 12:13:03 +01:00
20e7221c7c
WebAdmin: Removed the duplicate memory usage querying
2013-07-29 10:59:10 +02:00
e51221eaf9
Fixed formatting in LuaScript.*
2013-07-29 10:03:42 +02:00
5530178aad
Merge pull request #14 from mc-server/hunger
...
Hunger
2013-07-29 00:57:34 -07:00
473dec42c8
Updated the automatic Lua bindings
2013-07-29 09:55:37 +02: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
798f887b65
Merge pull request #15 from mc-server/webadmin
...
WebAdmin templates can use Lua
2013-07-28 23:32:59 -07:00
4e22b0e65c
Merge pull request #16 from mc-server/master
...
Fixed multiple issues with the COMPILING file, including a missing endli...
2013-07-28 18:23:22 -07: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
3bf4130e3f
Player eating is now properly broadcast to other players.
...
Also fixed the API relating to food, determining player gamemode, and removed several unneeded API functions.
2013-07-28 22:55:09 +02:00
5e4947a17f
Fixed multiple issues with the COMPILING file, including a missing endline terminator, windows line endings and also the exclusion of the addm32 thing.
2013-07-28 20:17:56 +01: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
f4ffd35ddc
Added PNG versions of the MCServer icon.
...
Extracted from the icon.ico, these are to be used for logos, avatars etc.
2013-07-28 19:16:49 +02:00
4746d2251c
Implemented basic eating support.
...
Food is now properly consumed and it takes 1.5 sec.
2013-07-28 19:15:03 +02:00
00196e975a
ProtoProxy now properly waits for both sides to establish encryption
...
No more "End of stream" kicks in the client. Data sent while one connection is encrypted and the other is not is buffered and sent when the other link establishes encryption.
2013-07-28 18:15:19 +02:00
8c61c54dae
Set up proper ignores for ProtoProxy
2013-07-28 18:12:23 +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
0caadbb25c
Hunger-per-distance is calculated only for the XZ distance
2013-07-28 11:54:37 +02:00
d155c1cb00
Player food level is reset on respawn
2013-07-28 11:52:24 +02:00
c5c233312a
Merge remote-tracking branch 'origin/master' into hunger
2013-07-28 11:47:29 +02:00
e6c63f4281
Merge pull request #6 from mc-server/git-transition
...
Transition to git.
2013-07-28 02:40:58 -07:00
534cddf4c1
Added a .gitignore for the anvilstats folder.
2013-07-28 10:32:03 +01:00
74a3de203b
Added a .gitignore for the VC2008 folder.
2013-07-28 10:31:10 +01:00
d3801c0296
Added cPlayer::IsGameModeXXX() and cWorld::IsGameModeXXX() functions.
...
These are the preferred way of determining the gamemode, you should use those instead of doing manual comparisons to the gamemode value.
2013-07-28 11:30:54 +02:00
79a0afd953
Added a .gitignore for the MCServer directory.
2013-07-28 10:26:47 +01:00
b5c38e98fb
Added some more root .gitignores.
2013-07-28 10:25:25 +01:00
25b9cdc893
Merge pull request #11 from tigerw/master
...
Fixed Window Titles being MCS-*
2013-07-28 01:52:20 -07:00
265fa6d750
Fixed Window Titles being MCS-*
...
For example, MCS-Chest, MCS-DoubleChest, etc.
2013-07-27 22:32:07 +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
1d0b57d8ab
Merge pull request #9 from mc-server/core-integrate
...
Core integrate
2013-07-27 09:19:22 -07:00
9633f0fac0
Merge pull request #8 from mc-server/master
...
Merge in new Core
2013-07-27 09:17:54 -07:00
6787574b1d
Merge pull request #7 from tigerw/master
...
Updated Webadmin Hugely
2013-07-27 09:14:14 -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
f605b3353e
Merge pull request #4 from mc-server/license
...
License changes.
2013-07-27 08:31:58 -07:00
983d87e443
Added correct core plugin
2013-07-27 16:24:03 +01:00
66e837ecbc
Removed extraneous core.
2013-07-27 16:22:27 +01:00
0623a4f9be
Added the new core as a subtree.
2013-07-27 16:16:04 +01:00
madmaxoft
Tiger Wang
bearbin
FakeTruth
STRWarrior