daniel0916
|
b239de66db
|
Merge branch 'master' into Enchanting
|
2014-04-18 15:04:32 +02:00 |
|
daniel0916
|
3efd232829
|
Removed old include
|
2014-04-18 14:10:31 +02:00 |
|
Mattes D
|
b7e074b10b
|
Merge pull request #891 from mc-server/fixes
Fixes to redstone & general
|
2014-04-17 22:37:00 +02:00 |
|
daniel0916
|
0086fcfef1
|
Fixed some Errors (not all)
|
2014-04-17 19:31:43 +02:00 |
|
daniel0916
|
f9343a8490
|
Modified many things
|
2014-04-17 13:15:35 +02:00 |
|
daniel0916
|
a0725747af
|
Fixed conflicting enchantments checking
|
2014-04-16 14:52:09 +02:00 |
|
daniel0916
|
a12a9117c2
|
Added deletions from merge conflict
|
2014-04-16 14:33:03 +02:00 |
|
madmaxoft
|
99e4225269
|
Attempted fix for the client crash with the new protocols.
|
2014-04-15 23:40:06 +02:00 |
|
madmaxoft
|
d12d7b6715
|
Implemented the 1.7.6 protocol and authenticator.
Server works both in online and offline modes with 1.7.9.
|
2014-04-14 22:52:59 +02:00 |
|
madmaxoft
|
d505ffc704
|
A client UUID is generated when the server is in offline mode.
1.7.9 client works with these changes in offline mode.
|
2014-04-14 20:21:00 +02:00 |
|
daniel0916
|
b506a74076
|
Added Yggdrasil Authentication System
Code by Howaner. Fixes/Changes by me.
|
2014-04-13 13:04:56 +02:00 |
|
Tiger Wang
|
c0c47d33c5
|
Entities handle chunks properly again
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
|
2014-04-12 13:16:48 +01:00 |
|
madmaxoft
|
d77ca77086
|
Merge branch 'master' into HTTPSizeT
|
2014-04-04 13:29:48 +02:00 |
|
madmaxoft
|
8825d30aab
|
Fixed some Clang warnings in protocols.
|
2014-04-04 10:13:25 +02:00 |
|
Tycho
|
1f5a4a39f2
|
Fixed All signedness warnings in HTTPServer.cpp
|
2014-04-02 06:36:25 -07:00 |
|
Tiger Wang
|
ee07b7ae3e
|
Simplified and fixed slabs, fixes #835
|
2014-03-31 20:34:11 +01:00 |
|
worktycho
|
5260146f3c
|
Merge pull request #838 from mc-server/lilypads
Lilypads
|
2014-03-30 15:17:35 +01:00 |
|
Tiger Wang
|
515e4bdb13
|
Compare for inequality in FACE_NONE checks
|
2014-03-29 13:18:26 +00:00 |
|
Tiger Wang
|
aefabfcafa
|
Removed leftover clienthandle code
|
2014-03-29 10:25:40 +00:00 |
|
Tiger Wang
|
fb16554322
|
Fixed players not updating after world change
Addendum to 6dea7993f2
|
2014-03-29 01:21:56 +00:00 |
|
Tiger Wang
|
aee1f8f9d1
|
Fixed block interaction rate check
|
2014-03-28 22:52:04 +00:00 |
|
Tiger Wang
|
f622f4317c
|
Implemented lilypad placement
|
2014-03-23 22:32:45 +00:00 |
|
Tycho
|
d904e89712
|
Merge branch 'Werror' into warnings
Conflicts:
src/Globals.h
|
2014-03-12 10:12:13 -07:00 |
|
Tycho
|
3caa4a38b9
|
Merge branch 'master' into Werror
Conflicts:
src/Generating/PieceGenerator.cpp
|
2014-03-12 09:59:10 -07:00 |
|
Tycho
|
16b27c4b7a
|
Fixed a load of format string errors
|
2014-03-11 14:16:08 -07:00 |
|
andrew
|
b4bf13aa4f
|
Unified Vector classes
|
2014-03-11 16:02:25 +02:00 |
|
Tycho
|
2eca30aebc
|
Removed Some unnessicary macros
|
2014-03-10 11:34:20 -07:00 |
|
Tiger Wang
|
1985a9c33e
|
Merge pull request #731 from mc-server/ballisticmissiles
Ballistic firework missiles
|
2014-03-09 21:43:15 +00:00 |
|
Tiger Wang
|
77787fb719
|
!= FACE_NONE
|
2014-03-09 14:55:47 +00:00 |
|
Mattes D
|
d3c38c40e4
|
Merge pull request #777 from jfhumann/issue317
Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
|
2014-03-09 15:13:27 +01:00 |
|
Mattes D
|
8a715db41f
|
Merge pull request #775 from worktycho/warnings
Fixed a few warnings
|
2014-03-09 15:04:12 +01:00 |
|
Tiger Wang
|
c2978a3457
|
Merge branch 'master' into ballisticmissiles
Conflicts:
src/ClientHandle.cpp
|
2014-03-09 12:53:50 +00:00 |
|
Tiger Wang
|
a2fb28dd08
|
Fixed data length issues
|
2014-03-09 12:48:59 +00:00 |
|
Tiger Wang
|
c05a1db88d
|
CheckBlockInteractionsRate() fixed & enabled
|
2014-03-09 12:48:52 +00:00 |
|
Tiger Wang
|
8d2ebf8e19
|
Slight plugin messaging changes
- Clients are not allowed to register duplicate channels
- Clients are not allowed to use channels that were not registered
|
2014-03-09 00:36:02 +00:00 |
|
Jan-Fabian Humann
|
66970fe943
|
Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.
|
2014-03-08 17:55:53 +01:00 |
|
Tycho
|
307fad0f25
|
Fixed issues with int vs size_t and a few other warnings
|
2014-03-08 08:33:38 -08:00 |
|
Howaner
|
d4a5b16c52
|
Add data backsending, when the Client interacts a Block and the Interact is cancelled.
|
2014-03-05 15:10:20 +01:00 |
|
andrew
|
070d483236
|
cBlockInfo now manages the respective cBlockHandler
|
2014-03-02 21:25:05 +02:00 |
|
Mattes D
|
b17d04737d
|
Merge pull request #738 from xdot/master
Refactored global block property arrays
|
2014-03-02 16:13:43 +01:00 |
|
andrew
|
d73cdba1f6
|
g_BlockXXX => cBlockInfo::XXX
|
2014-03-01 21:34:19 +02:00 |
|
Howaner
|
0274db0e14
|
Use switch in GetStepSound
|
2014-02-28 22:32:10 +01:00 |
|
Howaner
|
66c8425041
|
Fix Double Slabs, fix Slab Meta and add more things to burnable
|
2014-02-28 15:26:32 +01:00 |
|
Tiger Wang
|
f77720c43f
|
Merge pull request #669 from xdot/master
Implementation of in-game maps :D
|
2014-02-24 10:28:34 +00:00 |
|
Howaner
|
084971424f
|
Use the ItemCategorie::IsSword() Method.
|
2014-02-23 20:31:58 +01:00 |
|
Howaner
|
cc34898e45
|
No Sword Block Destroying in Creative Mode
|
2014-02-23 20:02:44 +01:00 |
|
madmaxoft
|
27e77a28fa
|
cClientHandle manages the client-registered plugin channels.
Fixes #706.
|
2014-02-20 23:24:39 +01:00 |
|
andrew
|
83d3a2eedf
|
Manual merge (Fixed conflicts)
|
2014-02-20 15:37:15 +02:00 |
|
andrew
|
393ca0221d
|
Map decorators; Map clients
|
2014-02-18 20:50:08 +02:00 |
|
Tiger Wang
|
320cc74f0a
|
Implemented paintings, fixes #689
+ Implemented paintings
|
2014-02-18 00:16:03 +00:00 |
|