1
0
Fork 0
Commit Graph

94 Commits

Author SHA1 Message Date
madmaxoft 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
madmaxoft 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
Howaner d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang 5f72cdac38 Merge pull request #1154 from mc-server/trappedchests
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
Tiger Wang e71e432633 Suggestions and bug fix
* Fixed hoppers pushing/pulling to/from (trapped)chests that do not form
a double-chest with the chest type directly connected to said hopper;
thank you, @madmaxoft
2014-07-12 22:06:25 +01:00
madmaxoft 729cc7f6ff Fixed style consistency. 2014-07-10 23:04:33 +02:00
madmaxoft 9e22f46b15 Implemented support for forced chunk ticking.
Fixes #1160.
2014-07-10 18:18:32 +02:00
Tiger Wang 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
Mattes D 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
Mattes D 1da39568a3 Added asserts for cChunk::GetBlockEntity() coords. 2014-06-24 09:46:38 +02:00
archshift e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Tycho ee50790398 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:12:50 +01:00
Tiger Wang 22236a103a Redstone fixes and improvements [SEE DESC]
Haha, see desc.

* Improved redstone speed through a marking dirty system. Only a select
few devices are still continuously simulated
* Fixed redstone crashing with recent piston changes
2014-06-04 23:23:22 +01:00
Tiger Wang 5fc7592cba Merge remote-tracking branch 'origin/pistonfixes'
Conflicts:
	src/Chunk.cpp
2014-06-02 19:49:14 +01:00
Tiger Wang a84f107400 Suggestions two 2014-06-01 20:00:11 +01:00
madmaxoft f7777e8c75 Added comments, reformatted code. 2014-05-29 18:25:08 +02:00
Tiger Wang 3549d0d5e6 More comments! 2014-05-29 15:59:39 +01:00
Tiger Wang ee929793f0 Hopefully fixed piston duplication issues
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
Tycho 8f964886e0 Implemented style changes 2014-05-24 13:33:40 +01:00
Tycho 5929ffbc40 Fixed stylistic issues 2014-05-21 20:08:34 +01:00
Tycho 024027db89 Renamed cChunkBuffer to cChunkData 2014-05-21 19:58:48 +01:00
Tycho cdd3d11496 Fixed minor style issues 2014-05-21 18:33:54 +01:00
Tycho cb6200345c Fixed bug in setting metas 2014-05-10 15:19:06 +01:00
Tycho d478e3cfb1 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.h
2014-05-10 05:05:44 -07:00
Tiger Wang 0d1804e439 Merge branch 'master' into redstoneimprovements
Conflicts:
	src/ClientHandle.cpp
	src/Entities/FallingBlock.cpp
	src/Mobs/AggressiveMonster.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-05-04 14:15:10 +01:00
madmaxoft 8ff7cf9262 Fixed a buffer overflow in cChunk:SetLight().
There are only half as many bytes for light than there are blocktypes.
2014-05-02 20:56:42 +02:00
Tiger Wang bbc5faa723 Redstone simulator now directly accesses cChunk
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
2014-04-27 17:35:41 +01:00
Tycho dcb2a590e3 Fixed bad merge 2014-04-27 06:45:33 -07:00
Tycho 57b8ee9163 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.cpp
	src/Chunk.h
2014-04-27 06:35:27 -07:00
Tycho e40f9d6e5b Implemented Chunk Sparsing with segments 2014-04-26 10:50:23 -07:00
Mattes D 1139b117c4 Merge pull request #863 from mc-server/chunkysparsing
Chunky sparsing
2014-04-26 15:12:10 +02:00
Tiger Wang 05f52192c9 Implemented comments 2014-04-25 21:22:43 +01:00
Tiger Wang 3397f9faec Fixed indent 2014-04-24 22:07:20 +01:00
Tiger Wang acbd4e6503 Another small speed improvement? 2014-04-24 21:52:01 +01:00
Tiger Wang ffce8d6907 Implemented suggestions 2014-04-24 21:49:56 +01:00
Mattes D 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
jfhumann 013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
STRWarrior 875c2557c3 Implemented the skeleton code for the beacon.
There is no handling for the GUI. It can now check how big the pyramid is under the beacon.
2014-04-12 00:01:15 +02:00
Tycho 01546020fc Replaced all the .data() calls so the code compiles in VS2008 2014-04-10 12:12:36 -07:00
Tycho 18793ca568 Fixed missing - that caused all neighbour lookups to go to the chunkmap 2014-04-08 08:59:50 -07:00
Tiger Wang f13cf1a021 Maybe speed improvements?
* Use a single index to determine from when to begin copying data
* Use heightmap to determine first nonair block
2014-04-07 20:57:14 +01:00
Tiger Wang 74c4789c6f Attempt to fix errors 2014-04-07 12:43:43 +01:00
Tiger Wang a42d1f8517 Blocklight and skylight now compressed 2014-04-06 23:30:21 +01:00
Tiger Wang 3201d1bf16 Nibbletypes are compressed
+ Added nibble compression
* Fixed an off by one
2014-04-04 23:16:52 +01:00
Tiger Wang 15a0ceec26 Speed and memory improvements
* Changed array to be continuous, so no more layer splitting
2014-04-04 13:01:05 +01:00
Tiger Wang e1ba51e6ca Merge remote-tracking branch 'origin/master' into chunkysparsing 2014-04-03 19:18:34 +01:00
Tiger Wang d5faf5a38e Fixed some bugs
* Fixed undefined behaviour
* Fixed compression failure
2014-04-03 19:17:04 +01:00
Tiger Wang 357411a489 Performance improvements and chunk flipping fixed 2014-04-02 22:53:03 +01:00
worktycho 5260146f3c Merge pull request #838 from mc-server/lilypads
Lilypads
2014-03-30 15:17:35 +01:00
Tiger Wang 8ece214920 Fixed a potential crash 2014-03-28 22:51:39 +00:00