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

1010 Commits

Author SHA1 Message Date
Masy98
9674224e32 Fixed spacing and light gray wool name! 2014-09-01 19:08:29 +02:00
Mattes D
78b7d0006a Merge pull request #1363 from mc-server/FurnaceRecipes 
Rewritten furnace.txt loading
 2014-09-01 09:00:51 +02:00
Howaner
959f89f5bc Fixed ReplaceString() documentation. 2014-09-01 00:42:40 +02:00
Howaner
3d7b8d3598 Rewrited furnace.txt 2014-08-31 19:28:36 +02:00
Masy98
90d39fd917 Added furnace recipes! 2014-08-31 16:50:05 +02:00
Masy98
ec259eeef0 Added missing mossy stonebrick recipe! 2014-08-31 16:33:19 +02:00
Masy98
b13f10aabf Added 1.8 recipes! 2014-08-31 16:25:12 +02:00
Masy98
9ee5229833 Added 1.8 blocks and items! 2014-08-31 15:28:01 +02:00
Howaner
1ec8c12799 WebAdmin: Exported logo and background. 2014-08-31 15:25:40 +02:00
Howaner
ceb1a46449 WebAdmin: Added favicon to the login template. 2014-08-31 14:52:44 +02:00
Howaner
fca986ec71 WebAdmin: Exported favicon. 2014-08-31 14:51:07 +02:00
Howaner
9a95b00648 WebAdmin: Exported stylesheet in a own file. 2014-08-31 14:39:58 +02:00
Howaner
8934ab487e WebAdmin: Added login template 2014-08-31 14:20:42 +02:00
madmaxoft
26b8471280 Merge branch 'master' into fixes 2014-08-30 22:17:49 +02:00
Masy98
55907376d5 Fixed missing slab name in line 297 2014-08-30 21:36:20 +02:00
Masy98
2d5a38bd61 Merge branch 'master' into crafting 2014-08-30 21:31:51 +02:00
Howaner
3ee3a59e75 Changed the IsEnchantable() comment. 2014-08-30 15:06:43 +02:00
Howaner
c5be3e0b66 Removed SexyMotd link 2014-08-30 12:55:43 +02:00
Howaner
04653b4539 Added GetWalkSpeed() and SetWalkSpeed() documentation. 2014-08-30 12:53:19 +02:00
Tiger Wang
9c1fadd50c Updated Core 2014-08-29 15:13:47 +01:00
Hownaer
c4d7f7996b Hotfixed recipe.txt loading. 2014-08-29 00:42:33 +02:00
Hownaer
4ff34b9f10 APIDump: Added missing cItem things. 2014-08-28 18:18:21 +02:00
Hownaer
e555cb4ab3 Fixed ItemCategory code example. 2014-08-28 00:05:11 +02:00
Mattes D
fe3d8fd810 Debuggers: Added a testcase for OnProjectileHitBlock. 
This is a test for #1326.
 2014-08-27 15:41:29 +03:00
