1
0
Commit Graph

7036 Commits

Author SHA1 Message Date
Tycho
73dfe1fe81 Fix accedental c++11 2014-09-17 18:59:45 +01: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
madmaxoft
010879e43f BungeeCord compatibility: don't overwrite UUID / properties. 2014-09-17 16:01:14 +02:00
madmaxoft
82317709f8 Full BungeeCord compatibility.
Fixes #1392.
Fixes SpigotMC/BungeeCord#1211.
2014-09-17 11:07:42 +02:00
madmaxoft
3406957f1b Initial BungeeCord support.
Ref.: #1392
2014-09-17 09:38:06 +02:00
Tycho
26a4845a99 IncrementalRedstoneSimulator now has no dependencies on cChunk 2014-09-16 20:29:31 +01:00
madmaxoft
96f45a48d4 VoronoiMap: Added Jitter and OddRowOffset params. 2014-09-15 22:34:33 +02:00
madmaxoft
18743540bc QtBiomeVisualiser: Fixed colors and read failures. 2014-09-15 21:45:35 +02:00
Mattes D
21b70f17c2 QtBiomeVisualiser: Added reloading. 2014-09-15 17:29:34 +02:00
Mattes D
84947a22ad QtBiomeVisualiser: removed multithreading.
It was slowing things down, the granularity is too fine.
2014-09-15 17:20:54 +02:00
Mattes D
d772bc032f QtBiomeVisualiser: Added multithreading.
For some reason this makes the UI less responsive.
2014-09-15 16:50:40 +02:00
Mattes D
ddf130f849 QtBiomeVisualiser: Extended zoom down below 100%. 2014-09-14 22:20:16 +02:00
Mattes D
69b46aeb27 QtBiomeVisualiser: Added mouse and keyboard view control.
Mouse dragging or WASD pans view, mouse wheel or QE zooms.
2014-09-14 22:05:10 +02:00
Mattes D
2a020e47f1 QtBiomeVisualiser: Removed build-specific variables.
These should be set in the project configuration instead, passed directly to qmake.
2014-09-14 20:09:33 +02:00
madmaxoft
46061ab917 Removed the unused nightbuild script. 2014-09-14 20:00:18 +02:00
Alexander Harkness
28c385d38e Merge pull request #1434 from Masy98/master
Added me to the contributors list
2014-09-14 17:03:24 +01:00
Masy98
0b16bbfc01 Added me to the contributors list 2014-09-14 17:58:09 +02:00
Mattes D
e3a2dc5a13 Added new Qt-based biome visualiser.
Compile with Qt 5.1+
2014-09-14 01:33:05 +02:00
Mattes D
c4a53c5d7d OSSupport: Fixed UNICODE Windows builds.
The files now compile even inside UNICODE applications.
2014-09-14 01:33:05 +02:00
Tiger Wang
fdabfd77e2 Improved cBlockHandler::DropBlock 2014-09-13 22:49:27 +01:00
Tiger Wang
52d86728e6 Entities experience water resistance 2014-09-13 22:49:05 +01:00
Mattes D
5b63a7fe98 Merge pull request #1353 from mc-server/Effects
Added speed entity effect.
2014-09-13 17:05:59 +02:00
Alexander Harkness
1707a149f7 Gittip is now Gratipay
Also, 7000th Commit!
2014-09-13 12:04:20 +01:00
Alexander Harkness
76a73b2528 Updated CI Links to new ones. 2014-09-13 12:03:29 +01:00
Tiger Wang
4019847857 Fixed friction being applied whilst airborne
Reported by tonibm9 in #1300.
2014-09-12 20:50:24 +01:00
madmaxoft
c0a069b260 APIDump: Improved command binding documentation. 2014-09-12 20:59:47 +02:00
Mattes D
db13405da2 Merge pull request #1424 from Howaner/Fixes
Fixes
2014-09-12 20:43:05 +02:00
Howaner
d5306f265b Only drop flint or gravel, not both. 2014-09-12 19:38:00 +02:00
Howaner
96e03fc3ea Added extra mushroom handler. 2014-09-12 19:34:19 +02:00
Howaner
1223a24d3c Merge branch 'master' into Effects 2014-09-12 19:13:46 +02:00
Howaner
fcf558173e Fixed farmland issues. 2014-09-12 19:07:20 +02:00
Howaner
80b0631c43 Only place farmland if no block is upper than dirt/grass. 2014-09-12 18:21:11 +02:00
Howaner
a40eb93c33 Added hoe interact sound. 2014-09-12 18:15:49 +02:00
Howaner
20f3757d54 Play placesound from the middle of the block. 2014-09-12 18:14:32 +02:00
Howaner
010ac1e5f7 Fixed block place sounds. 2014-09-12 18:12:42 +02:00
Howaner
d07ef85ee3 Spawn exp if you break a mob spawner. 2014-09-12 16:41:23 +02:00
Howaner
3f000deb3b Disabled mobspawner itemdrop. 2014-09-12 15:59:46 +02:00
Howaner
a1716bb415 Players in survival mode are not allowed to break a bedrock. 2014-09-12 15:57:37 +02:00
Howaner
abcae75992 Fixed iron ore drop. 2014-09-12 14:08:56 +02:00
Howaner
1849e620fc Added flint drop and fence gate meta reset. 2014-09-12 13:49:08 +02:00
Tycho
b87585977f Don't include IncrementalRedsonteSimulator.inc when in SELF_TEST mode 2014-09-11 17:57:34 +01: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
Mattes D
9fd5df26d0 Fixed a redstone sim failure with droppers. 2014-09-11 10:28:48 +02:00
Tycho
c8b41e9b2b Merge branch 'master' of https://github.com/mc-server/MCServer 2014-09-10 19:50:31 +01:00
Tycho
cf69ddcce1 Cleaned up flags 2014-09-10 19:49:52 +01:00
Mattes D
84cb258ec2 Merge pull request #1414 from Masy98/Crafting
Fixed sign recipe
2014-09-10 20:38:22 +02:00
Masy98
67d710429f Fixed spacing 2014-09-10 20:36:51 +02:00
Masy98
d8c381d8cc Fixed sign recipe 2014-09-10 20:31:33 +02:00
Alexander Harkness
32002694b0 Grammar fixes. 2014-09-10 18:47:59 +01:00