1
0
Commit Graph

4349 Commits

Author SHA1 Message Date
madmaxoft
90d68c57e4 Debuggers: Updated messaging functions 2014-02-11 08:54:29 +01:00
madmaxoft
b41bb3bb44 Fixed nested plugin function calls. 2014-02-11 08:52:14 +01:00
madmaxoft
8a8997cc38 Merge branch 'master' into ChunkStay 2014-02-11 08:50:30 +01:00
madmaxoft
a25fcd25d6 APIDump: Documented cWorld:ChunkStay(). 2014-02-11 07:51:32 +01:00
Mattes D
3d9deca2e0 Merge pull request #660 from worktycho/boatsFix
Fixed stupid mistake in conditional
2014-02-11 06:45:26 +01:00
narroo
e8e76a6058 Fixed bug #385. UnloadUnusedChunks now has the same interface as
SaveAllChunks.  Meaning, QueueUnloadUnusedChunks and the supporting
cTaskUnloadUnusedChunks has been added.  Use QueueUnloadUnusedChunks from
now on to prevent deadlocking.
2014-02-10 20:00:07 -05:00
madmaxoft
de7bf126db Added LuaChunkStay to Bindings sources.
This should fix *nix compilation. Also alpha-sorted the lists.
2014-02-10 23:23:04 +01:00
madmaxoft
2b1506de9c Debuggers: Updated to reflect the new API. 2014-02-10 22:47:32 +01:00
madmaxoft
9cebc9157c Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay().
This fixes problems with indeterminate class object lifespan (Lua-GC) and forgetting to disable it or keep it until ready.
2014-02-10 22:47:10 +01:00
madmaxoft
589a4839df cLuaState: Stack traces don't include ghost 0-th element. 2014-02-10 22:44:56 +01:00
Tiger Wang
85ac373a50 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-02-10 20:13:33 +00:00
Tiger Wang
0cf1c1d91d Updated MagicCarpet and Core 2014-02-10 20:13:22 +00:00
madmaxoft
5aa1123f70 Added cPluginLua::cOperation.
This class should be used to lock-and-access the plugin's LuaState. cPluginLua::GetLuaState() is unsafe and by this commit obsolete.
2014-02-10 20:38:02 +01:00
worktycho
7ad4a86c49 Added additional parenthasies 2014-02-10 18:06:49 +00:00
Tycho
9f542ee0f8 Merge branch 'master' into boatsFix
Conflicts:
	src/Items/ItemBoat.h
2014-02-10 10:01:50 -08:00
worktycho
23f69bc093 Fixed stupid mistax in conditional
boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one.
2014-02-10 17:59:17 +00:00
Alexander Harkness
2152b8ca19 Merge pull request #659 from tonibm19/master
Maybe fixed boat placing
2014-02-10 17:27:46 +00:00
tonibm19
75e0b38d83 Maybe fixed boat placing 2014-02-10 18:17:44 +01:00
narroo
8028a8bbc6 Typo Fix in console.lua 2014-02-10 11:22:15 -05:00
madmaxoft
1447d6d0dc Debuggers: Added a cLuaChunkStay test code. 2014-02-09 20:40:20 +01:00
madmaxoft
47a497fa89 First working version of cLuaChunkStay.
It works, but has random failures, probably due to threading issues.
2014-02-09 20:39:45 +01:00
madmaxoft
4ef6c56f32 Debuggers: Disabled testing plugin calls. 2014-02-09 18:56:43 +01:00
madmaxoft
9455f59b11 Initial Lua cChunkStay export. 2014-02-09 18:56:16 +01:00
madmaxoft
310a25c456 cLuaState::cRef can be unbound and re-bound.
This will allow us to store Lua references as member variables in classes and initialize those later than in the constructor.
2014-02-09 18:39:22 +01:00
madmaxoft
4bcaf302b9 Added AllToLua.pkg to MSVC project files.
MSVC ignores the file when compiling and it makes it easier to open it up for editing.
2014-02-09 16:22:49 +01:00
madmaxoft
9795bfcbe3 Added air, farmland and tilleddirt to items.ini.
Air hasn't been present at all, the others are usual synonyms.
2014-02-09 16:19:38 +01:00
madmaxoft
a184d59209 Merge remote-tracking branch 'origin/master' into ChunkStay 2014-02-09 09:36:42 +01:00
madmaxoft
1d51521f80 Merge branch 'master' into playerimprovements 2014-02-09 09:32:40 +01:00
Tiger Wang
373e450518 Updated Core 2014-02-09 01:04:16 +00:00
Tiger Wang
c68bdaf34b Fixed compile and some warnings in MSVS 2014-02-09 00:57:22 +00:00
Tiger Wang
9d1c9097e3 Merge remote-tracking branch 'origin/master' into playerimprovements
Conflicts:
	src/Root.cpp
	src/Root.h
	src/World.cpp
2014-02-09 00:14:42 +00:00
Tiger Wang
f86f066615 Merge branch 'master' into playerimprovements
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
2014-02-09 00:04:42 +00:00
Mattes D
d2bc39ba84 Merge pull request #656 from mc-server/ReloadGroups
The console reload command also reloads the groups.
2014-02-09 00:14:44 +01:00
STRWarrior
2a741e719c "reload" is back. 2014-02-09 00:13:25 +01:00
STRWarrior
011a334a8a Split "reload" in "reloadplugins" and "reloadgroups". 2014-02-09 00:06:37 +01:00
Tiger Wang
14b5054c95 Fixed a boat ASSERT 2014-02-08 23:02:50 +00:00
STRWarrior
645c096e2b The console reload command also reloads the groups. 2014-02-09 00:02:16 +01:00
madmaxoft
cf48968835 Moved a forgotten comment back to its place. 2014-02-08 22:35:45 +01:00
madmaxoft
df0ecc6c07 Fixed lighting thread queueing. 2014-02-08 22:33:42 +01:00
madmaxoft
7432d2f74d Fixed ChunkStay initialization. 2014-02-08 22:23:38 +01:00
madmaxoft
a4bf44858d Fixed gcc compilation. 2014-02-08 22:01:04 +01:00
madmaxoft
ea71bfa9b6 Initial ChunkStay code. 2014-02-08 21:55:21 +01:00
Mattes D
169b918222 Merge pull request #653 from mc-server/RedstoneSimulator
Improvements for the redstone simulator.
2014-02-08 14:54:00 +01:00
madmaxoft
cfd6875c86 Fixed cWorld:TryGetHeight() API. 2014-02-08 13:35:08 +01:00
STRWarrior
53475e36d5 Fixed comment. 2014-02-08 11:20:00 +01:00
STRWarrior
3a897844a0 Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). 2014-02-07 22:59:08 +01:00
STRWarrior
09a23fa114 Fixed some end of lines 2014-02-07 22:25:15 +01:00
STRWarrior
176664810b Implemented an easy way of adding new redstone simulators.
Also added a "noop" redstone simulator that does the same as the fluid version.
2014-02-07 22:13:55 +01:00
Tiger Wang
fadf3c037b Moved Gamemode setting into General root tag 2014-02-07 20:11:56 +00:00
Tiger Wang
0f36d1c122 Added sender name to PM if prefixes disabled
* Also moved the PVP setting into Mechanics
2014-02-07 20:10:12 +00:00