Mattes D
98974412fa Merge remote-tracking branch 'origin/master' into DungeonRoomsFinisher 2014-08-26 17:09:16 +03:00
Mattes D
3a60f2cd83 Profiling: Added profiling script for x64 executable. 2014-08-26 16:55:43 +03:00
Mattes D
7146ed3065 VS Profiling: Shutdown the profiler on error. 2014-08-26 16:36:01 +03:00
Mattes D
3977d53b83 RankMgr: Exported the default-rank functions. 2014-08-24 20:05:28 +02:00
Mattes D
0daacd14d9 RankMgr: Implemented default rank, added defaults. 2014-08-23 03:44:04 +02:00
Mattes D
e034b64a5b Merge remote-tracking branch 'origin/master' into Ranks 2014-08-22 15:18:39 +02:00
Masy98
f71c76cf05 Fixed slab name 2014-08-21 22:13:12 +02:00
Masy98
940304bc64 Added missing recipes for stairs and slabs! 2014-08-21 22:08:34 +02:00
Masy98
b4cc3a118b Added missing recipes for stairs and slabs! 2014-08-21 21:50:32 +02:00
Masy98
81492f70d1 Changed new logs from wood to log! 2014-08-21 21:41:43 +02:00
Masy98
f569826a95 Added missing blocks in item.ini 2014-08-21 21:38:50 +02:00
Mattes D
326dd7e4c6 RankMgr: Added cRankManager::RemovePlayerRank(). 2014-08-21 16:55:39 +02:00
Mattes D
011ff52407 APIDump: Removed the cGroup and cGroupManager classes. 2014-08-21 15:46:43 +02:00
Mattes D
b7ec75add6 Updated the Core. 2014-08-20 22:27:58 +02:00
Mattes D
2218f31cde Exported cServer:ShouldAuthenticate to Lua API. 2014-08-20 22:21:41 +02:00
Mattes D
9f8eee578c APIDump: Added cRankManager documentation. 2014-08-20 19:09:45 +02:00
Howaner
6c8baf66c8 Updated HOOK_PLAYER_MOVING documentation. 2014-08-16 18:49:24 +02:00
madmaxoft
3020e8cc05 Merge remote-tracking branch 'origin/master' into Ranks 2014-08-12 11:10:32 +02:00
Christophe Piveteau
f7726317c9 Add entry for bat in monsters.ini 2014-08-11 18:57:41 +02:00
madmaxoft
af202c2363 Debuggers: Disabled UUID and RankMgr tests. 2014-08-09 22:55:38 +02:00
madmaxoft
4b1505f39d Merge remote-tracking branch 'origin/master' into Ranks 2014-08-09 14:25:49 +02:00
madmaxoft
251f0d5b97 Debuggers: Simple cRankManager test case. 2014-08-08 23:13:43 +02:00
Howaner
43de9af878 Added api documentation for Clamp() 2014-08-05 13:54:04 +02:00
Tiger Wang
01e9d6311a Updated submodules 2014-08-04 14:24:46 +01:00
madmaxoft
f5aaf52210 Debuggers: Added a Name-from-UUID cMojangAPI test. 2014-08-03 22:04:51 +02:00
madmaxoft
21f52676f3 cMojangAPI: Added UUID-to-Name lookup. 
Also fixed the bindings, now all functions are static-like.
 2014-08-03 22:04:51 +02:00
madmaxoft
003f18bd0f Added cMojangAPI:GetUUIDFromPlayerName(). 
This is a simpler way to ask for a single name -> uuid conversion.
 2014-08-03 22:04:50 +02:00
Tiger Wang
c865fc8ca5 Improved endermen code a little 2014-08-01 22:15:32 +01:00
Mattes D
941a182d8a Merge pull request #1255 from mc-server/NameToUUID 
Name to UUID
 2014-08-01 22:35:12 +02:00
madmaxoft
6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
Howaner
c138d19c31 Updated documentation again. 2014-07-31 18:16:52 +02:00
Howaner
c49d4fd215 Updated documentation. 2014-07-31 12:15:18 +02:00
madmaxoft
8b519bf6e2 MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames(). 2014-07-31 10:02:50 +02:00
Howaner
66d34b83d2 Added beacon documentation. 2014-07-30 22:31:43 +02:00
madmaxoft
a71c2da3f8 APIDump: Added notes about cache to cMojangAPI. 2014-07-30 17:07:57 +02:00
madmaxoft
1793644fef APIDump: Fixed UUID-related documentation. 2014-07-30 14:02:36 +02:00
madmaxoft
afef7a79d7 Debuggers: Updated for the new cMojangAPI changes. 2014-07-30 13:56:30 +02:00
madmaxoft
6476bd0e2e Exported cMojangAPI to Lua. 2014-07-30 13:56:29 +02:00
madmaxoft
b6677efecd Debuggers: Added an example for cClientHandle:GetUUIDsFromPlayerNames(). 2014-07-28 17:14:23 +02:00
madmaxoft
1acd03f96f Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API. 2014-07-28 17:09:39 +02:00
Tiger Wang
3385ed56b8 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
 2014-07-22 10:24:28 +01:00
