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

1115 Commits

Author SHA1 Message Date
Howaner
72bb299a4a Merge branch 'master' into ChunkLoader 
Conflicts:
	src/ChunkSender.cpp
	src/ClientHandle.cpp
	src/World.h
 2014-10-23 14:59:42 +02:00
Alexander Harkness
782e466ca1 Upgraded core. 2014-10-22 15:27:01 +01:00
Mattes D
bfd1a9601a APIDump: Added docs for a few projectiles. 2014-10-22 16:06:31 +02:00
Alexander Harkness
7cda6f9346 Clearer version indication. 2014-10-22 13:55:21 +01:00
Mattes D
1cd45e770d Added inheritance information to Lua docs for projectiles. 2014-10-21 23:11:45 +02:00
Howaner
5d3b6c212f Reverted plugin remove 2014-10-21 18:30:59 +02:00
Howaner
690e89001e Fixed submodule downgrades 2014-10-21 18:13:14 +02:00
Howaner
44514e53fc Merge branch 'master' into ChunkLoader 
Conflicts:
	src/ClientHandle.cpp
 2014-10-21 16:55:22 +02:00
Tiger Wang
bc97399b01 Updated ProtectionAreas 2014-10-21 13:44:33 +01:00
Mattes D
ac80f62650 Updated the Core. 2014-10-20 20:23:38 +02:00
Mattes D
d79d5945e3 InfoDump: Do not crash if one plugin fails to load. 
If there's a syntax error in one plugin's Info.lua file, report the error and continue processing.
 2014-10-20 20:14:00 +02:00
Mattes D
5d43dc0f45 InfoDump: Fixed trailing whitespace. 2014-10-18 20:53:58 +02:00
Mattes D
e2c1b86839 InfoDump: Fixed GH permission export, moved output to plugins. 2014-10-18 20:51:28 +02:00
Mattes D
7f8118e0cb cWorld: Fixed scheduler. 
Fixes #1534.
Added a test case into the Debuggers plugin.
 2014-10-13 14:49:18 +02:00
archshift
20dfd9ba3e Webadmin: use images already in files/ instead of inline image data 
This also probably means that the browser will be able to cache the images better, and not have to repeatedly download them al a part of the HTML.
 2014-10-11 13:36:43 -07:00
Alexander Harkness
d9a50dd2ee Fixed remaining indent and replaced tiger with webfreak. 2014-10-11 17:15:38 +01:00
win32re
0c4894b99e Update template.html 2014-10-11 18:11:56 +02:00
win32re
59efc7cfd2 Fixed indentation. 2014-10-11 18:07:10 +02:00
win32re
9bb2b43e9e More template changes. 2014-10-11 17:57:56 +02:00
win32re
d3f31b5046 Update template.html 2014-10-11 17:40:33 +02:00
Alexander Harkness
fa00cbeda3 Added MagicCarpet 2014-10-08 21:13:38 +01:00
Alexander Harkness
27e69f32c6 Removed MagicCarpet 2014-10-08 21:13:10 +01:00
Alexander Harkness
ccbd5ba6a2 Added Handy. 2014-10-08 21:11:09 +01:00
Alexander Harkness
3b68949cc9 Added ChatLog 2014-10-08 21:08:21 +01:00
Alexander Harkness
8f625867f7 Removed ChatLog. 2014-10-08 21:07:55 +01:00
Alexander Harkness
ce11888851 Added chunkWorx. 2014-10-08 21:05:24 +01:00
Alexander Harkness
de41e2a04c Removed ChunkWorx 2014-10-08 21:04:26 +01:00
Mattes D
75003e1537 Merge pull request #1509 from WebFreak001/master 
Made WebAdmin more modern
 2014-10-06 10:46:46 +02:00
