1
0
Commit Graph

4175 Commits

Author SHA1 Message Date
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
Tiger Wang
0a5c14bf68 Removed some unexported documentation. 2014-02-07 19:56:22 +00:00
Tiger Wang
88a64ec40d Improved chat messaging functions
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
2014-02-07 18:58:52 +00:00
madmaxoft
e165da946e WebAdmin is stopped properly on server shutdown / restart.
Fixes #272.
2014-02-07 12:26:41 +01:00
madmaxoft
916020d6c2 Fixed wiki link in auto-generated settings.ini. 2014-02-07 12:07:22 +01:00
Tiger Wang
aa8b46e947 Server internally uses new functions 2014-02-05 23:24:16 +00:00
Tiger Wang
3450f0ca42 Added more chat functions 2014-02-05 23:24:02 +00:00
madmaxoft
aec7ffd3f6 InfoDump: Added github output. 2014-02-05 21:50:56 +01:00
Mattes D
24dfe7f9cc Merge pull request #648 from worktycho/runMCServer
Added BoundingBox Test
2014-02-05 21:26:12 +01:00
worktycho
374fecf61f Change Output to stderr 2014-02-05 20:13:37 +00:00
Mattes D
cd634ea138 Merge pull request #649 from mc-server/GroupsPermissions
Removed deprecated HasCommand function
2014-02-05 21:07:10 +01:00
STRWarrior
89ec774fd6 Removed deprecated HasCommand function 2014-02-05 20:20:11 +01:00
Tycho
9015e56c60 Merge branch 'master' into runMCServer 2014-02-05 11:08:10 -08:00
Tycho
aeb877f76a Modified automatic test for boundingBox 2014-02-05 11:06:57 -08:00
Mattes D
694fa5d541 Merge pull request #645 from mc-server/GroupsPermissions
Improvements to the GroupManager
2014-02-05 19:58:02 +01:00
Mattes D
4e4d92ccce Merge pull request #647 from worktycho/runMCServer
Run mc server in travis
2014-02-05 19:56:25 +01:00
Tycho
670213b48d Simplified shutdown 2014-02-05 10:39:33 -08:00
Tycho
de7e84b45b Revert "Added Self Test Plugin"
This reverts commit 62c18868b2.
2014-02-05 10:38:24 -08:00
Alexander Harkness
b9aa0420a3 Merge pull request #646 from worktycho/warningfixes
Fixed most of the reordering warnings
2014-02-05 18:24:08 +00:00
Tycho
f25597540d Added support to start up MCServer and then immediatly sut it down in travis 2014-02-05 10:10:45 -08:00
Tycho
62c18868b2 Added Self Test Plugin
At the moment It just shuts the server down again
2014-02-05 09:57:53 -08:00
Tycho
8ba6f73169 Fixed most of the reordering warnings 2014-02-05 09:43:49 -08:00
STRWarrior
d6142b53f3 Forgot extra lines. 2014-02-05 18:14:51 +01:00
STRWarrior
7c750914f0 Improvements:
Adds a function in cRoot that allows you to reload all the groups permissions.
Note: Players don't automatically load their new permissions.
You can use cPlayer::LoadPermissionsFromDisk for that.
2014-02-05 18:10:08 +01:00
madmaxoft
9e98c9691d Improved the signedness conversion. 2014-02-05 13:54:47 +01:00