madmaxoft
0346ab15ad Debuggers: Optimized and commented the /rmitem handler. 2014-07-18 23:51:15 +02:00
madmaxoft
abe8a6bd45 APIDump: Documented RemoveItem(). 2014-07-18 23:48:06 +02:00
Howaner
51b91befbd Added RemoveItem() function to the player inventory. 2014-07-18 23:11:59 +02:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
Howaner
fc6a5878df Removed special character in APIDump 2014-07-18 01:45:45 +02:00
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02:00
archshift
554e1c0dd3 OnEntityAddEffect.lua: Removed Originator param 2014-07-13 16:10:01 -07:00
Howaner
f1491ad1d1 Fixed diamond mover plugin 2014-07-13 01:18:41 +02:00
archshift
83c69134c0 Merge remote-tracking branch 'origin/master' into potions 2014-07-11 17:37:28 -07:00
madmaxoft
d790a45c50 APIDump: Documented cWorld:SetChunkAlwaysTicked. 
Ref.: #1160
 2014-07-10 18:28:20 +02:00
madmaxoft
3b7e0969b9 Debuggers: Added forced chunk ticking test. 
Ref.: #1160
 2014-07-10 18:19:05 +02:00
archshift
e824cd09b3 Merge remote-tracking branch 'origin/master' into potions 
Conflicts:
	src/Entities/Player.cpp
	src/Entities/ProjectileEntity.cpp
 2014-07-09 23:28:27 -07:00
madmaxoft
8f65d13d1b Merge remote-tracking branch 'origin/HandleCommand' 2014-07-04 15:41:48 +02:00
STRWarrior
546aab7b4a Removed useless sentence in cPluginManager:ExecuteCommand description. 2014-07-04 15:36:29 +02:00
STRWarrior
aa81a3ff3e Fixed ExecuteCommand description. 2014-07-04 14:29:19 +02:00
madmaxoft
20afd5d70e APIDump: Updated OnWeatherChanging docs after latest code changes. 2014-07-03 17:53:57 +02:00
Mattes D
9204c8a124 Merge pull request #1139 from Howaner/Hooks 
Add hook HOOK_PLAYER_FOOD_LEVEL_CHANGE
 2014-07-02 16:33:24 +02:00
Howaner
835d00428c Update documentation 2014-07-02 14:49:08 +02:00
Howaner
5a888f0a51 Change documentation 2014-07-01 20:30:13 +02:00
Howaner
5a152435b3 Add documentation. 2014-06-30 15:22:48 +02:00
Tiger Wang
bd5df3d3b9 Merge branch 'master' of https://github.com/mc-server/MCServer into portals 2014-06-24 21:15:48 +01:00
madmaxoft
e96a774f59 Added the Lua Proxy DLL. 
This builds the lua5.1.dll file on Windows, making it 64-bit if so required.
 2014-06-24 14:48:18 +02:00
madmaxoft
4306092753 Debuggers: Fixed the Blaze rod query tool. 2014-06-24 07:05:49 +02:00
madmaxoft
08fed2a213 Added cClientHandle::IsUUIDOnline function. 
Ref.: #771
 2014-06-21 22:13:35 +02:00
STRWarrior
e0a9f37d90 (Force)ExecuteCommand returns the CommandResult enums 
Exported and documented the CommandResult enums
 2014-06-18 12:13:01 +02:00
madmaxoft
a37d5410b4 APIDump: Added OnEntityAddEffect hook documentation. 2014-06-17 11:39:22 -07:00
archshift
5b2b6e0615 Pawn: renamed HandleEntityEffects to HandleEntityEffect 
Exported entity effect functions for ToLua and documented them in APIDesc.lua
 2014-06-17 11:39:21 -07:00
