1
0
Fork 0
Commit Graph

184 Commits

Author SHA1 Message Date
tycho 77f1f58c0a Make -Werror disabling file only
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
Tiger Wang 9c490293b8 Merge remote-tracking branch 'origin/master' into warnings
Conflicts:
	src/Mobs/Monster.cpp
	src/Vector3.h
2015-05-10 12:16:20 +01:00
Mattes D 846d16315a CheckBasicStyle: checks spaces around * and &. 2015-05-09 12:58:55 +02:00
Mattes D c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
Tiger Wang 218010cd96 Fixed some Visual Studio warnings 2015-05-08 23:32:02 +01:00
Mattes D e5a7a730ed Merge pull request #1826 from mc-server/UnifyPacketizer
Unify packetizer
2015-03-24 13:09:41 +01:00
Mattes D c3c29577a5 Fixed signedness warnings in Protocol. 2015-03-21 16:11:57 +01:00
Mattes D cc069ccb2a Changed cEntity::m_UniqueID to UInt32. 2015-03-21 15:18:17 +01:00
Tommy Santerre 3f6d823aa4 Correct world height validations.
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
2015-03-19 20:32:17 -04:00
Howaner ce6219530a Fixed client kick/crash if many block changes happend 2015-03-09 22:32:12 +01:00
STRWarrior b3f0751130 Weather: Snow starts forming when the top block is at the right height or higher 2015-02-25 19:02:08 +01:00
STRWarrior a56b6906d6 Fixed flowing water turning into ice when snowing 2015-02-25 17:26:48 +01:00
Raekye 82a10116dd fix logic bug in cChunk::FastSetBlock filtering out leaves meta changes
- send update if it's not a leaves block and (the original checks)
2015-01-25 19:13:55 -05:00
Raekye 08d84080fa filter out leaves meta changes from being sent to the client 2015-01-25 18:33:08 -05:00
Tycho 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
Mattes D ccdf03daaf Refactored all player block placing to go through hooks.
Fixes #1618.
2014-12-24 07:20:17 +01:00
Mattes D afdd53729c cChunk: Fixed missing initialization.
Fixes CID 72670.
2014-12-21 22:19:53 +01:00
Tiger Wang 4b20a61519 Merge branch 'master' into redstone 2014-12-13 12:11:01 +00:00
Mattes D c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Howaner 648fee1a08 Merge branch 'master' into MobSpawner 2014-11-29 12:05:35 +01:00
Mattes D 1480cdb944 Chunk: Fixed same-name iterators. 2014-11-27 23:15:08 +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
Howaner 42120e2ea5 Merge branch 'master' into MobSpawner
Conflicts:
	MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
Mattes D 2467d29a4e Moved all Noise-related files into a separate folder. 2014-11-18 12:07:08 +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
Howaner 9af58a81d6 Use 3 priorities. 2014-10-23 21:19:43 +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 b0988e65aa Use two lists and 2 chunk send prioritys. 2014-10-21 17:35:23 +02:00
Howaner 44514e53fc Merge branch 'master' into ChunkLoader
Conflicts:
	src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Tiger Wang 987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang 2334c8dd9d Merge branch 'master' of https://github.com/mc-server/MCServer 2014-10-20 19:01:53 +01:00
Julian Laubstein 3082f0d046 Fixed error with non-const function 2014-10-19 15:11:53 +02:00
Tiger Wang aa19a3afb0 Migrated random generators to std::random 2014-10-19 14:10:18 +01:00
Tiger Wang 2874bf73be Merge pull request #1502 from mc-server/furnaces
Improved furnaces
2014-10-18 21:33:55 +01:00
Tiger Wang 6a22b63473 Furnaces now update their block entity type
Therefore improving cChunk's variable boundary checking.
2014-10-18 19:54:34 +01:00
Mattes D eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
Howaner b493beb3bb Stream 4 chunks per tick. Added priority. 2014-10-06 21:27:53 +02:00
Tiger Wang b5a2c6667a Improved furnaces
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
2014-10-03 21:32:41 +01:00
worktycho 80fe8d7789 Update Chunk.cpp 2014-09-28 17:57:01 +01:00
Tycho f6979642e6 Use factory method to construct redstone simulator data 2014-09-28 15:36:00 +01:00
Howaner 033d16babb Merge branch 'master' into MobSpawner
Conflicts:
	src/MobSpawner.h
	src/Mobs/Monster.h
2014-09-26 23:56:20 +02:00
Tycho 0e141923bb Merge branch 'master' of https://github.com/mc-server/MCServer 2014-09-26 18:14:22 +01:00
Tycho a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
tycho ad5d0eda9c Fixed issue with casting 2014-09-26 17:00:34 +01:00
Tycho 9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Howaner 718eb227ab Implemented mob spawner. 2014-09-19 23:00:54 +02:00
Tycho 045d54e0e2 Merge branch 'master' into redstoneTests
Conflicts:
	src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
Howaner bee615b75b Merge branch 'master' into 1.8-Protocol 2014-09-12 13:28:06 +02:00