f3046417ec
Fixed a clang warning, improved comments.
2015-03-19 12:46:37 +01:00
49e59ee06b
World:DoWithEntityByID() checks the entities-to-add as well.
...
This allows plugins to create entities and immediately act on them using that call. This will most likely need to be added to most of the DoWith<> and ForEach<> calls.
2015-03-18 15:35:19 +01:00
65d2ef32e9
Merge pull request #1734 from mc-server/pistons
...
Handle client 'leave bed' request
2015-03-14 22:44:04 +01:00
5c45c8897c
Fixed a small bug
2015-03-14 20:45:16 +01:00
a215070cf2
Monsters will now attack. Additional checks have been added when generating spawn.
...
Monsters will now attack. Additional checks have been added when generating spawn.
2015-03-13 00:02:36 +01:00
f3da0cf1ae
Reverted non-functional changes
2015-03-05 21:21:39 +00:00
3869f76cc2
Handle client 'leave bed' request
...
* Fixes #1728
2015-02-08 21:21:48 +00:00
7dfeb67f01
Converted cServer to use the cNetwork API.
2015-01-27 14:53:31 +01:00
a216413a33
Fixed defect #71781 in Coverity list.
2015-01-23 19:06:07 +03:00
83ed6a2c1b
Fixed type conversion warnings.
2015-01-18 11:25:16 +01:00
6758c1d2a1
correct comment to say milliseconds
2015-01-17 22:24:25 +00:00
2a9664d6ca
Initial convertion of a_Dt to std::chrono
...
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
2015-01-11 21:12:26 +00:00
4f75b94c99
Created new type cTickTime and rewrote cWorld::TickThread to use it
2015-01-11 01:54:18 +00:00
ccdf03daaf
Refactored all player block placing to go through hooks.
...
Fixes #1618 .
2014-12-24 07:20:17 +01:00
fbd0cf74bd
Fix compile error on OS X introduced by commit ecf778bbec
...
The following error occurs on OS X with the order reversed: `MCServer/src/World.cpp:282:2: error: field 'm_LastSave' will be initialized after field 'm_LastUnload' [-Werror,-Wreorder] m_LastSave(0),`. Reversing the order of initialization fixes this.
2014-12-21 23:02:02 -05:00
ecf778bbec
cWorld: Moved initialization into constructor.
...
Fixes CID 71781.
2014-12-21 22:19:22 +01:00
4947880a5d
Merge pull request #1581 from mc-server/redstone
...
Resplit redstone .inc file and provided improvements
2014-12-17 08:38:23 +01:00
b3e5872c22
Fixed mob invisibility
2014-12-14 17:48:30 +01:00
bed456033f
"& 0x0f" isn't needed
2014-12-14 13:14:48 +01:00
2a8c234f46
Fixes
2014-12-13 20:31:37 +01:00
4b20a61519
Merge branch 'master' into redstone
2014-12-13 12:11:01 +00:00
781b3303a5
Merge pull request #1657 from mc-server/PrepareChunk
...
Prepare chunk
2014-12-11 17:06:18 +01:00
fcd3d1bfed
Added a cWorld:PrepareChunk function.
...
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
2014-12-10 22:35:16 +01:00
fbf98b8488
Merge pull request #1655 from tonibm19/patch-2
...
Added NetherOreNests to default nether generator.
2014-12-10 17:44:53 +01:00
7ceeefb26f
Moved NetherOreNests
2014-12-10 17:13:20 +01:00
32bce44f1f
Merge pull request #1623 from p-mcgowan/issue_1253
...
Prevent multiple logins with same username, unless allowed in settings
2014-12-10 11:17:11 +01:00
209de0268a
Moved NaturalPatches in front of PreSimulator and Animals.
2014-12-08 21:28:14 +01:00
74ef586400
Added NetherOreNests to nether default generator.
...
Now there's quartz in the nether
2014-12-08 19:37:42 +01:00
98bd724294
Added NaturalPatches to finishers
2014-12-08 19:08:46 +01:00
e08331a24b
Fixed crash on server stop.
...
The entity destructors called through chunkmap destructor and chunk destructor were accessing the world which was in an already invalid state (half-destroyed).
Fixed by destroying chunkmap explicitly and providing a nullptr check in the HasEntity() function.
2014-12-07 16:14:27 +01:00
3c3cb198f3
Fixed c++11 branch issues.
2014-12-07 15:46:27 +01:00
3acdf25b05
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
a8bbd5efe4
Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisher
...
update
2014-12-05 11:24:09 -08:00
44644ae025
Fixed reported parentheses around comparisons.
2014-12-05 12:58:47 +01:00
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
b0e4643eb6
Allow Spectator Gamemode as a world default.
2014-12-02 20:24:05 -05:00
7f8f2f1e70
forgot generation defaul init
2014-12-02 15:57:41 -08:00
fa4a85c915
Added better soulsand rims
...
As a finisher called SoulsandRims
2014-12-01 16:36:48 +01:00
db0f791d43
Fixed a crash in cSpawnPrepare.
2014-11-30 18:19:29 +01:00
a73c800377
Improved comments for cWorld::DoWithPlayer().
2014-11-30 11:11:47 +01:00
20dcceb7e6
removed GetUsernames() from World
2014-11-29 15:46:31 -08:00
a7bf2725c8
fixed naming of strings and changed from i to I
2014-11-29 11:22:03 -08:00
61e761fdc2
issue 1253 - prevent multiple logins with same username
2014-11-29 00:36:15 -08:00
187bdab4fa
Merge remote-tracking branch 'origin-master' into c++11
2014-11-25 23:03:33 +00:00
9f4562289e
Merge pull request #1604 from mc-server/GeneratorShapeRefactor
...
Generator shape refactor
2014-11-24 21:56:25 +01:00
3e068a01a8
Changed back capitalization.
2014-11-24 13:44:15 +01:00
79e5b82354
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/Noise/Noise.h
src/World.h
2014-11-23 17:12:34 +00:00
b520f336da
cWorld: Rewritten spawn preparation.
...
It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting).
Fixes #1597 .
2014-11-22 16:00:19 +01:00
a05a318cdd
cWorld: Changed generator defaults.
2014-11-20 22:51:07 +01:00
9ece37e8f1
Merge pull request #1598 from mc-server/SignEditor
...
Fixed a security problem with signs.
2014-11-18 08:52:48 +01:00
78fb789631
Fixed a security problem with signs.
2014-11-15 15:16:52 +01:00
a0e1e43fc1
Merge branch 'master' into ViewDistance
2014-11-14 22:33:54 +01:00
58fe37814b
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-11-06 08:55:33 +01:00
13b20d6fe2
renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump
2014-11-05 21:57:38 +01:00
269d76a208
Simplified FindAndDoWithUUID, formatted line
2014-11-02 21:38:17 +01:00
9f71a4e7ae
Added FindAndDoWithUUID
2014-11-02 21:01:23 +01:00
9c7661f50f
Added a MaxViewDistance option.
2014-10-30 21:24:10 +01:00
85c298d73e
Cleaned up simulators
2014-10-25 21:54:00 +01:00
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
190d34e2f7
Merge pull request #1565 from mc-server/MergedIniFile
...
Merged ini file
2014-10-24 09:13:39 +02:00
449d08cb3d
Merged IniFile into main MCS sources.
2014-10-23 15:15:10 +02:00
72bb299a4a
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ChunkSender.cpp
src/ClientHandle.cpp
src/World.h
2014-10-23 14:59:42 +02:00
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
44514e53fc
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
8ddc40e44b
Missing space fix.
2014-10-21 14:17:04 +01:00
987f79afdd
En masse NULL -> nullptr replace
2014-10-20 21:55:07 +01:00
bde99d684e
Migrated cSleep and cTimer to std::chrono
2014-10-20 18:59:40 +01:00
aa19a3afb0
Migrated random generators to std::random
2014-10-19 14:10:18 +01:00
eeb580a74e
Functions in cPluginManager get references instead of pointers.
2014-10-15 19:09:09 +02:00
7f8118e0cb
cWorld: Fixed scheduler.
...
Fixes #1534 .
Added a test case into the Debuggers plugin.
2014-10-13 14:49:18 +02:00
1eae7d0ece
Fixed style.
2014-10-13 10:34:33 +02:00
daadde2077
Fix style
2014-10-12 12:18:52 +01:00
8dfeb6e324
Update World.cpp
2014-10-12 12:15:52 +01:00
1a07dc897d
Fix lambda capture
2014-10-11 14:43:06 +01:00
473c0425d3
Moved a few objects to unique_ptr
2014-10-10 15:33:19 +01:00
b493beb3bb
Stream 4 chunks per tick. Added priority.
2014-10-06 21:27:53 +02:00
382e014ebc
Optimized chunk loader
2014-10-02 23:50:41 +02:00
83973520c8
Fixed iron trapdoors
2014-09-30 20:04:49 +02:00
30b083ed63
World: Fixed chunk generation by plugins.
...
ChunkWorx was broken, it was trying to generate chunks that were not properly marked as InQueue.
2014-09-29 21:34:15 +02:00
af997a09ca
Merge branch 'master' into Fixes
2014-09-26 22:23:36 +02:00
d83d6456e8
Fixed players custom name in 1.8
2014-09-26 17:37:19 +02:00
411c69b420
Merge pull request #1419 from mc-server/redstoneTests
...
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
157cad9007
Improved searching for spawn.
...
Won't spawn on a small island inside ocean anymore.
2014-09-26 13:04:34 +02:00
9c459cbe50
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
4b38e077cf
Merge branch 'master' into EntityCustomName
...
Conflicts:
src/ClientHandle.cpp
src/ClientHandle.h
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/World.cpp
src/World.h
2014-09-23 14:39:49 +02:00
43ed690520
Exported player list states to extra functions.
2014-09-18 18:50:17 +02:00
045d54e0e2
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
6e7c0e33b5
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
26a4845a99
IncrementalRedstoneSimulator now has no dependencies on cChunk
2014-09-16 20:29:31 +01:00
69afc4dbba
Merge branch 'master' into 1.8-Protocol
...
Conflicts:
src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
fcf558173e
Fixed farmland issues.
2014-09-12 19:07:20 +02:00
bee615b75b
Merge branch 'master' into 1.8-Protocol
2014-09-12 13:28:06 +02:00
0b044e1c83
Possibly decoupled IncrementalRedstoneSimulator from the rest of the server
...
THis wil hopefully allow for unit testing
2014-09-11 17:48:21 +01:00
3bd3ac2200
1.8: Added ParticleEffect packet.
2014-09-11 17:03:09 +02:00
1f0b6eeaf3
Actually set default
2014-09-09 12:18:20 +01:00
f94df06b66
Added the player list to the 1.8 protocol.
2014-09-09 03:02:25 +02:00
bd810b80a6
use the correct ASSERT
2014-09-08 21:31:47 +01:00
fb20c2eb85
FIxed a couple more warnings
2014-09-08 19:15:29 +01:00
2c945c8818
TimeOfDay does not need to be an Int64
2014-09-08 19:07:45 +01:00
4bdf9256f2
Fixed a few compile warnings
2014-09-08 18:56:27 +01:00
137b021d26
Rewritten chunk status to specify whether the chunk is in queue.
...
This fixes #1370 .
2014-09-05 22:16:48 +02:00
3297a39c27
Merge remote-tracking branch 'origin/master' into EntitiesInBox
2014-09-04 14:02:18 +02:00
c140ba2367
Merge pull request #1351 from LO1ZB/remove-a_RelY
...
remove y-coord from chunks
2014-09-03 21:47:00 +02:00
a51c1e0b73
Added cWorld::ForEachEntityInBox()
2014-09-03 17:00:26 +02:00
a600e3bdfe
hopefully the last commit for removing y-coord from chunks. :)
2014-09-03 00:14:51 +02:00
1bb4d79412
Added SetCustomName() to players.
2014-09-02 19:12:35 +02:00
26b8471280
Merge branch 'master' into fixes
2014-08-30 22:17:49 +02:00
5a6ef8b8e5
me being stupid
2014-08-29 20:27:58 +02:00
e45a27add9
add comments
2014-08-29 20:26:19 +02:00
75e1316386
fix chunk regenerating
2014-08-29 20:19:45 +02:00
22e3bbd0db
Rewritten block entity loading.
...
Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked.
The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't.
Fixes #1354 .
2014-08-29 19:19:47 +03:00
431b7ed0b7
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Server.cpp
2014-08-29 14:56:40 +01:00
21ff1d81ab
Improved explosion damage
2014-08-29 13:44:10 +01:00
3c1c073714
remove y-coord from chunks
2014-08-28 11:36:35 +02:00
d2d63b8a05
World: Report chunk count for the spawn area.
2014-08-22 10:35:51 +02:00
81d238e080
Added cWorld initializers.
2014-08-21 21:53:25 +02:00
b5ffe06f88
Code formatting fixes.
2014-08-19 22:14:37 +02:00
008c1cdaf4
CheckBasicStyle checks the src folder as well.
2014-08-14 01:03:30 +02:00
47c928cab7
Exported daylight cycle flag to the protocol.
2014-08-11 00:20:28 +02:00
42bad0edec
Added a comment and simplified code.
2014-08-10 20:06:03 +02:00
f90078c09f
Added IsDaylightCycleEnabled saving.
2014-08-10 16:48:20 +02:00
cccc321384
Renamed functions.
2014-08-10 16:46:03 +02:00
32e1e9a553
Renamed m_DoDaylightCycle to m_CycleDaylight.
2014-08-08 22:07:30 +02:00
4271d719b6
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
...
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
b5c0a4aa3a
Fixed issues with autocomplete and time loading
...
* Fixes #1274
2014-08-01 22:15:34 +01:00
35cfbfd51a
Merge pull request #1269 from Howaner/BlockEntitys
...
Added beacon.
2014-08-01 17:43:02 +02:00
cfaef0de38
Capitalised "incremental"
2014-07-31 23:11:51 +02:00
f47765dcbd
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator.
2014-07-31 18:21:45 +02:00
81e095adda
Exported the beacon.
2014-07-30 22:19:51 +02:00
f095e770b8
Merged branch 'howaner/Options'.
2014-07-30 10:06:18 +02:00
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
a5cca16abe
Add "Broadcasting" settings to world.ini
2014-07-27 00:39:39 +02:00
c0b62ef139
Added a queue for setting chunk data.
...
Fixes #1196 .
2014-07-24 18:32:05 +02:00
9678341a11
Made the cWorld::SpawnMobFinalize function more readable.
2014-07-24 12:15:48 +02:00
1156914dd6
Suggestions
2014-07-23 21:12:59 +01:00
a28b0dc120
Speed improvements, crash fixes, & self-suggestions
2014-07-22 17:26:48 +01:00
0a15e1f420
Suggestion and failed merge fix
2014-07-22 10:33:16 +01:00
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
8050a5b98a
Suggestions
2014-07-21 22:49:06 +01:00
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
6ab9afd0fd
Bug and crash fixes
...
* 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
2014-07-20 10:46:45 +01:00
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
11f8198a80
World.cpp: fixed not all enum fields being used in m_Dimension switch
2014-07-19 02:56:46 -07:00
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
37140ae578
Merge branch 'master' into portals
...
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
2014-07-18 20:10:51 +01:00
2423fbf2ef
Normalized comments.
...
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
7fff12bfac
Fixed spaces around single-line comments.
...
There should be at least two spaces in front and one space after //-style comments.
2014-07-17 19:13:23 +02:00
993fd14ddf
Fixed basic whitespace problems.
...
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
2014-07-17 16:33:09 +02:00
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
57f4e871bb
Fixed FindClosestPlayer
2014-07-15 12:52:02 +01:00
4e24f711ab
Player properties are now retrieved
2014-07-14 19:49:31 +01:00
4a6d606f74
Made CreateProjectile a pointer
2014-07-13 15:16:49 +01:00
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
5f72cdac38
Merge pull request #1154 from mc-server/trappedchests
...
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
9e22f46b15
Implemented support for forced chunk ticking.
...
Fixes #1160 .
2014-07-10 18:18:32 +02:00
74b6b398e7
Fixed arrow collection animation
...
* Fixed piston extension non-solidness
2014-07-09 19:56:50 +01:00
9e44b0aae1
Implemented trapped chests & others
...
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00
632e8680b1
Removed world-saving log messages.
...
Ref.: http://forum.mc-server.org/showthread.php?tid=1518
2014-07-04 11:50:50 +02:00
9926abd4f5
Added generic entity-collecting.
...
Now any cEntity can be collected, not only cPickups.
This should help PR #1098 .
2014-06-27 20:56:44 +02:00
7615ed90c0
Merge branch 'master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Entity.h
src/Entities/Player.h
2014-06-21 22:14:23 +01:00
6e681269d9
Fixed invalid iterators
2014-06-21 22:07:38 +01:00
e8143de01b
Nullify deleted pointers.
2014-06-19 01:49:56 -07:00
c82f4f6309
Fixed order of initalisation
2014-06-12 18:56:48 +01:00
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
bfa8aaf41b
Merge branch 'master' into portals
...
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
35b79e5d71
Portal improvements and suggestions
2014-06-10 20:43:27 +01:00
366ecf9dfd
Fixed a race condition when adding a player to a world.
2014-06-10 18:25:53 +02:00
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
b904223b9d
Added queue for adding entities to cWorld.
...
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02:00
43342540c8
Fixed Time of day
2014-06-06 23:54:24 +01:00
156c9851b8
Suggestions
2014-06-05 17:58:29 +01:00
ea49abd113
Time and weather is saved, part of #1058
...
Also fixed unreliability in Health and LootPickup loading.
2014-06-04 20:52:54 +01:00
ccbf6cc446
Configurable portals
2014-06-04 20:00:55 +01:00
86e5273cd1
Merge remote-tracking branch 'origin/master' into portals
2014-06-04 13:14:38 +01:00
8bff3e5af2
Implemented end and nether portals
2014-05-31 22:28:51 +01:00
365c6f50bd
Changed block send queue to use vectors
...
As suggested by @worktycho.
2014-05-29 11:57:06 +01:00
ee929793f0
Hopefully fixed piston duplication issues
...
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
dd350bc1f3
World pre-generation distance is settable in world.ini.
2014-05-09 18:32:04 +02:00
fb58ef55be
Fixed MSVC 64-bit build warnings.
2014-05-09 18:32:03 +02:00
2c0bb7b717
Moved the weather picker out of TickWeather(), squashing a warning and improving readability.
2014-04-25 16:55:38 -07:00
c124fc39d4
Removed impossible default case.
...
Squashed a warning.
2014-04-25 16:32:34 -07:00
083cec5a09
Removed extraneous switch{} in Start()
...
Squashed a warning.
2014-04-25 16:27:15 -07:00
62e5234535
Small changes; warning fixing.
2014-04-24 20:25:03 -07:00
6492aa000b
Merge pull request #909 from jfhumann/fixes
...
Bug fixes and optimizations.
We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
2014-04-22 13:34:32 +02:00
67344a3782
Merge remote-tracking branch 'origin/master' into fixes
...
Conflicts:
src/Authenticator.cpp
src/ClientHandle.cpp
src/Entities/Minecart.cpp
src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
200ea6254c
Fixed #904
2014-04-18 12:54:17 +01:00
82b3d543e7
Rewrote redstone powering to use power levels
2014-04-15 13:15:56 +01:00
b3f6afefe9
Simplified pickup speed randomisation
2014-04-12 13:14:35 +01:00
22794e7208
Fixed double projectile spawning.
...
Two spawn packets were sent per projectile.
2014-04-05 22:26:10 +02:00
9032ff96c7
Removed unused constants.
...
DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now.
2014-03-25 23:35:50 +01:00
b1ad3322e5
Fixed code style after recent merge.
2014-03-20 09:28:29 +01:00
3e49cada80
Added braces
2014-03-19 23:07:58 +00:00
0524d70774
ENUMified shrapnel level
2014-03-19 23:06:39 +00:00
b8fe024f9d
Merge branch 'master' into awesometnt
...
Conflicts:
src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
23ffaa19b7
Added levels of shrapnel
2014-03-18 20:45:10 +00:00
8b83c1a653
Merge branch 'master' into warnings
2014-03-14 06:46:20 -07:00
35fe96b07d
Fixed a warning.
2014-03-14 14:36:44 +01:00
862e219443
Added additional macros to support the MSVC size_t format and changed all formats to use the macros
2014-03-12 10:34:50 -07:00
d904e89712
Merge branch 'Werror' into warnings
...
Conflicts:
src/Globals.h
2014-03-12 10:12:13 -07:00
7e6ee7ef81
Fixed more Format issues
2014-03-11 14:43:14 -07:00
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
e672988577
Merge remote-tracking branch 'origin/master' into awesometnt
...
Conflicts:
src/Items/ItemLighter.h
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-03-10 18:59:11 +00:00
cc2d805238
Merge branch 'master' into awesometnt
2014-03-10 18:36:55 +00:00
462829e23d
Shrapnel now configurable
2014-03-10 18:35:02 +00:00
09c5542123
Merge pull request #768 from Howaner/BlockEntitys
...
Add TNT load/save
2014-03-09 21:44:32 +00:00
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
8f134adb6d
Improved formatting of username tabcomplete
2014-03-09 12:48:55 +00:00
527f358510
Merge branch 'master' into BlockEntitys
2014-03-08 12:29:45 +01:00
b37966fd21
Change TNT Fuse to ticks
2014-03-08 12:24:33 +01:00
f72c747b50
Merge pull request #763 from Howaner/BlockEntitys
...
Add Flower Pots
2014-03-07 17:54:10 +01:00
c2090c0d11
Add Lua Bindings for FlowerPotEntity.h and add documentation.
2014-03-07 11:44:16 +01:00
787a71929c
Add Flower Pots
2014-03-07 01:30:34 +01:00
3e80e63665
Merge remote-tracking branch 'xdot/master'
2014-03-06 13:24:28 +01:00
53231bebd6
Added extra awesomeness to TNT
...
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
2014-03-05 22:12:48 +00:00
1ea17c0a75
Implemented vanilla-like fluid simulator
2014-03-05 15:54:38 +02:00
e50ffba1ad
Fixed an assert in map-loading.
...
The maps were loaded too soon, the world wasn't initialized yet.
2014-03-04 18:40:55 +01:00
442c1d96fc
Fixed previous weather changes.
...
cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
2014-03-03 20:55:04 +01:00
71ae689eb7
Merge pull request #746 from Howaner/Slabs
...
Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
2014-03-03 20:52:08 +01:00
1d67345989
Add cancelling to WeatherChanging event.
2014-03-02 21:04:01 +01:00
070d483236
cBlockInfo now manages the respective cBlockHandler
2014-03-02 21:25:05 +02:00
5e427ee825
More documentation (thanks to madmaxoft) and use GetBlockTypeMeta
2014-03-02 16:16:22 +01:00
e4b2502896
Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
2014-03-02 16:01:37 +01:00
baf2d88921
Implemented ballistic missiles (fireworks)
...
+ Added fireworks
2014-02-26 23:33:52 +00:00
f77720c43f
Merge pull request #669 from xdot/master
...
Implementation of in-game maps :D
2014-02-24 10:28:34 +00:00
f471873945
Maps: Improvements
2014-02-23 15:05:03 +02:00
191a08fc32
Merge pull request #700 from Howaner/GlobalFixes
...
Add new Trees (without Generator)
2014-02-20 16:24:52 +01:00
f201f4f176
Thread safe cMap manager
2014-02-20 16:38:37 +02:00
83d3a2eedf
Manual merge (Fixed conflicts)
2014-02-20 15:37:15 +02:00
87db4b6a90
Merge pull request #697 from Howaner/Skull
...
Add Skulls/Heads to MCServer
2014-02-19 22:12:38 +01:00
16f3809ded
Add BlockNewLeaves.h and rename Darkoac to Darkoak
2014-02-19 19:18:40 +01:00
a5a52fe160
Add new Trees (without Generator)
2014-02-19 16:58:31 +01:00
d63ce62f3b
Rename SkullEntity to MobHeadEntity
2014-02-19 14:45:09 +01:00
52c41f8869
Add Heads completely
2014-02-18 21:40:02 +01:00
b1c6b4f584
The cuboid for cWorld::SetAreaBiome() doesn't need sorting.
2014-02-18 13:49:24 +01:00
803ea41236
Added cWorld:SetAreaBiome() API function.
...
Fixes #675 .
2014-02-18 13:49:23 +01:00
3b24bc870b
Map item handler; Fixed several bugs
2014-02-17 16:27:12 +02:00
52cd9dfe9f
Removed the unnecessary LoopPlayersAndBroadcastChat() functions.
2014-02-15 23:26:19 +01:00
0f1f7583ae
Implemented cCompositeChat.
...
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678 .
2014-02-15 23:17:49 +01:00
5b92b877bc
Send map when selected
2014-02-14 16:21:16 +02:00
32b465b8e1
IDCount Serialization
2014-02-13 21:36:24 +02:00
9bb48a8fa4
Merged branch 'narroo/master'.
...
This merges pull request #661 .
2014-02-13 17:04:25 +01:00
e53b331b4a
Fixed formatting. Moved UnloadUnusedChunks from public to private.
2014-02-11 14:38:28 -05:00
d7f32ed682
Fixed formatting of previous commit.
2014-02-11 08:01:25 -05:00
892c7eb57f
More gcc warnings fixed.
2014-02-11 11:56:29 +01:00
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
a184d59209
Merge remote-tracking branch 'origin/master' into ChunkStay
2014-02-09 09:36:42 +01:00
c68bdaf34b
Fixed compile and some warnings in MSVS
2014-02-09 00:57:22 +00:00
Mattes D
tumultenrx
Tiger Wang
Kirill Kirilenko
worktycho
Tycho
Jonathan Fabian
Howaner
tonibm19
p-mcgowan
STRWarrior
Vincent
Lukas Pioch
Alexander Harkness
tycho
LO1ZB
archshift
jfhumann
andrew
narroo