1
0
Commit Graph

138 Commits

Author SHA1 Message Date
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
worktycho
4a6d606f74 Made CreateProjectile a pointer 2014-07-13 15:16:49 +01: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
madmaxoft
9e22f46b15 Implemented support for forced chunk ticking.
Fixes #1160.
2014-07-10 18:18:32 +02:00
Tiger Wang
74b6b398e7 Fixed arrow collection animation
* Fixed piston extension non-solidness
2014-07-09 19:56:50 +01: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
Tiger Wang
19caba5125 Redstone simulator is alerted to lever unpowering
* Fixed the "fix" that broke the fix for #535, thereby fixing said issue
* Fixed #535
2014-07-02 18:46:00 +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
archshift
e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
Howaner
c60ba8a52d Merge branch 'master' into GlobalFixes 2014-06-17 19:03:56 +02:00
Howaner
a89524d533 Add DoWithBlockEntityAt() to WorldInterface.h 2014-06-17 01:15:38 +02:00
madmaxoft
f76420ac55 Removed an unused fwd declaration. 2014-06-13 09:38:25 +02:00
worktycho
70c20d7772 Fixed constness 2014-06-11 17:17:19 +01:00
Tiger Wang
e24830f0b1 Compile fix 2014-06-11 13:49:57 +01:00
Tiger Wang
1a9467574e Reduced code duplication
call @maxmaxoft!
calling...
call connected (0:20)
call ended
2014-06-11 13:40:34 +01:00
Tiger Wang
f7913d3b74 IsWeatherSunnyAt does something useful :D 2014-06-11 13:37:04 +01:00
Alexander Harkness
c09207cabc SMICOLOSL
Meant to be semicolons up there.
2014-06-11 13:20:31 +01:00
Tiger Wang
711113cd2b Updated unnecessary function :/ 2014-06-11 13:10:10 +01:00
Alexander Harkness
c5010ebcc1 Add DoxyComments to he weather things.
Also changed the function names.
2014-06-11 13:01:52 +01:00
Alexander Harkness
c3c3782c67 Add new IsWeatherWet hook for cauldrons.
@madmaxoft can you comment?
2014-06-11 10:33:16 +01:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
2014-06-08 21:58:30 +02:00
Mattes D
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
Tiger Wang
365c6f50bd Changed block send queue to use vectors
As suggested by @worktycho.
2014-05-29 11:57:06 +01:00
Tiger Wang
ee929793f0 Hopefully fixed piston duplication issues
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
Tiger Wang
696a7bc52e Merge branch 'master' into fixes
Conflicts:
	src/Vector3.h
2014-05-06 20:15:19 +01:00
madmaxoft
839447f0bb Merge branch 'master' into fixes. 2014-05-02 19:34:28 +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
archshift
2c0bb7b717 Moved the weather picker out of TickWeather(), squashing a warning and improving readability. 2014-04-25 16:55:38 -07:00
Tiger Wang
48904ae201 Merge branch 'master' into fixes
Conflicts:
	src/World.h
2014-04-24 18:57:25 +01:00
Tiger Wang
f763242e5c Small changes 2014-04-23 21:06:07 +01:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tycho
23395a5ce1 Merge branch 'master' into override
Conflicts:
	lib/tolua++/CMakeLists.txt
2014-04-05 14:12:17 -07:00
madmaxoft
a5c0600e6c Fixed a few clang warnings. 2014-03-30 20:02:30 +02:00
andrew
4f3377bbbf Minor fixes 2014-03-25 09:10:55 +02:00
andrew
6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
Tycho
5653997bcc Added override specifier to functions declared in cWorld 2014-03-22 08:43:54 -07:00
Tiger Wang
0524d70774 ENUMified shrapnel level 2014-03-19 23:06:39 +00:00
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt
Conflicts:
	src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Tiger Wang
23ffaa19b7 Added levels of shrapnel 2014-03-18 20:45:10 +00:00
madmaxoft
260d13c7a4 Added override specifier where appropriate in cWorld. 2014-03-16 21:56:27 +01:00
Mattes D
4ec402e6f9 Merge pull request #782 from mc-server/beds
Beds now work properly, fixes #707
2014-03-16 21:47:34 +01:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang
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
Tiger Wang
cc2d805238 Merge branch 'master' into awesometnt 2014-03-10 18:36:55 +00:00
Tiger Wang
462829e23d Shrapnel now configurable 2014-03-10 18:35:02 +00:00
Tiger Wang
09c5542123 Merge pull request #768 from Howaner/BlockEntitys
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang
b64e9fb7f5 Beds now work properly fixes #707
Also fixes FS392

Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
2014-03-09 15:32:34 +00:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles
Conflicts:
	src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Howaner
527f358510 Merge branch 'master' into BlockEntitys 2014-03-08 12:29:45 +01:00