6e7c0e33b5
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
47c928cab7
Exported daylight cycle flag to the protocol.
2014-08-11 00:20:28 +02:00
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
37140ae578
Merge branch 'master' into portals
...
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
src/ClientHandle.h
src/Entities/Player.cpp
src/Entities/Player.h
src/Generating/FinishGen.cpp
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol16x.cpp
src/Protocol/Protocol16x.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/Root.h
src/World.cpp
2014-07-18 20:10:51 +01:00
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
2423fbf2ef
Normalized comments.
...
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
b9d4431f6f
Fixed respawning
...
* Fixes #1103
2014-06-29 22:44:16 +01:00
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
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
bfa8aaf41b
Merge branch 'master' into portals
...
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
8bff3e5af2
Implemented end and nether portals
2014-05-31 22:28:51 +01:00
c7c3724a3e
Statistic Manager
2014-05-11 14:57:06 +03:00
ed75d3a836
Fixed warnings in ClientHandle.
2014-05-01 22:58:58 +02:00
709015369d
Merge pull request #940 from Howaner/GlobalFixes
...
Add entity invulnerable
2014-04-28 20:58:15 +02:00
26e935cb20
Revert "Changed the old invulnerable methods from the wither to the new."
...
This reverts commit d50f8f6f11
2014-04-28 13:51:22 +02:00
9b0cb3fd97
Fixed projectile source filenames, indentations
2014-04-27 17:05:18 -07:00
477b3e7861
Moved cArrowEntity out of ProjectileEntity.h
2014-04-26 16:45:39 -07:00
d50f8f6f11
Changed the old invulnerable methods from the wither to the new.
2014-04-26 17:47:25 +02:00
49f6819829
Fixes
2014-04-26 16:44:15 +02:00
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
67344a3782
Merge remote-tracking branch 'origin/master' into fixes
...
Conflicts:
src/Authenticator.cpp
src/ClientHandle.cpp
src/Entities/Minecart.cpp
src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
f9343a8490
Modified many things
2014-04-17 13:15:35 +02:00
5a9acb7eb6
Merge branch 'master' into Enchanting
2014-04-16 14:31:02 +02:00
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
1dfd2b1c5f
Fixed Errors
2014-04-07 20:25:30 +02:00
2e9754ac1c
Merge remote-tracking branch 'upstream/master' into Enchanting
2014-04-07 20:12:17 +02:00
87f39e9e28
Explicit change record size.
2014-04-04 13:19:25 +02:00
4be894f060
More Clang warning fixes in the protocols.
2014-04-04 11:47:46 +02:00
8825d30aab
Fixed some Clang warnings in protocols.
2014-04-04 10:13:25 +02:00
01c38505fd
Merge pull request #831 from mc-server/Wither
...
Wither
2014-04-02 12:00:26 +02:00
8126d9e66e
Console logging supports cCompositeChat as its parameters.
2014-03-31 22:51:14 +02:00
0fe1e50ffc
Protocol: Wither metadata
2014-03-25 10:32:58 +02:00
7c974b27b1
Removed unused macro
2014-03-10 10:49:03 -07:00
d3c38c40e4
Merge pull request #777 from jfhumann/issue317
...
Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
2014-03-09 15:13:27 +01:00
f74ee8fb51
Adjusted style of switch/case
2014-03-09 10:55:06 +01:00
72f9c8b069
Changed if-else to switch-case
2014-03-08 19:26:32 +01:00
66970fe943
Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.
2014-03-08 17:55:53 +01:00
d33d72f0dc
Warnings
2014-03-07 11:04:25 -08:00
83d3a2eedf
Manual merge (Fixed conflicts)
2014-02-20 15:37:15 +02:00
393ca0221d
Map decorators; Map clients
2014-02-18 20:50:08 +02:00
0f1f7583ae
Implemented cCompositeChat.
...
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678 .
2014-02-15 23:17:49 +01:00
92e85cc960
Implementation of in-game maps
2014-02-13 17:13:09 +02:00
8464f689ea
Improved Type safety of eBlockFace
...
May Fix #640
2014-02-04 10:59:05 -08:00
7735a1104f
added EnchantItemPacket to older Protocols
2014-02-01 13:09:28 +01:00
Tycho
Howaner
Tiger Wang
madmaxoft
andrew
archshift
jfhumann
daniel0916