archshift
b2fbcaf1bf Implemented PR suggestions 
Furnace.txt: newline
BlockID: removed extraneous dimension mapping
cEntity: fixed typo
cPlayer: WorldPtr typedef
 2014-06-15 20:27:27 -07:00
Tiger Wang
7188a1f670 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/World.h
 2014-06-14 09:57:07 +01:00
STRWarrior
b0f1707d50 Fixed ChunkWorx stop button giving an error 2014-06-13 23:16:52 +02:00
madmaxoft
72043f5b0c APIDump: Added the Info.lua article. 
Fixes #504.
 2014-06-13 00:10:01 +02:00
Alexander Harkness
db4d786a84 Merge pull request #1082 from mc-server/cauldronfixes 
Add biome-aware downfall functions.
 2014-06-12 16:50:08 +01:00
Tiger Wang
29567c5610 Portals animate and delay correctly 2014-06-12 15:21:07 +01:00
Qais Patankar
3e7384d921 Fix typo in handy_functions.lua 2014-06-12 15:01:24 +01:00
Alexander Harkness
c335b8d773 Update APIDesc.lua 2014-06-11 13:34:49 +01:00
madmaxoft
97bfccfdc0 APIDump: Documented cBlockArea:GetCoordRange(). 2014-06-11 14:34:47 +02:00
Tiger Wang
bd25069c25 Update APIDesc.lua 2014-06-11 13:21:57 +01:00
Alexander Harkness
c5d1ca7dac Small change for easier understanding. 2014-06-08 20:54:41 +01:00
Alexander Harkness
e5da3097de Corrected the furnace fuels. Solves #1071 2014-06-07 18:25:18 +01:00
STRWarrior
8cf4e806ba APIDump: Fixed crash 2014-06-02 13:49:05 +02:00
STRWarrior
4c757de9ff Added OnProjectileHitBlock example in Debuggers 2014-06-02 11:54:45 +02:00
STRWarrior
fa78379f5a Updated OnProjectileHitBlock documentation. 2014-06-02 11:45:32 +02:00
Alexander Harkness
e06f786f11 Stuff. 2014-05-27 20:24:04 +01:00
Alexander Harkness
2194238ef0 Update main.css 2014-05-26 17:17:54 +01:00
Tiger Wang
27a9fa3110 Updated Core 2014-05-24 23:28:48 +01:00
Mattes D
28815252e6 Merge branch 'master' into SslWebAdmin 2014-05-10 21:27:57 +02:00
madmaxoft
45ca5bb857 Fixed cert filename in Linux script. 2014-05-07 15:09:25 +02:00
Howaner
f5fe368220 Merge branch 'master' into Slabs 2014-05-07 12:54:58 +02:00
Mattes D
e3d850b24a Made the cert generation script executable on Linux 2014-05-02 21:35:30 +00:00
madmaxoft
13452d3ab9 APIDump: Updated the OnDisconnect hook docs. 
Ref.: #655.
 2014-05-02 12:35:35 +02:00
madmaxoft
0cfa0c4561 APIDump: Improved error handling in API file loader. 2014-05-02 12:35:35 +02:00
madmaxoft
dc2d2ce53c Added a mention to run as admin. 2014-05-01 12:27:07 +02:00
madmaxoft
cf821bc9a4 Added scripts for generating HTTPS cert and key. 2014-05-01 11:48:45 +02:00
madmaxoft
272c232efb Implemented SSL connection for WebAdmin. 
Fixes FS-319.
 2014-05-01 11:48:03 +02:00
archshift
06819595b0 Fixed references to renamed files. 2014-04-23 15:25:10 -07:00
madmaxoft
695baed226 Updated docs for StringToEnchantmentID. 
Ref.: mc-server/Core#67
 2014-04-23 23:06:29 +02:00
archshift
fe08a903fc Declaration that a mob is not fireproof is implicit. 
Removed explicitly declaring mobs as not fireproof.
 2014-04-22 15:45:52 -10:00
