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

1609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
madmaxoft@gmail.com
94a92a219b Server sends PlayerMaxSpeed after a respawn. 
http://forum.mc-server.org/showthread.php?tid=434&pid=8912#pid8912

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1671 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-08 18:30:27 +00:00
madmaxoft@gmail.com
97dc5a5365 Color codes are stripped from the DC message 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1670 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-08 13:00:09 +00:00
madmaxoft@gmail.com
791bf732fd 1.6.2 protocol implemented, both in MCServer and in ProtoProxy 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1669 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-08 12:59:15 +00:00
madmaxoft@gmail.com
a40585ec99 Pickups have an initial health of 5 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1668 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-08 07:23:44 +00:00
madmaxoft@gmail.com
9214a134ca World: More unused variables removed. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1667 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 20:48:50 +00:00
madmaxoft@gmail.com
3df8cfb091 World: Removed an unused variable 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1666 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 20:41:43 +00:00
madmaxoft@gmail.com
254295b5b8 Squid: fixed a possible crash caused by access to a wrong chunk 
Fixes FS #411.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1665 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 20:20:18 +00:00
madmaxoft@gmail.com
a72c6d9613 Ice is a solid block. 
Helps with FS #381

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1664 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 19:58:33 +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
a3c8b12ee9 Mobs are assigned MaxHealth from monsters.ini; reading monsters.ini doesn't need settings.ini values anymore. 
Fixes FS #409.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1662 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 15:09:05 +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
madmaxoft@gmail.com
b1d05b0f57 Improved function names for protocol packet sending; alpha-sorted the function lists 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1659 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-07 13:06:06 +00:00
madmaxoft@gmail.com
8f18510dec AnvilStats: moved into the Tools folder 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1658 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-06 19:56:03 +00:00
madmaxoft@gmail.com
b2214a56c4 ProtoProxy: moved into the Tools folder 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1657 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-06 19:45:36 +00:00
madmaxoft@gmail.com
567df6aacf MemDumpAnalysis: moved into the Tools folder; uses the global Expat library now. 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1656 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-06 19:44:54 +00:00
madmaxoft@gmail.com
209ad87026 BiomeVisualiser: Moved into the Tools folder 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1655 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-06 19:43:13 +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
madmaxoft@gmail.com
762f78774d Declaring full 1.6.1 compatibility 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1651 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 21:14:55 +00:00
madmaxoft@gmail.com
37590c4bd8 Unmounting vehicles implemented in the 1.6.1 way 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1650 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 21:11:06 +00:00
madmaxoft@gmail.com
b818addde4 Fixed 1.6.1's movement speed 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1649 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 21:02:08 +00:00
madmaxoft@gmail.com
1e37002528 ProtoProxy: Updated to protocol 1.6.1 (#73) 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1648 0a769ca7-a7f5-676a-18bf-c427514a06d6
 2013-07-05 20:56:54 +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