Tycho
fec17409d2
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/World.h
2014-01-31 15:31:05 -08:00
Alexander Harkness
79ef653cb7
Fixed some more.
2014-01-31 07:41:21 +00:00
Alexander Harkness
d3b8796c48
Fixed at least a little of the plugin guide.
2014-01-30 21:19:45 +00:00
Alexander Harkness
e0cb06dfae
Update Core
2014-01-30 17:54:10 +00:00
STRWarrior
4d53eb2711
Documented cFloater.
2014-01-29 15:36:53 +01:00
Mattes D
cdcad2237a
Merge pull request #587 from mc-server/mobimprovements
...
Mob improvements & rudimentary artificial intelligence
2014-01-25 13:36:32 -08:00
madmaxoft
9d1ebaaf0d
Ignoring the Comm Logs.
2014-01-25 15:06:30 +01:00
Tiger Wang
4eb52b25db
Updated Core
2014-01-24 19:58:37 +00:00
Tiger Wang
3e675f8c38
Implemented creeper abilities
...
* Creepers now explode with a sound effect
* Creepers drop a music disc on the unlikely event of being killed by a
skeleton's arrow
Inspired by @maniak89's PR #132 .
2014-01-24 19:52:52 +00:00
madmaxoft
ebc3f6aa28
APIDump: Fixed indent after merge.
2014-01-24 08:59:21 +01:00
madmaxoft
8a254faaf7
Merge remote-tracking branch 'MikeHunsinger/master'
2014-01-24 08:55:41 +01:00
Mike Hunsinger
9926ea58e8
Fixed indentation and doxygen comments... For real this time.
2014-01-23 20:01:08 -07:00
Mike Hunsinger
11948b1d4b
Fixed spacing and doxycomments.
2014-01-23 19:54:00 -07:00
Mike Hunsinger
41b05416c7
Split TossItem into three Toss functions (Held, Equipped and Pickup)
2014-01-23 00:27:39 -07:00
madmaxoft
a6661e899a
InfoDump: Can dump a single plugin without LFS.
2014-01-22 12:41:19 +01:00
madmaxoft
f58d11fc1a
InfoDump: Dump all referenced permissions.
2014-01-22 10:18:58 +01:00
madmaxoft
2a018cfa49
Implemented cPluginManager:CallPlugin() API.
...
This function supersedes cPlugin:Call(), is safer to use in regards to multithreading and once again removes the need for the cPlugin class being exported at all.
2014-01-21 23:00:35 +01:00
madmaxoft
2407a67906
APIDump: Added notes about objects across cWorld's task execution.
2014-01-19 23:56:49 +01:00
madmaxoft
e9e9593e6d
APIDump: Updated cWorld:ScheduleTask()'s description.
2014-01-19 23:50:49 +01:00
madmaxoft
41618bf242
Changed the cWorld::ScheduleTask() signature.
...
Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
2014-01-19 23:49:19 +01:00
madmaxoft
1c05831974
Updated Core.
2014-01-19 16:20:38 +01:00
Tiger Wang
2a4fa72d10
Updated core
2014-01-19 13:43:42 +00:00
madmaxoft
cef2967637
APIDump: Updated cPluginManager:GetAllPlugins().
2014-01-17 15:54:33 +01:00
Alexander Harkness
714c8ed1a9
Updated core to the latest version and edited the submodules file to allow greater compatibility on restricted networks.
2014-01-17 10:38:36 +00:00
madmaxoft
343136a2ae
Finished exporting cWorld:ScheduleTask() to Lua API.
2014-01-16 19:56:08 +01:00
Alexander Harkness
bf0d58428d
Merge pull request #548 from worktycho/documention
...
Added Documention for a few features I've added
2014-01-16 09:55:37 -08:00
Tycho
daf94e5f48
Documented the SchedualeTask function
2014-01-16 09:53:46 -08:00
madmaxoft
7e2675a998
APIDump: Explicitly listed static cPlayer functions.
2014-01-15 19:26:01 +01:00
Tiger Wang
c4da025d5a
Updated Core! ±±±___±±±
2014-01-15 14:08:41 +00:00
Mattes D
457e93f1ed
Merge pull request #538 from mc-server/minecarts
...
Minecarts
2014-01-15 02:42:24 -08:00
madmaxoft
e3117d797e
Moved profiling scripts into the MCServer folder.
...
Also they default to the 2010 version of the tools, which is Win7-compatible, and should be 64-bit-compatible, too.
2014-01-14 11:05:27 +01:00
madmaxoft
f7c691caaa
APIDump: Wrapped example code so that it displays well on small screens.
...
The listing was pushing the resulting webpage too wide on my 19" screen, causing various distortions.
2014-01-13 21:39:21 +01:00
madmaxoft
74ddd03a9f
APIDump: Added OnPluginMessage.lua file to Decoda project.
2014-01-13 19:48:07 +01:00
madmaxoft
448ac3ef14
APIDump: Added missing bits of documentation.
...
The recent changes didn't document some of the new API functions.
2014-01-13 19:45:15 +01:00
madmaxoft
55e92f056d
APIDump: Documented the plugin messaging hook and function.
2014-01-13 19:21:57 +01:00
Tiger Wang
e932c69b82
Fixed VS2013 compile and updated Core
2014-01-12 13:59:39 +00:00
Mattes D
1ec9eb564c
Merge pull request #526 from mc-server/IniFileFix
...
Fixed cIniFile's SetValue().
2014-01-11 23:32:54 -08:00
madmaxoft
2e0fcbdcb7
Documented the cIniFile:AddValue* functions.
...
Now the documentation really matches the implementation.
2014-01-11 16:50:52 +01:00
Mattes D
e213769216
Merge pull request #522 from mc-server/LuaDlFix
...
Lua dl fix
2014-01-10 08:27:43 -08:00
madmaxoft
00af5d4d6e
Debuggers: Test code for WECUI plugin messaging.
2014-01-09 14:26:44 +01:00
madmaxoft
4a1b78787f
Windows nightbuild updated to generate .example.ini files.
...
Fixes #314 .
2014-01-09 09:47:16 +01:00
madmaxoft
18310752b8
Fixed a typo in the TestLuaRocks test plugin.
2014-01-09 08:05:34 +01:00
madmaxoft
71946f5671
Added a known working favicon.
2014-01-08 20:18:26 +01:00
Tiger Wang
6c65b050ca
Updated Core
2014-01-07 21:29:01 +00:00
Tiger Wang
524aecc106
Updated submodules
2014-01-07 17:25:20 +00:00
madmaxoft
e353f29d4a
Plugin messages are received and handed to plugins.
...
Note that MCS doesn't currently handle any channel registrations, this will come later on.
2014-01-07 17:47:20 +01:00
madmaxoft
8b6be58ad9
InfoDump: Removes indent and parses ParameterCombinations.
...
The DetailedHelp was a bad name for what it really contained, so it has been renamed to ParameterCombinations.
2014-01-06 10:25:52 +01:00
madmaxoft
84bf32f857
Fixed cPluginManager:AddHook() binding.
...
Fixes #401 . Old formats are still accepted, for compatibility reasons.
2014-01-05 15:46:45 +01:00
madmaxoft
44cf86dcf9
InfoDump: Removed an unneeded function.
2014-01-05 15:15:59 +01:00
madmaxoft
20da685002
InfoDump: All reasonable strings are forumized.
2014-01-04 22:11:19 +01:00
madmaxoft
b2ac227064
Added forum output for commands' DetailedHelp array.
...
Also added some coloring to simulate syntax highlighting.
2014-01-04 20:42:31 +01:00
madmaxoft
58e18b41f7
InfoDump: Implemented list and formatting Forumizing.
...
The exported strings are now parsed for basic formatting and list-related tags.
2014-01-04 19:24:39 +01:00
madmaxoft
da2e7c25b0
InfoDump: added AdditionalInfo to forum dumps.
2014-01-04 15:36:27 +01:00
madmaxoft
4c3d2a86a5
Added an InfoDump script for dumping all plugins' Info.lua into forum description.
...
GitHub description will follow later on.
2014-01-04 14:12:45 +01:00
Tau
0c095faac8
[Handy] updated for new API, fixed bugs, added warnings. Now v2.
2014-01-02 19:25:26 +02:00
madmaxoft
d4e29a0d18
Merge branch 'FishingHook'
2014-01-01 15:31:57 +01:00
STRWarrior
d656c253c0
Little more documentation for OnPlayerFishing.
2014-01-01 15:18:12 +01:00
STRWarrior
78a876ace3
Using documentation Xoft recommended.
2014-01-01 15:15:56 +01:00
STRWarrior
c5b89ea0f5
Fixed typo's in the documentation.
2014-01-01 15:02:43 +01:00
STRWarrior
db935c4194
Documented OnPlayerFished and OnPlayerFishing.
2013-12-31 14:50:46 +01:00
madmaxoft
61254d0356
APIDump: Fixed a factual error in OnPluginsLoaded description.
2013-12-29 14:48:58 +01:00
madmaxoft
61af77a5c5
APIDump: Static files overwrite their destination.
2013-12-29 13:24:38 +01:00
madmaxoft
8406a37ac2
APIDump: The PRE html tag has tab width set to 2 spaces.
2013-12-29 13:23:30 +01:00
madmaxoft
b84cd0b3c5
APIDump: Documented OnPluginsLoaded.
2013-12-29 13:15:46 +01:00
madmaxoft
248ba1ea9f
Added HOOK_PLUGINS_LOADED.
...
This fixes #482 .
2013-12-29 12:51:58 +01:00
madmaxoft
537d1c4e42
APIDump: Added the SettingUpDecoda article.
...
This implements #383 .
2013-12-27 20:56:01 +01:00
madmaxoft
9689896f9c
APIDump: Articles eplicitly declare being UTF-8.
...
This fixes display in firefox.
2013-12-27 20:48:11 +01:00
madmaxoft
e4c6e853ea
APIDump: Added quick links to index to each class and hook file.
...
Third part of #403 .
2013-12-27 15:48:01 +01:00
madmaxoft
9a9888a8cc
APIDump: Added a quick-nav menu to hook descriptions.
...
Second part of #403 .
2013-12-27 15:36:28 +01:00
madmaxoft
b99255820b
APIDump: Added a quick-nav menu to class descriptions.
...
First part of #403 .
2013-12-27 15:26:41 +01:00
madmaxoft
0c071c5937
APIDump: Split the huge DumpAPIHtml function into smaller ones.
2013-12-27 15:08:27 +01:00
madmaxoft
daeb37b27b
APIDump: Extra pages renamed to articles and moved to front.
2013-12-27 15:01:49 +01:00
madmaxoft
270d79d47b
APIDump: Fixed the WritingPlugin article.
...
The code is no longer weirdly indented in the browser, and links are relative to the API docs root.
2013-12-27 14:46:07 +01:00
madmaxoft
f0ca18d72a
APIDump: Added the WritingPlugin article to the exported pages.
2013-12-27 14:33:15 +01:00
madmaxoft
1a3a291bde
APIDump: Fixed bad for-loop.
...
How did I not see this before?
2013-12-27 14:32:40 +01:00
Tiger Wang
d41f724a40
Writing a plugin APIDump article ( #382 )
2013-12-26 15:11:48 +00:00
Alexander Harkness
8c6337ff20
Removed documentation for cChatColour:MakeColor()
2013-12-24 13:25:03 +00:00
Sam Mauldin
e593cef109
Store plugin in a local variable to fix error on disable
2013-12-23 20:58:39 -06:00
Alexander Harkness
1f03fc4bf9
Or not. Fixes #384
2013-12-20 17:35:59 +00:00
Alexander Harkness
ba5e42de40
done... finally
2013-12-20 17:12:39 +00:00
Alexander Harkness
d31fd1528b
fix the issues xoft pointed out
2013-12-20 16:38:10 +00:00
Alexander Harkness
837bbf0de3
@madmaxoft now?
2013-12-20 16:31:30 +00:00
Alexander Harkness
675c35708b
Possibly fixes #384
...
@madmaxoft, is this the right syntax for lua for loops?
2013-12-20 16:14:49 +00:00
Alexander Harkness
71006f5df5
Create a static folder for adding static files.
...
.gitignore is basically just an empty file that might serve a purpose someday.
2013-12-20 16:03:26 +00:00
madmaxoft
5d4e1725d4
APIDump: Ignoring the multi-inheritance members.
...
We may get to documenting them one day, but for now they are unused anyway, so there's no point in documenting them. They are a by-product of multiple inheritance, re-introduced due to #422 .
2013-12-16 22:13:46 +01:00
STRWarrior
6e30e54eb0
Documented ForceSetSpeed.
2013-12-15 20:27:19 +01:00
STRWarrior
ae061d717b
APIDump: Documented New functions
2013-12-15 15:18:53 +01:00
STRWarrior
a4393dbf6c
Documented cTNTEntity.
2013-12-14 16:40:51 +01:00
Tiger Wang
46787a8a1b
Update Core
2013-12-14 12:29:43 +00:00
Tiger Wang
4e11095441
Groups.ini and Users.ini are now generated
2013-12-14 02:02:26 +00:00
STRWarrior
e03e8b7b30
Documented OnWorldStarted.
2013-12-11 12:44:13 +01:00
madmaxoft
13dd1b0c94
Ignoring Gallery plugin settings.
2013-12-08 11:48:44 +01:00
Alexander Harkness
87680186ef
Updated core.
2013-12-07 16:34:38 +00:00
STRWarrior
02301bc987
Documented SpawnFallingBlock()
2013-12-07 14:30:17 +01:00
Alexander Harkness
38563db3ce
Updated TRANSAPI
2013-12-07 07:22:48 +00:00
Mattes D
dde1c3a7cd
Merge pull request #394 from SamJBarney/master
...
Fire no longer goes out when on top of nether rack
2013-12-06 02:41:37 -08:00
Samuel Barney
88d6454882
I don't know how this dissapeard.
2013-12-05 22:42:52 -07:00
madmaxoft
a02ed3b92e
APIDump: Documented the new cPluginManager:GetCurrentPlugin() function.
2013-12-05 22:06:52 +01:00
Samuel Barney
8acfe21503
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Simulator/FireSimulator.h
2013-12-05 07:32:19 -07:00
Alexander Harkness
5832781727
Updated TransAPI, fixes #389
...
@madmaxoft is this the right API usage?
2013-12-03 21:17:36 +00:00
madmaxoft
0a2fcf909c
Added a quick LuaRocks testing plugin.
...
You need to install the luarocks system and through it the luasocket and 30log rocks.
2013-12-03 21:48:40 +01:00
madmaxoft
70cf0c09a8
The server builds and uses Lua as DLL in Debug mode.
...
This is a test to see how LuaRocks will interact. Only debug mode on Windows is affected, all other platforms and modes are unchanged.
2013-12-02 22:36:59 +01:00
madmaxoft
e07c54f7f8
APIDump: Added missing params to OnPlayerRightClick() hook.
2013-12-02 22:36:59 +01:00
madmaxoft
ca79a1a6a6
APIDump: Updated the project file to include all partial docs files.
2013-11-30 13:36:40 +01:00
STRWarrior
686e0c12e2
cWorld::SpawnExperienceOrb() now returns the entity ID of the spawned orb.
...
Documented etExpOrb.
2013-11-26 15:37:15 +01:00
STRWarrior
a0c6342a29
Documented SpawnExperienceOrb in cWorld
2013-11-25 21:51:52 +01:00
madmaxoft
e683c54b49
APIDump: Moved projectiles' documentation to a separate file.
2013-11-24 10:08:04 +01:00
madmaxoft
51b02854f9
APIDump: Removed needless whitespace output.
2013-11-24 10:03:02 +01:00
madmaxoft
38fe16d8b6
APIDump: Removed unwanted functions.
2013-11-23 21:43:38 +01:00
madmaxoft
3ef7f2008f
APIDump: Reformatted the sqlite docs.
2013-11-23 21:32:18 +01:00
madmaxoft
d9dc241e6f
APIDump: The descriptions are read from multiple files.
...
All the files in the Classes subfolder are read for class descriptions, and in the Hooks subfolder for the hook descriptions.
2013-11-23 21:27:02 +01:00
STRWarrior
cc77ffd069
Documented sqlite functions. Used: http://lua.sqlite.org/index.cgi/doc/tip/doc/lsqlite3.wiki#sqlite3_functions
2013-11-23 21:13:55 +01:00
madmaxoft
520088fc7c
APIDump: Added more constant groups.
...
Also fixed the parsing of the Include data in the constant groups, and added linkification to group texts.
2013-11-23 19:40:35 +01:00
madmaxoft
b8aaf13a12
APIDump: Added a few constant groups to the descriptions.
2013-11-22 22:12:46 +01:00
madmaxoft
7a2170f6b3
APIDump: Implemented constant groups.
...
Fix #289 .
2013-11-22 21:46:06 +01:00
madmaxoft
63753c5e84
Added cFile:GetFolderContents().
...
Fix 162.
2013-11-22 20:11:24 +01:00
madmaxoft
4fbfe59ea0
APIDump: Fixed cRoot's furnace query API.
2013-11-22 16:52:09 +01:00
madmaxoft
281bf8f90b
Added cRoot:GetFurnaceFuelBurnTime() to Lua API.
2013-11-22 16:50:03 +01:00
madmaxoft
7fd3fda5d3
APIDump: Documented new cRoot:GetFurnaceRecipe().
2013-11-22 12:37:55 +01:00
madmaxoft
07a1de8ebb
Debuggers: Added a test harness for cRoot:GetFurnaceRecipe().
...
The "/fr" command lists the furnace recipe for the currently held item.
2013-11-22 12:26:39 +01:00
madmaxoft
98be3ca0e4
APIDump: Documented cPlayer XP-related functions.
2013-11-21 22:12:52 +01:00
madmaxoft
e9a8b96479
APIDump: Documented cWorld:ForEachBlockEntityInChunk() and cWorld:DoWithBlockEntityAt().
2013-11-20 22:04:16 +01:00
madmaxoft
fed37bca4d
Debuggers: Test harness for cWorld:ForEachBlockEntityInChunk().
...
The fill command will fill all empty slots in block entities with containment with gold nuggets, one per slot.
2013-11-20 21:54:37 +01:00
Mattes D
ced076c561
Merge pull request #350 from mc-server/arrows
...
Fixed arrow bugs
2013-11-19 01:13:49 -08:00
madmaxoft
7567f19052
Merge branch 'master' of git://github.com/nesco/MCServer.
2013-11-19 10:01:25 +01:00
madmaxoft
e2ea6b59f5
APIDump: Slight performance improvement.
...
Strings don't need concatenation when using write().
2013-11-19 09:56:36 +01:00
madmaxoft
4844422e06
APIDump: Documented Vector3i.
2013-11-19 06:49:21 +01:00
nesco
44385fba28
flower=38
2013-11-18 16:55:30 +01:00
madmaxoft
9bc79722c7
APIDump: Documented Vector3f.
2013-11-17 23:27:07 +01:00
Daniel O'Brien
b3bb34974f
updated plugin again...
2013-11-16 22:17:46 +11:00
Daniel O'Brien
25ccc33252
updated plugin
2013-11-16 22:05:34 +11:00
Daniel O'Brien
b72ced3164
removed SpendExperience and changed AddExperience to handle removing Xp
2013-11-16 22:00:45 +11:00
Daniel O'Brien
df4aa6c864
Merge remote-tracking branch 'upstream/master' into playerxp
2013-11-16 17:30:19 +11: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
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
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
5eb67dbdfc
Debuggers: Removed the old OnChunkGenerated code testing the cBlockArea writing.
2013-11-15 11:28:11 +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
Tiger Wang
15c330664a
Fixed arrow bugs
...
* Fixed arrows hitting blocks wrong
2013-11-14 22:39:14 +00:00