flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,206 Commits 1 Branch 0 Tags 92 MiB
3ff7103440
Commit Graph

7206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Howaner
65077c314a Merge branch 'master' into WorldLoader 2014-09-24 15:00:49 +02:00
madmaxoft
34b83656b3 QtBiomeVisualiser: Fixed MSVC path-crossing. 
MSVC would occasionally compile the wrong CPP file - the same name, but wrong path.
 2014-09-24 11:21:59 +02:00
madmaxoft
8d9dfc5d1a Anvil: Wolf collar color is a byte in Vanilla. 
Kept the old Int reading for compatibility reasons.
Ref.: #1448
 2014-09-23 22:22:38 +02:00
Howaner
2832685c02 Merge branch 'master' into WorldLoader 2014-09-23 22:16:05 +02:00
madmaxoft
d04ab9b703 Fixed compiler warnings in 1.8 protocol. 2014-09-23 22:12:48 +02:00
madmaxoft
0b40ce971c Fixed a crash in WSSAnvil. 
Reported as #1448.
 2014-09-23 22:12:47 +02:00
Howaner
366af5067b MCServer world compatiblity with vanilla and mcedit. 2014-09-23 19:16:17 +02:00
Franz Reiter
33f8091d5f Merge pull request #1372 from mc-server/EntityCustomName 
Added SetCustomName() to cMonster and cPlayer
 2014-09-23 15:54:07 +02:00
Howaner
b9a5122e29 Fixed SQLiteCpp downgrade 2014-09-23 14:44:15 +02: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
madmaxoft
de163f0134 QtBiomeVisualiser: Fixed confusion about Globals.h. 2014-09-23 12:51:02 +02:00
archshift
5f6bac2091 Made ExpBottleEntity break on entities. 
Fixes #1369
 2014-09-23 00:28:12 -07:00
worktycho
e3e7bc21f7 Merge pull request #1447 from cedeel/patch-2 
A few compiler warning fixes
 2014-09-23 08:15:22 +01:00
Chris Darnell
806871b86f A few compiler warning fixes 2014-09-22 18:23:56 -04:00
Howaner
1aa64f32e1 Updated README.md 2014-09-22 22:07:58 +02:00
Howaner
fc11818f4c Hotfixed 1.8 item reading. 2014-09-22 22:06:08 +02:00
madmaxoft
83588fb0aa QtBiomeVisualiser: Implemented live-update for the generator setup. 2014-09-22 21:52:38 +02:00
madmaxoft
583532e1b9 QtBiomeVisualiser: generator source is read from generator setup ini. 2014-09-22 21:52:37 +02:00
madmaxoft
10c5d50566 QtBiomeVisualiser: Moved the generator setup into a side-pane. 2014-09-22 21:52:37 +02:00
Alexander Harkness
5f823fd18d Merge pull request #1398 from mc-server/1.8-Protocol 
1.8 Protocol Update
 2014-09-22 20:45:22 +01:00
Howaner
9cddffb6df Changed metadata reading again. 2014-09-22 21:18:13 +02:00
Howaner
bcb11078e3 Fixed item nbt reading. 2014-09-22 17:15:08 +02:00
Alexander Harkness
b9b45e8287 Merge pull request #1446 from cedeel/patch-1 
Made it compile with clang
 2014-09-22 13:33:41 +01:00
Chris Darnell
195b646aa4 Made it compile with clang 2014-09-22 03:22:36 -04:00
madmaxoft
dda66ea6ef QtBiomeVisualiser: Added the base for INI editting. 2014-09-21 22:58:27 +02:00
Tiger Wang
cb70925077 Fix crash in cLineBlockTracer 
* Fixes #1418
 2014-09-21 19:24:45 +01:00
madmaxoft
14123c6d16 QtBiomeVisualiser: Added list of vanilla worlds. 2014-09-20 23:03:13 +02:00
madmaxoft
3676a84916 Fixed cParsedNBT::FindTagByPath(). 
There was an off-by-one error in the name handling.
 2014-09-20 23:01:42 +02:00
madmaxoft
66ef05c765 QtBiomeVisualiser: Added support for loading Anvil worlds. 2014-09-20 18:41:21 +02:00
madmaxoft
b2573aad50 Fixed typos in items.ini. 2014-09-19 22:30:32 +02:00
Mattes D
a5386070d6 Merge pull request #1442 from Masy98/Language 
Added german language support
 2014-09-19 22:28:45 +02:00
Howaner
6aa331a4fa Code improvements. 2014-09-19 15:07:01 +02:00
Howaner
0baca1f1d8 Updated SPAWNING_ENTITY hook description. 2014-09-19 14:36:02 +02:00
Howaner
4398156b2e Merge branch 'master' into 1.8-Protocol 2014-09-19 14:31:18 +02:00
Howaner
52c875531e Derp 2014-09-18 18:51:36 +02:00
Howaner
43ed690520 Exported player list states to extra functions. 2014-09-18 18:50:17 +02:00
Masy98
b3de0e104f Added german language support, now really 2014-09-18 17:39:32 +02:00
Masy98
400ce1f9e0 Added german language support 2014-09-18 16:37:34 +02:00
Howaner
be6d4a5912 1.8: Simplified item metadata reading. 2014-09-18 16:04:03 +02:00
madmaxoft
09c67bddf7 QtBiomeVisualiser: More gcc fixes. 2014-09-18 10:26:28 +02:00
madmaxoft
98f4588ed3 QtBiomeVisualiser: Fixed linux compilation. 2014-09-18 10:24:52 +02:00
madmaxoft
95af3eb526 Fixed minor style issues. 2014-09-17 23:32:14 +02:00
madmaxoft
6f5aa487ed Voronoi biomegen: Added JitterSize and OddRowOffset. 2014-09-17 23:24:22 +02:00
madmaxoft
c979d46548 Updated SQLiteCpp. 
Our changes have made it into upstream, updating to sync with upstream master.
 2014-09-17 22:48:58 +02:00
Mattes D
0625556c37 Merge pull request #1437 from nesco/master 
Implemented spectator gamemode.
 2014-09-17 21:30:11 +02:00
nesco
bf85c0b0ab Implementing Spectator Mode 
Adding some proprieties of the spectator game mode in player.cpp :
- Players can't toss items
- Players can't touch the ground
 2014-09-17 21:17:06 +02:00
madmaxoft
16e9deba8d Added an explicit setting for allowing BungeeCord handshake. 2014-09-17 20:56:33 +02:00
Howaner
ccaec8f424 Fixed wrong url in the debuggers plugin 2014-09-17 20:28:30 +02:00
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