Mattes D
a8aeceab9d cClientHandle: Added protocol version knowledge. 2014-10-05 20:19:21 +02:00
Mattes D
02617a11cd Updated Core. 2014-10-05 15:05:51 +02:00
WebFreak001
7aa81de2c6 added font callback 2014-10-05 11:48:44 +02:00
WebFreak001
cea0707ad5 Removed my license, added me to CONTRIBUTORS 2014-10-05 11:35:29 +02:00
WebFreak001
828ded593c Added newline 2014-10-05 11:24:54 +02:00
WebFreak001
3baacce51e Added license 2014-10-05 11:14:16 +02:00
WebFreak001
017ba1c32a Made WebAdmin design more modern 2014-10-05 11:09:48 +02:00
Alexander Harkness
7c731dbd8a Added parentheses for clarity. 2014-10-01 21:37:20 +01:00
madmaxoft
a765e43ee0 APIDump: Fixed cEntity documentation. 2014-10-01 22:32:24 +02:00
Alexander Harkness
adab829d8f Fixed broken code. 2014-10-01 20:14:28 +01:00
madmaxoft
ac0b3168a1 APIDump: Added more of the missing documentation. 2014-10-01 17:29:28 +02:00
madmaxoft
901bed3989 Unified cRoot broadcast chat documentation. 2014-10-01 12:44:28 +02:00
madmaxoft
196f09d4bc APIDump: Documented missing cIniFile function. 2014-10-01 12:24:37 +02:00
madmaxoft
a8f29097de APIDump: Documented missing cCompositeChat functions. 2014-10-01 12:24:09 +02:00
madmaxoft
f2f0c26421 APIDump: Added missing cClientHandle documentation. 2014-10-01 12:14:51 +02:00
madmaxoft
46d3d40493 Updated Core. 2014-09-29 22:12:33 +02:00
madmaxoft
cba871fd87 Updated Core. 2014-09-29 22:00:36 +02:00
madmaxoft
33dc66a4d2 RankMgr: GetAllPlayers() returns players sorted by name. 2014-09-29 22:00:14 +02:00
madmaxoft
7a8ca26052 Updated the Core. 2014-09-29 21:46:38 +02:00
madmaxoft
3c6ce77934 Fixed a typo in the description. 2014-09-29 20:39:09 +02:00
Howaner
347402d20d Merge branch 'master' into Ranks 2014-09-29 14:37:01 +02:00
Howaner
63c53a8e23 cRankManager: Added ClearPlayerRanks() 2014-09-28 15:16:11 +02:00
Howaner
27331da017 Updated api documentation. 2014-09-28 11:17:36 +02:00
Alexander Harkness
4a4411d4d7 Add Code example. 2014-09-28 09:28:51 +01:00
Alexander Harkness
24275e058b changed description to be more readable. 2014-09-27 21:35:08 +01:00
Alexander Harkness
e5873d4e89 Copy edit. 2014-09-27 21:28:59 +01:00
Alexander Harkness
57e83f7d49 Fixed return value descriptions. 2014-09-27 21:27:48 +01:00
Alexander Harkness
990a467eb4 Fixed typo again. 2014-09-27 16:49:40 +01:00
Alexander Harkness
5245bb0eba Typo fix. 2014-09-27 16:44:11 +01:00
Alexander Harkness
9dccbe7792 Fixed line left in. 2014-09-27 15:40:33 +01:00
Alexander Harkness
3ff7103440 Remaining part of fix. 2014-09-27 15:35:06 +01:00
Alexander Harkness
400a4d1083 Hopefully fix #1384 
Can @madmaxoft comment?
 2014-09-27 15:33:35 +01:00
Tiger Wang
a817243e3f Updated Core 2014-09-26 21:42:55 +01:00
Masy98
2feee3b316 Merge branch 'master' into blocks 
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-09-26 18:32:31 +02:00
Howaner
4b38e077cf Merge branch 'master' into EntityCustomName 
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
 2014-09-23 14:39:49 +02:00
Alexander Harkness
5f823fd18d Merge pull request #1398 from mc-server/1.8-Protocol 
1.8 Protocol Update
 2014-09-22 20:45:22 +01:00
madmaxoft
b2573aad50 Fixed typos in items.ini. 2014-09-19 22:30:32 +02:00
Mattes D
a5386070d6 Merge pull request #1442 from Masy98/Language 
Added german language support
 2014-09-19 22:28:45 +02:00
Howaner
0baca1f1d8 Updated SPAWNING_ENTITY hook description. 2014-09-19 14:36:02 +02:00
Masy98
b3de0e104f Added german language support, now really 2014-09-18 17:39:32 +02:00
Masy98
400ce1f9e0 Added german language support 2014-09-18 16:37:34 +02:00
Howaner
ccaec8f424 Fixed wrong url in the debuggers plugin 2014-09-17 20:28:30 +02:00
Mattes D
5b63a7fe98 Merge pull request #1353 from mc-server/Effects 
Added speed entity effect.
 2014-09-13 17:05:59 +02:00
