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

1784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tiger Wang
18f3595f31 Merge pull request #13 from tigerw/master 
Removed Deprecated Option
 2013-07-28 04:57:40 -07:00
Tiger Wang
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
madmaxoft
0caadbb25c Hunger-per-distance is calculated only for the XZ distance 2013-07-28 11:54:37 +02:00
madmaxoft
d155c1cb00 Player food level is reset on respawn 2013-07-28 11:52:24 +02:00
madmaxoft
c5c233312a Merge remote-tracking branch 'origin/master' into hunger 2013-07-28 11:47:29 +02:00
bearbin
e6c63f4281 Merge pull request #6 from mc-server/git-transition 
Transition to git.
 2013-07-28 02:40:58 -07:00
Alexander Harkness
534cddf4c1 Added a .gitignore for the anvilstats folder. 2013-07-28 10:32:03 +01:00
Alexander Harkness
74a3de203b Added a .gitignore for the VC2008 folder. 2013-07-28 10:31:10 +01:00
madmaxoft
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
Alexander Harkness
79a0afd953 Added a .gitignore for the MCServer directory. 2013-07-28 10:26:47 +01:00
Alexander Harkness
b5c38e98fb Added some more root .gitignores. 2013-07-28 10:25:25 +01:00
bearbin
25b9cdc893 Merge pull request #11 from tigerw/master 
Fixed Window Titles being MCS-*
 2013-07-28 01:52:20 -07:00
Tiger Wang
265fa6d750 Fixed Window Titles being MCS-* 
For example, MCS-Chest, MCS-DoubleChest, etc.
 2013-07-27 22:32:07 +01:00
Alexander Harkness
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
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
1d0b57d8ab Merge pull request #9 from mc-server/core-integrate 
Core integrate
 2013-07-27 09:19:22 -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
6787574b1d Merge pull request #7 from tigerw/master 
Updated Webadmin Hugely
 2013-07-27 09:14:14 -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
bearbin
f605b3353e Merge pull request #4 from mc-server/license 
License changes.
 2013-07-27 08:31:58 -07:00
Alexander Harkness
983d87e443 Added correct core plugin 2013-07-27 16:24:03 +01:00
Alexander Harkness
66e837ecbc Removed extraneous core. 2013-07-27 16:22:27 +01:00
Alexander Harkness
0623a4f9be Added the new core as a subtree. 2013-07-27 16:16:04 +01:00
Alexander Harkness
aa64450421 Removed all the pre-exising core files. 2013-07-27 16:15:29 +01:00
Tiger Wang
e084341c6b Fixed xoft build link 
It didn't have http:// so it went to github.
 2013-07-27 15:58:37 +01:00
Alexander Harkness
62ba7508e5 Added the license, so now it is clear for new people what it is. 2013-07-27 14:39:44 +01:00
Alexander Harkness
5f1607c2e8 Added a contributors file. 2013-07-27 14:39:32 +01:00
Alexander Harkness
6400fc71a0 Added extra ignores for git. 2013-07-27 14:26:54 +01:00
bearbin
204ae378b0 Merge pull request #3 from mc-server/git-transition 
Git transition
 2013-07-27 06:25:23 -07:00
Alexander Harkness
6b083746ee Add README, fixes #1 2013-07-27 14:22:55 +01:00
STRWarrior
235c23d464 Hunger: If a player dies the food level resets. 2013-07-27 06:07:10 -07:00
Alexander Harkness
c20aaa8f88 Added README 2013-07-27 12:01:12 +01:00
Alexander Harkness
a0de91047a Added a .gitignore for helpfulness. 2013-07-27 11:44:14 +01:00
madmaxoft@gmail.com
6b348717d8 Removed debug-logging the player movement in each tick 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1685 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-26 20:03:25 +00:00
madmaxoft@gmail.com
fa66659456 cItemGrid: ChangeSlotCount() now returns -1 if invalid SlotNum 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1684 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-26 19:53:47 +00:00
madmaxoft@gmail.com
cd8720bf7e cInventory: Added the ChangeSlotCount() function to the Lua API 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1683 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-26 19:50:06 +00: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
cd007c2908 Plugins folder: ignoring everything not explicitly added 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1681 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-26 08:48:02 +00:00
madmaxoft@gmail.com
1b20cfa425 cEntity doesn't process physics / burning when in an invalid chunk 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1680 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-24 20:36:12 +00:00
madmaxoft@gmail.com
df34c43293 Server shuts down when the stdin is closed (linux Ctrl+D / win Ctrl+Z) 
Fixes FS #419

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1679 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-24 20:25:27 +00:00
madmaxoft@gmail.com
bb4bb018ab Docs: Added the cPawn -> cPlayer API class inheritance 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1678 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-24 20:18:57 +00:00
madmaxoft@gmail.com
a96ee0abfa cListenThread initializes m_ShouldReuseAddr to false (valgrind error) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1677 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-22 19:55:10 +00:00
madmaxoft@gmail.com
889402a56a Simulators don't simulate in invalid chunks (valgrind error) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1676 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-22 19:54:27 +00:00
madmaxoft@gmail.com
168c760b06 Added the docs folder with some documents that have piled up in my working copy 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1675 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-21 20:01:35 +00:00
madmaxoft@gmail.com
2fca0567bf Added a StringToMobType() function to the Lua API (patch contributed by STR_Warrior) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1674 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-12 20:28:41 +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
f5e475d44f Added the cFastRandom class 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1672 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-11 08:34:41 +00:00