summaryrefslogtreecommitdiffstats
path: root/src/Root.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-0/+2
|\ | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * main.cpp: field style fixesarchshift2014-07-201-1/+1
| |
| * main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATEDarchshift2014-07-191-0/+2
| |
* | Bug and crash fixesTiger Wang2014-07-201-2/+11
| | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files
* | Merge branch 'master' into portalsTiger Wang2014-07-181-13/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * Fixed basic whitespace problems.madmaxoft2014-07-171-12/+16
| | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
| * Store properties as Json::ValueTiger Wang2014-07-161-1/+6
| |
| * Player properties are now retrievedTiger Wang2014-07-141-1/+1
| |
* | Portal improvements and suggestionsTiger Wang2014-06-101-1/+1
|/
* Added Yggdrasil Authentication Systemdaniel09162014-04-131-2/+2
| | | | Code by Howaner. Fixes/Changes by me.
* Removed the unnecessary LoopPlayersAndBroadcastChat() functions.madmaxoft2014-02-151-11/+9
|
* Implemented cCompositeChat.madmaxoft2014-02-151-2/+4
| | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
* Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-0/+3
|\ | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * Improvements:STRWarrior2014-02-051-0/+3
| | | | | | | | | | | | 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.
* | Improved chat messaging functionsTiger Wang2014-02-071-9/+10
| | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
* | Added more chat functionsTiger Wang2014-02-061-1/+3
| |
* | Added more SendMessageXXX() functionsTiger Wang2014-02-041-3/+11
|/
* Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins.STRWarrior2013-12-111-0/+1
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-1/+5
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+186
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 03:02:49 +0100