madmaxoft
c0a069b260 APIDump: Improved command binding documentation. 2014-09-12 20:59:47 +02:00
Howaner
1223a24d3c Merge branch 'master' into Effects 2014-09-12 19:13:46 +02:00
Masy98
ad1c61c3dd Added slime block to slime balls recipe 2014-09-12 18:07:51 +02:00
Mattes D
84cb258ec2 Merge pull request #1414 from Masy98/Crafting 
Fixed sign recipe
 2014-09-10 20:38:22 +02:00
Masy98
67d710429f Fixed spacing 2014-09-10 20:36:51 +02:00
Masy98
d8c381d8cc Fixed sign recipe 2014-09-10 20:31:33 +02:00
Mattes D
c5cd75fae8 Exported cClientHandle:GetIPString() to Lua API. 2014-09-07 22:35:22 +02:00
Mattes D
690867c89e Fixed submodules' downgrade from the previous PR merge. 2014-09-07 09:09:10 +02:00
Masy98
a2452ff6fa Re-ordered the items.ini and added a few new names 2014-09-06 22:37:48 +02:00
Masy98
9cdb9b6262 Merge branch 'master' into blocks 
Conflicts:
	MCServer/crafting.txt
 2014-09-06 22:06:40 +02:00
Masy98
029eb3d4fa Merge remote-tracking branch 'upstream/master' 2014-09-06 22:03:35 +02:00
Alexander Harkness
f6e029253f Removed outdated message sending methods. 
Fixes #1381
 2014-09-06 10:24:33 +01:00
Mattes D
b1cc1451d4 Merge pull request #1361 from mc-server/WebAdmin 
Webadmin improvements
 2014-09-06 11:12:18 +02:00
Masy98
15bee41a36 Merge remote-tracking branch 'upstream/master' 2014-09-05 11:27:21 +02:00
madmaxoft
1b9edb0279 Debuggers: Reviewed and fixed the Pickups and Poof commands. 
Now they're confirmed working.
 2014-09-03 23:05:49 +02:00
madmaxoft
5fa1a7fa22 Debuggers: Added a test code for ForEachEntityInBox(). 
Currently untested, may not run, may crash.
 2014-09-03 17:02:16 +02:00
madmaxoft
a9ed5baba3 Exported ForEachEntityInBox() to Lua API. 2014-09-03 17:01:23 +02:00
Masy98
4823cbf73d Fixed typo! 2014-09-02 21:54:47 +02:00
Masy98
63e9c9c6d9 Added missing recipes! 2014-09-02 21:36:59 +02:00
Masy98
20678ec542 Seperated the "custom" names from the normal list! 2014-09-02 21:36:32 +02:00
Masy98
96f5b3c465 Added new recipes! 2014-09-02 21:09:32 +02:00
Masy98
cdec89d924 Seperated "custom" names list from the normal list in items.ini! 2014-09-02 21:00:26 +02:00
Howaner
c19b2befa8 Changed the IsEnchantable() comment again. 2014-09-02 20:17:31 +02:00
Howaner
e431bb4e63 Merge branch 'master' into Inventory 2014-09-02 20:11:38 +02:00
Howaner
38e824dbcf Renamed SetWalkSpeed() to SetRelativeWalkSpeed() 2014-09-02 20:10:41 +02:00
Howaner
d3b8100a7b Merge branch 'master' into Effects 2014-09-02 20:03:42 +02:00
Howaner
b8769e3fb4 Merge branch 'master' into WebAdmin 2014-09-02 19:37:03 +02:00
Howaner
42dcd534df Merge branch 'master' into EntityCustomName 2014-09-02 19:36:14 +02:00
Howaner
079634d18c Added the new functions to APIDump. 2014-09-02 19:20:59 +02:00
Howaner
c8953d165c Added a custom name test to the debuggers plugin. 2014-09-02 19:13:36 +02:00
madmaxoft
4837d41368 Re-added alternate spellings of darkgraywool. 2014-09-02 08:35:58 +02:00
madmaxoft
7fb9cbcfb2 Re-updated the Core. 2014-09-02 08:34:23 +02:00
Masy98
8f58cc50dd Added missing leather recipe! 2014-09-01 21:34:04 +02:00
Masy98
cc9acd13b9 Merge branch 'master' into blocks 
Conflicts:
	MCServer/furnace.txt
	MCServer/items.ini
 2014-09-01 21:30:45 +02:00
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