1
0
Commit Graph

3149 Commits

Author SHA1 Message Date
Alexander Harkness
dc94b92753 Silenced another warning. 2013-11-14 07:38:59 +00:00
Mattes D
79a98627a2 Merge pull request #344 from marmot21/playerxp
PlayerXp
2013-11-13 23:04:43 -08:00
Daniel O'Brien
dbc2694b0f fixed function name 2013-11-14 16:48:14 +11:00
Daniel O'Brien
452f589e21 added tolua export snippet for VC 2013-11-14 16:29:33 +11:00
Daniel O'Brien
21bd1d74a1 luaExport 2013-11-14 16:20:27 +11:00
madmaxoft
e48dabfb10 Updated the Core. 2013-11-13 23:01:57 +01:00
madmaxoft
99da44095a Fix for NULL arithmetic compiler warning in Linux. 2013-11-13 22:54:01 +01:00
madmaxoft
a8cf6edab0 Merge remote-tracking branch 'origin/WolfUpdate'
Conflicts:
	source/Mobs/Wolf.h
2013-11-13 22:38:34 +01:00
Alexander Harkness
56c23305d5 Added the last bit of the enum, and alpha-sorted the switch. 2013-11-13 20:13:35 +00:00
Daniel O'Brien
d5c6d0666e fixed comment 2013-11-14 07:12:16 +11:00
Alexander Harkness
3ea3da8b3f Removed unnecessary format data. 2013-11-13 20:09:24 +00:00
Daniel O'Brien
b0be6cb02d changed function name 2013-11-14 07:07:57 +11:00
Daniel O'Brien
8c6bdca425 minor changes 2013-11-14 07:02:53 +11:00
Alexander Harkness
cd8894fca6 Got rid of warnings caused by the -s option on Clang, and it doesn't seem to do anything anyway. 2013-11-13 19:53:39 +00:00
nesco
b377072312 Update items.ini 2013-11-13 20:43:31 +01:00
nesco
69d711b407 Update items.ini 2013-11-13 20:43:24 +01:00
nesco
c854314208 Update crafting.txt with StainedGlass and StainedGlassPane 2013-11-13 20:43:09 +01:00
Alexander Harkness
26ac6881cd Fixed some of the comments in the makefile. 2013-11-13 19:41:05 +00:00
madmaxoft
5ebbdb4d51 Implemented the "help" console command in the server.
Fixes #42.
2013-11-13 20:40:18 +01:00
Alexander Harkness
9692f20a99 Fixed link error with clang on x86_64. 2013-11-13 19:36:04 +00:00
Daniel O'Brien
c17f77cf2a changed name convention 2013-11-14 04:41:36 +11:00
Daniel O'Brien
bf2dc38f35 Fixed problems with code style etc 2013-11-14 04:25:47 +11:00
madmaxoft
1701b628cb Console "reload" command implemented in MCServer, rather than in a plugin.
First part of #42.
2013-11-13 15:56:40 +01:00
madmaxoft
991f7d2315 cPluginManager:BindCommand() and :BindConsoleComman() now report full Lua stacktrace on failure. 2013-11-13 15:54:56 +01:00
madmaxoft
ceee25bd11 Fixed compiler warning. 2013-11-13 15:53:03 +01:00
madmaxoft
a8ad7c2383 PluginManager::Bind displays more information in the error message. 2013-11-13 15:50:24 +01:00
Daniel O'Brien
39f6b12b62 Merge remote-tracking branch 'upstream/master' into playerxp 2013-11-14 01:16:23 +11:00
Daniel O'Brien
875bca5fb9 Player Xp, includes get/set and addExperience 2013-11-14 01:07:24 +11:00
Daniel O'Brien
fc0b6adf51 Player Xp, includes get/set and addExperience 2013-11-14 01:05:58 +11:00
Mattes D
f0febc2fca Merge pull request #339 from nesco/master
Bug correction
2013-11-13 06:04:24 -08:00
nesco
7d615ee3ba Bug correction
Syntax error
2013-11-13 14:57:54 +01:00
Daniel O'Brien
3b47a07bac Player Xp 2013-11-14 00:50:47 +11:00
Mattes D
8efc04328d Merge pull request #337 from nesco/master
Updating enchantments list and ID/Metas List and some properties to the 1.7.2 version of Minecraft
2013-11-13 05:34:13 -08:00
nesco
e671f29d85 compatibility update 2013-11-13 14:29:18 +01:00
madmaxoft
293051eca8 Merge remote-tracking branch 'origin/fixes'. 2013-11-13 11:08:51 +01:00
nesco
f99835c095 compatibility update 2013-11-13 08:19:28 +01:00
nesco
ffe4de51c7 Update Enchantments.cpp 2013-11-13 08:17:26 +01:00
nesco
e4d77bc3fd Update Enchantments.h 2013-11-13 08:16:35 +01:00
Tiger Wang
347162a82f Bundled fixes [SEE DESC]
* BoundingBox now returns FACE_NONE
+ Arrows can be picked up
* Arrows dug up resume physics simulations
* Added sound effects for bows, lava to stone, and arrows
* Fixed SoundParticleEffect on <1.7 protocols
2013-11-12 21:43:20 +00:00
nesco
d58723cc4d Delete BiomeID.h 2013-11-12 22:11:57 +01:00
nesco
ce05498311 Sorting by Name on g_BlockTransparent 2013-11-12 22:08:33 +01:00
nesco
4d082d1190 BiomeFile, if not needed, will be removed 2013-11-12 22:03:48 +01:00
nesco
b6a9394d7a Update BlockID.cpp 2013-11-12 22:01:30 +01:00
nesco
5c67c17edc Corrected the comma error 2013-11-12 20:49:27 +01:00
nesco
56044aff33 Update BlockID.cpp 2013-11-12 19:26:35 +01:00
nesco
b7c1ed186a Update Enchantments.cpp 2013-11-12 19:15:48 +01:00
nesco
5c8017e629 Assigning properties to the blocks recently added. 2013-11-12 19:12:26 +01:00
nesco
8bdb963be4 Update BlockID.h 2013-11-12 18:54:56 +01:00
nesco
2026c8c2a6 Replace tabs by spaces 2013-11-12 18:53:53 +01:00
STRWarrior
1eb2b7e176 Now using a TickFollowPlayer function. 2013-11-12 16:39:59 +01:00