1
0
Commit Graph

2984 Commits

Author SHA1 Message Date
Daniel O'Brien
df4aa6c864 Merge remote-tracking branch 'upstream/master' into playerxp 2013-11-16 17:30:19 +11:00
Tiger Wang
7a0d2033b6 Switchified If, ElseIf statement
Also updated comments
2013-11-15 22:47:57 +00:00
madmaxoft
d96f622437 APIDump: Documented lxp, the XML parser class. 2013-11-15 22:39:27 +01:00
madmaxoft
905cd0e73e APIDump: Functions that are documented are never ignored.
This simplifies exclude-filters for functions such as lxp.new() that need inclusion.
2013-11-15 22:39:02 +01:00
Daniel O'Brien
a94a6d48a0 alignment fixes :) 2013-11-16 02:32:04 +11:00
Daniel O'Brien
04dff4882a finished #143 I believe 2013-11-16 02:23:50 +11:00
nesco
d3269f37fa Update items.ini 2013-11-15 14:18:53 +01:00
Daniel O'Brien
5e3614ce87 Merge remote-tracking branch 'upstream/master' into playerxp 2013-11-16 00:07:42 +11:00
nesco
c868d31377 Update Giant.cpp 2013-11-15 14:06:58 +01:00
madmaxoft
2ed8e38419 APIDump: Small fixes and additions. 2013-11-15 13:44:07 +01:00
madmaxoft
26d3dd3466 APIDump: Documented cSignEntity. 2013-11-15 13:34:20 +01:00
madmaxoft
7586e832bf APIDump: Documented cNoteEntity. 2013-11-15 13:10:36 +01:00
madmaxoft
194aa1decb APIDump: Documented the cJukeboxEntity. 2013-11-15 12:42:35 +01:00
Daniel O'Brien
1b2e6e7473 added cProtocol function to pass xp to client 2013-11-15 22:42:09 +11:00
madmaxoft
4f2645d0e5 APIDump: Documented cChunkDesc:GetBlockEntity(). 2013-11-15 11:34:43 +01:00
madmaxoft
ee1ac65e54 cChunkDesc::GetBlockEntity() re-creates block entity when blocktype doesn't match. 2013-11-15 11:33:24 +01:00
madmaxoft
5eb67dbdfc Debuggers: Removed the old OnChunkGenerated code testing the cBlockArea writing. 2013-11-15 11:28:11 +01:00
madmaxoft
49d6afd501 Removed cBlockEntity:CreateByBlockType() from the Lua API.
Plugins cannot be allowed to create block entities, that would result in memory leaks.
2013-11-15 10:15:27 +01:00
madmaxoft
90fc51c4d0 cRoot::SaveAllChunks() doesn't wait for the save (deadlocks).
Rather, it only queues the save task onto each world's tick thread.
2013-11-15 10:13:32 +01:00
madmaxoft
6e5d7b70a1 APIDump: Removed the BlockEntity constructors' docs. 2013-11-15 10:09:54 +01:00
madmaxoft
9048a3b66d Re-added rose to items.ini. 2013-11-15 09:56:07 +01:00
madmaxoft
7fddf4479d Debuggers: Added the BlockEntity test harness when generating chunks. 2013-11-15 09:49:56 +01:00
madmaxoft
ebb2ccaa26 Removed BlockEntities' constructors from the API.
Plugins shouldn't construct block entities, rather, they will query them either from the cWorld (while playing), or from cChunkDesc (while generating).
2013-11-15 09:49:56 +01:00
Daniel O'Brien
af17faac45 Merge remote-tracking branch 'upstream/master' into playerxp 2013-11-15 18:25:20 +11:00
Tiger Wang
15c330664a Fixed arrow bugs
* Fixed arrows hitting blocks wrong
2013-11-14 22:39:14 +00:00
nesco
8fa4f38202 Update Giant.cpp 2013-11-14 23:15:19 +01:00
Daniel O'Brien
f6e16ce150 cProtocol add SendExperience() and debugging 2013-11-15 08:35:02 +11:00
Alexander Harkness
d665bc8806 Merge pull request #349 from SamJBarney/master
Fixed growing issue with crops.
2013-11-14 10:17:11 -08:00
Samuel Barney
570aedb927 Fixed growing issue with crops. 2013-11-14 09:53:09 -07:00
madmaxoft
4533fc34ec Added cNoteEntity to Lua API.
Ref. #228.
2013-11-14 17:14:54 +01:00
madmaxoft
efb6f598bc Exported cJukeboxEntity to Lua API.
Ref. #228
2013-11-14 16:05:55 +01:00
Daniel O'Brien
ea778c7027 fixed XpGetPercentage 2013-11-15 01:46:41 +11:00
madmaxoft
082573771f Added cSignEntity into API, added cChunkDesc:GetBlockEntity().
This fixes both #228 and #347.
2013-11-14 15:37:09 +01:00
Alexander Harkness
3328c80aec Fixed another one. 2013-11-14 07:42:54 +00:00
Alexander Harkness
444e6e4fa7 Silenced yet another not completed enum warning. 2013-11-14 07:42:03 +00:00
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