Vincent
20dcceb7e6
removed GetUsernames() from World
2014-11-29 15:46:31 -08:00
Vincent
a7bf2725c8
fixed naming of strings and changed from i to I
2014-11-29 11:22:03 -08:00
Vincent
61e761fdc2
issue 1253 - prevent multiple logins with same username
2014-11-29 00:36:15 -08:00
Tiger Wang
187bdab4fa
Merge remote-tracking branch 'origin-master' into c++11
2014-11-25 23:03:33 +00:00
Mattes D
9f4562289e
Merge pull request #1604 from mc-server/GeneratorShapeRefactor
...
Generator shape refactor
2014-11-24 21:56:25 +01:00
Mattes D
3e068a01a8
Changed back capitalization.
2014-11-24 13:44:15 +01:00
Tiger Wang
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
Mattes D
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
Mattes D
a05a318cdd
cWorld: Changed generator defaults.
2014-11-20 22:51:07 +01:00
Mattes D
9ece37e8f1
Merge pull request #1598 from mc-server/SignEditor
...
Fixed a security problem with signs.
2014-11-18 08:52:48 +01:00
Howaner
78fb789631
Fixed a security problem with signs.
2014-11-15 15:16:52 +01:00
Howaner
a0e1e43fc1
Merge branch 'master' into ViewDistance
2014-11-14 22:33:54 +01:00
Mattes D
58fe37814b
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-11-06 08:55:33 +01:00
Lukas Pioch
13b20d6fe2
renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump
2014-11-05 21:57:38 +01:00
Lukas Pioch
269d76a208
Simplified FindAndDoWithUUID, formatted line
2014-11-02 21:38:17 +01:00
Lukas Pioch
9f71a4e7ae
Added FindAndDoWithUUID
2014-11-02 21:01:23 +01:00
Howaner
9c7661f50f
Added a MaxViewDistance option.
2014-10-30 21:24:10 +01:00
Tiger Wang
85c298d73e
Cleaned up simulators
2014-10-25 21:54:00 +01:00
Mattes D
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
Mattes D
190d34e2f7
Merge pull request #1565 from mc-server/MergedIniFile
...
Merged ini file
2014-10-24 09:13:39 +02:00
Mattes D
449d08cb3d
Merged IniFile into main MCS sources.
2014-10-23 15:15:10 +02:00
Howaner
72bb299a4a
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ChunkSender.cpp
src/ClientHandle.cpp
src/World.h
2014-10-23 14:59:42 +02:00
Tiger Wang
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Howaner
44514e53fc
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Alexander Harkness
8ddc40e44b
Missing space fix.
2014-10-21 14:17:04 +01:00
Tiger Wang
987f79afdd
En masse NULL -> nullptr replace
2014-10-20 21:55:07 +01:00
Tiger Wang
bde99d684e
Migrated cSleep and cTimer to std::chrono
2014-10-20 18:59:40 +01:00
Tiger Wang
aa19a3afb0
Migrated random generators to std::random
2014-10-19 14:10:18 +01:00
Mattes D
eeb580a74e
Functions in cPluginManager get references instead of pointers.
2014-10-15 19:09:09 +02:00
Mattes D
7f8118e0cb
cWorld: Fixed scheduler.
...
Fixes #1534 .
Added a test case into the Debuggers plugin.
2014-10-13 14:49:18 +02:00
Mattes D
1eae7d0ece
Fixed style.
2014-10-13 10:34:33 +02:00
worktycho
daadde2077
Fix style
2014-10-12 12:18:52 +01:00
worktycho
8dfeb6e324
Update World.cpp
2014-10-12 12:15:52 +01:00
worktycho
1a07dc897d
Fix lambda capture
2014-10-11 14:43:06 +01:00
tycho
473c0425d3
Moved a few objects to unique_ptr
2014-10-10 15:33:19 +01:00
Howaner
b493beb3bb
Stream 4 chunks per tick. Added priority.
2014-10-06 21:27:53 +02:00
Howaner
382e014ebc
Optimized chunk loader
2014-10-02 23:50:41 +02:00
Howaner
83973520c8
Fixed iron trapdoors
2014-09-30 20:04:49 +02:00
madmaxoft
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
Howaner
af997a09ca
Merge branch 'master' into Fixes
2014-09-26 22:23:36 +02:00
Howaner
d83d6456e8
Fixed players custom name in 1.8
2014-09-26 17:37:19 +02:00
worktycho
411c69b420
Merge pull request #1419 from mc-server/redstoneTests
...
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
madmaxoft
157cad9007
Improved searching for spawn.
...
Won't spawn on a small island inside ocean anymore.
2014-09-26 13:04:34 +02:00
Tycho
9c459cbe50
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Howaner
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
Howaner
43ed690520
Exported player list states to extra functions.
2014-09-18 18:50:17 +02:00
Tycho
045d54e0e2
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
Tycho
26a4845a99
IncrementalRedstoneSimulator now has no dependencies on cChunk
2014-09-16 20:29:31 +01:00
Howaner
69afc4dbba
Merge branch 'master' into 1.8-Protocol
...
Conflicts:
src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
Howaner
fcf558173e
Fixed farmland issues.
2014-09-12 19:07:20 +02:00
Howaner
bee615b75b
Merge branch 'master' into 1.8-Protocol
2014-09-12 13:28:06 +02:00
Tycho
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
Howaner
3bd3ac2200
1.8: Added ParticleEffect packet.
2014-09-11 17:03:09 +02:00
worktycho
1f0b6eeaf3
Actually set default
2014-09-09 12:18:20 +01:00
Howaner
f94df06b66
Added the player list to the 1.8 protocol.
2014-09-09 03:02:25 +02:00
worktycho
bd810b80a6
use the correct ASSERT
2014-09-08 21:31:47 +01:00
Tycho
fb20c2eb85
FIxed a couple more warnings
2014-09-08 19:15:29 +01:00
Tycho
2c945c8818
TimeOfDay does not need to be an Int64
2014-09-08 19:07:45 +01:00
Tycho
4bdf9256f2
Fixed a few compile warnings
2014-09-08 18:56:27 +01:00
Mattes D
137b021d26
Rewritten chunk status to specify whether the chunk is in queue.
...
This fixes #1370 .
2014-09-05 22:16:48 +02:00
madmaxoft
3297a39c27
Merge remote-tracking branch 'origin/master' into EntitiesInBox
2014-09-04 14:02:18 +02:00
Mattes D
c140ba2367
Merge pull request #1351 from LO1ZB/remove-a_RelY
...
remove y-coord from chunks
2014-09-03 21:47:00 +02:00
madmaxoft
a51c1e0b73
Added cWorld::ForEachEntityInBox()
2014-09-03 17:00:26 +02:00
LO1ZB
a600e3bdfe
hopefully the last commit for removing y-coord from chunks. :)
2014-09-03 00:14:51 +02:00
Howaner
1bb4d79412
Added SetCustomName() to players.
2014-09-02 19:12:35 +02:00
madmaxoft
26b8471280
Merge branch 'master' into fixes
2014-08-30 22:17:49 +02:00
LO1ZB
5a6ef8b8e5
me being stupid
2014-08-29 20:27:58 +02:00
LO1ZB
e45a27add9
add comments
2014-08-29 20:26:19 +02:00
LO1ZB
75e1316386
fix chunk regenerating
2014-08-29 20:19:45 +02:00
Mattes D
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
Tiger Wang
431b7ed0b7
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Server.cpp
2014-08-29 14:56:40 +01:00
Tiger Wang
21ff1d81ab
Improved explosion damage
2014-08-29 13:44:10 +01:00
LO1ZB
3c1c073714
remove y-coord from chunks
2014-08-28 11:36:35 +02:00
Mattes D
d2d63b8a05
World: Report chunk count for the spawn area.
2014-08-22 10:35:51 +02:00
Mattes D
81d238e080
Added cWorld initializers.
2014-08-21 21:53:25 +02:00
Howaner
b5ffe06f88
Code formatting fixes.
2014-08-19 22:14:37 +02:00
madmaxoft
008c1cdaf4
CheckBasicStyle checks the src folder as well.
2014-08-14 01:03:30 +02:00
Howaner
47c928cab7
Exported daylight cycle flag to the protocol.
2014-08-11 00:20:28 +02:00
Howaner
42bad0edec
Added a comment and simplified code.
2014-08-10 20:06:03 +02:00
Howaner
f90078c09f
Added IsDaylightCycleEnabled saving.
2014-08-10 16:48:20 +02:00
Howaner
cccc321384
Renamed functions.
2014-08-10 16:46:03 +02:00
Howaner
32e1e9a553
Renamed m_DoDaylightCycle to m_CycleDaylight.
2014-08-08 22:07:30 +02:00
Howaner
4271d719b6
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
...
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
Tiger Wang
b5c0a4aa3a
Fixed issues with autocomplete and time loading
...
* Fixes #1274
2014-08-01 22:15:34 +01:00
Mattes D
35cfbfd51a
Merge pull request #1269 from Howaner/BlockEntitys
...
Added beacon.
2014-08-01 17:43:02 +02:00
Howaner
cfaef0de38
Capitalised "incremental"
2014-07-31 23:11:51 +02:00
Howaner
f47765dcbd
Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator.
2014-07-31 18:21:45 +02:00
Howaner
81e095adda
Exported the beacon.
2014-07-30 22:19:51 +02:00
madmaxoft
f095e770b8
Merged branch 'howaner/Options'.
2014-07-30 10:06:18 +02:00
Tiger Wang
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
Tiger Wang
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
Howaner
a5cca16abe
Add "Broadcasting" settings to world.ini
2014-07-27 00:39:39 +02:00
madmaxoft
c0b62ef139
Added a queue for setting chunk data.
...
Fixes #1196 .
2014-07-24 18:32:05 +02:00
STRWarrior
9678341a11
Made the cWorld::SpawnMobFinalize function more readable.
2014-07-24 12:15:48 +02:00
Tiger Wang
1156914dd6
Suggestions
2014-07-23 21:12:59 +01:00
Tiger Wang
a28b0dc120
Speed improvements, crash fixes, & self-suggestions
2014-07-22 17:26:48 +01:00
Tiger Wang
0a15e1f420
Suggestion and failed merge fix
2014-07-22 10:33:16 +01:00
Tiger Wang
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
Tiger Wang
8050a5b98a
Suggestions
2014-07-21 22:49:06 +01:00