archshift
e1476ebb26 Added IsFireproof hook for monsters.ini 2014-04-22 13:17:42 -10:00
archshift
1cf396c814 Fixed capitalization issues 
Wasn't parsing correctly before, as some items were not capitalized correctly.
 2014-04-22 02:18:41 -10:00
madmaxoft
62991d46fe APIDump: Added a ChunkStay article. 
Fixes #772.
 2014-04-19 16:15:57 +02:00
madmaxoft
8c7d0f5304 InfoReg uses cCompositeChat for subcommand lists. 
Also fixed an issue with console commands.
 2014-04-10 19:09:37 +02:00
madmaxoft
176deb4b5b Added the generated ZBS API file to ignore list. 2014-04-06 22:30:34 +02:00
Howaner
7da308a7e1 Merge branch 'master' into Slabs 2014-04-06 21:43:23 +02:00
Tiger Wang
c7f8c7eb21 Updated cWorld::CreateProjectile() documentation 2014-04-06 17:47:27 +01:00
madmaxoft
43e3a55a70 Added more API documentation to cCompositeChat. 2014-04-05 12:09:30 +02:00
Howaner
32d054e8fd Merge branch 'master' into Slabs 
Conflicts:
	src/Blocks/BlockDirt.h
 2014-04-03 22:03:18 +02:00
madmaxoft
e2fb507be2 APIDump: Added angular specifics. 2014-04-03 21:52:50 +02:00
madmaxoft
e304bd08a2 Documented the units and range for entity rotations. 2014-04-03 21:44:03 +02:00
madmaxoft
67d7ad8689 Debuggers: Added a Base64 API roundtrip test. 2014-04-02 11:58:19 +02:00
madmaxoft
e7e65b5005 Merged branch 'msDifference'. 2014-04-01 21:21:11 +02:00
STRWarrior
21e0607e49 APIDump: Gave msDifference it's own table. 2014-04-01 21:12:48 +02:00
madmaxoft
1229795ff0 cBlockArea: Added the msMask merge strategy. 2014-04-01 20:50:10 +02:00
madmaxoft
7aa6a3b866 LOG() API reads the LogLevel from the cCompositeChat's MessageType. 2014-04-01 09:32:14 +02:00
madmaxoft
58f2550321 APIDump: Documented the cCompositeChat support in logging functions. 2014-03-31 23:05:31 +02:00
madmaxoft
8126d9e66e Console logging supports cCompositeChat as its parameters. 2014-03-31 22:51:14 +02:00
STRWarrior
b19022fc7e Added extra table which should make it more clear what msDifference does. 2014-03-31 20:13:08 +02:00
STRWarrior
a8bc27f872 Fixed typo 2014-03-31 20:05:48 +02:00
STRWarrior
f7df8e133b Documented msDifference 2014-03-31 19:58:19 +02:00
madmaxoft
55d0db1606 APIDump: Added code completion support file to ZBS tutorial. 2014-03-31 18:34:27 +02:00
madmaxoft
f38a009b3c APIDump: Renamed the ZBS API dump file to mcserver_api.lua. 
This is to avoid confusion with ZBS, where two "mcserver.lua" files were present.
 2014-03-31 18:25:00 +02:00
madmaxoft
1bda9b0424 Merge branch 'NetherFortGen'. 2014-03-30 19:17:33 +02:00
madmaxoft
b64a1daf6c APIDump: Added article: Setting up ZeroBrane Studio. 
Fixes #824.
 2014-03-30 18:48:11 +02:00
madmaxoft
47a427d3dc Merge branch 'master' into NetherFortGen 2014-03-29 23:05:17 +01:00
STRWarrior
379d403443 Documented both hooks. 2014-03-29 16:08:39 +01:00
madmaxoft
8557549cfa Implemented the msSpongePrint merge strategy. 
Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block.
 2014-03-28 18:03:37 +01:00