flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
1,619 Commits 1 Branch 0 Tags 92 MiB
d4830df4ee
Commit Graph

166 Commits

Author SHA1 Message Date
Tiger Wang
d4830df4ee Fixed very minor issue in template.html 
Removed extra space.
 2013-07-27 18:56:18 +01:00
STRWarrior
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
bearbin
9633f0fac0 Merge pull request #8 from mc-server/master 
Merge in new Core
 2013-07-27 09:17:54 -07:00
Tiger Wang
20cb8221f9 Updated Webadmin Hugely 
New CSS and stuffz!
 2013-07-27 17:12:45 +01:00
Alexander Harkness
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
Alexander Harkness
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
Alexander Harkness
983d87e443 Added correct core plugin 2013-07-27 16:24:03 +01:00
Alexander Harkness
aa64450421 Removed all the pre-exising core files. 2013-07-27 16:15:29 +01:00
madmaxoft@gmail.com
1b825df6c2 Added a shortcut for running under helgrind with the most common parameters and suppressions 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1682 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-26 08:49:58 +00:00
madmaxoft@gmail.com
4fb771f3ff First implementation of movement-related hunger and API 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1673 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-12 20:01:25 +00:00
madmaxoft@gmail.com
0756c72486 Core: /tp command can teleport either to a player or to a set of XYZ coords 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1663 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 19:57:56 +00:00
madmaxoft@gmail.com
5951bc76ec Added StringUtils functions to Lua API; added StripColorCodes(); ChatLog now strips color codes from logged messages. 
Fixes FS #398

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1661 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 14:42:07 +00:00
madmaxoft@gmail.com
0224a4f7fc Fixed sprinting in 1.6.1, made speeds available through API; fixed messages containing quotes. 
Fixes FS #415

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1660 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 14:13:43 +00:00
nielsbreu@gmail.com
4b18fd2eb1 Added missing "Colors", Documented the code + Cleanup. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1654 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-06 18:24:33 +00:00
nielsbreu@gmail.com
daff3ca687 Just a tiny speedup for the motd loading. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1653 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-06 13:30:10 +00:00
nielsbreu@gmail.com
983e29f065 Simplefied the motd loading function. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1652 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-06 11:13:29 +00:00
nielsbreu@gmail.com
ae22e2545d 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. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1647 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 19:56:32 +00:00
nielsbreu@gmail.com
cc4a1cad39 Reduced the amount of tables. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1644 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 11:13:21 +00:00
nielsbreu@gmail.com
504f6192f7 Updated LimitWorld. (Patch by tonibm19) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1642 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-03 08:13:53 +00:00
madmaxoft@gmail.com
37f6c78404 Added DamageType translation to API 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1639 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 18:46:45 +00:00
nielsbreu@gmail.com
3a6e9983f5 Fixed /stop command. The console still doesn't get closed though(FS#249). 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1637 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 11:42:59 +00:00
nielsbreu@gmail.com
0ba7a42762 Updated the /back and /top command. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1636 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-01 10:54:34 +00:00
madmaxoft@gmail.com
37276a4430 Rewritten entity-on-fire management ("forever on fire" bugs) 
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
 2013-07-01 10:39:56 +00:00
madmaxoft@gmail.com
3cfe865df3 Changed the crafting recipe for book to match vanilla since 1.3.1 (fix contributed by mgueydan) 
Fixes FS #404

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1634 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-30 20:57:00 +00:00
nielsbreu@gmail.com
290ab0b588 The LimitWorlds function now uses cCuboid 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1633 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-30 19:14:22 +00:00
madmaxoft@gmail.com
7b75aaea7c Advanced RCON: Command output is sent to the RCON client. 
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
 2013-06-29 15:30:05 +00:00
nielsbreu@gmail.com
cff6ff2223 Added a function that allows you to change the /back coordinates. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1630 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-28 18:43:29 +00:00
nielsbreu@gmail.com
beb36ee149 Added /listworlds command and fixed bug in /listgroups where you have an extra comma at the end. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1629 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-28 10:18:55 +00:00
nielsbreu@gmail.com
ce1a56836a ActivatorRail is craftable (Patch by tonibm19) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1625 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-24 19:02:14 +00:00
nielsbreu@gmail.com
4212c4ba12 Fixed piston crafting and redstone blocks can be crafted. (Patch by tonibm19) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1623 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-24 12:14:30 +00:00
madmaxoft@gmail.com
943dcaea14 Plugins can modify message in the OnChat() hook handler. 
FS #376

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1622 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-22 19:08:34 +00:00
madmaxoft@gmail.com
97eda34a94 Rewritten furnaces 
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
 2013-06-16 20:24:07 +00:00
madmaxoft@gmail.com
64f70c2e2c Core: fixed a warning message when using the /item command 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1600 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-16 17:23:01 +00:00
madmaxoft@gmail.com
92fc62fb4b Fixed The MagicCarpet plugin 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1590 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-15 14:26:21 +00:00
nielsbreu@gmail.com
1e6e39f10a Added the option of saving all the chunks of a world using the webadmin. 
FS #354

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1588 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-13 17:05:53 +00:00
madmaxoft@gmail.com
bb3e53df08 ProtectionAreas: Added a license file. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1581 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-11 10:06:31 +00:00
madmaxoft@gmail.com
9a6694f56c ProtectionAreas: Improved command help strings 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1580 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-11 09:59:51 +00:00
madmaxoft@gmail.com
30924db508 ProtectionAreas: Moved all strings sent to players to a separate language file 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1579 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-11 09:55:46 +00:00
madmaxoft@gmail.com
c6ddc89e92 ProtectionAreas: usernames are now handled case-insensitive 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1578 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-11 08:11:08 +00:00
madmaxoft@gmail.com
e3713be451 ProtectinoAreas: Configuratino is now loaded from an INI file 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1576 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-10 12:41:05 +00:00
madmaxoft@gmail.com
2adf62e22e ProtectionAreas: Implemented reloading areas when a player moves 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1575 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-10 07:21:52 +00:00
madmaxoft@gmail.com
ed06d13b5c ProtectionAreas: Fixed area reloading 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1574 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-10 06:47:03 +00:00
madmaxoft@gmail.com
1ca637f660 ProtectionAreas: Added asserts to cStorage functions so that logic errors are found faster 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1568 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-08 22:42:32 +00:00
madmaxoft@gmail.com
52fcb41dd3 ProtectionAreas: Implemented the ProtRemUserAll command's DB access 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1567 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-08 19:49:26 +00:00
madmaxoft@gmail.com
bfd1ce5e53 ProtectionAreas: Implemented adding users to an area in the DB 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1566 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-08 19:16:57 +00:00
madmaxoft@gmail.com
01260be572 ProtectionAreas: Added ProtListUsers, implemented ProtRemoveUser, fixed ProtDelID commands 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1565 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-08 16:47:03 +00:00
madmaxoft@gmail.com
2b232f5471 ProtectionAreas: ProtList works directly above the DB, displays areas' IDs and creators. ProtAdd and ProtAddCoords commands show the ID of the new area 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1564 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-08 15:06:24 +00:00
madmaxoft@gmail.com
b244f206d5 ProtectionAreas: The areas are now read from the DB (once) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1563 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-07 20:19:36 +00:00
madmaxoft@gmail.com
018adc3153 ProtectionAreas: Fixed cCommandState's detection of not-selected 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1562 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-06-07 19:58:02 +00:00
madmaxoft@gmail.com
9790a6817c ProtectionAreas: Implemented all command handlers. 
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
 2013-06-07 16:28:37 +00:00