madmaxoft
f095e770b8
Merged branch 'howaner/Options'.
2014-07-30 10:06:18 +02:00
archshift
487c572429
Entity.h: Moved constants out of some unnamed enum
2014-07-29 19:14:56 -07:00
Tiger Wang
4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
Tiger Wang
cb77b39dc6
Detrailed whitespace
2014-07-29 16:36:24 +01:00
Tiger Wang
8811837aea
Merge branch 'master' into portals
...
Conflicts:
src/World.h
2014-07-29 15:27:19 +01:00
Mattes D
0814a977f8
Merge pull request #1236 from Howaner/Inventory2
...
Fix item durability.
2014-07-27 21:39:39 +02:00
Howaner
a5cca16abe
Add "Broadcasting" settings to world.ini
2014-07-27 00:39:39 +02:00
Howaner
ba36e79bc5
Merge branch 'master' into Inventory2
...
Conflicts:
src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
archshift
16e0beb5b6
SplashPotionEntity: Use const cItem &
instead of a cItem
2014-07-26 03:55:40 -07:00
archshift
60d4a16514
Fixed indentations, removed redundant init code in SplashPotionEntity.cpp
2014-07-26 03:48:16 -07:00
archshift
0298d34406
Moved potion static functions to EntityEffect to create splash potions through world
2014-07-26 03:48:16 -07:00
archshift
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
Tiger Wang
1156914dd6
Suggestions
2014-07-23 21:12:59 +01:00
Howaner
396739cc0f
Fix item durability.
...
Fixes #1181
2014-07-23 16:32:09 +02:00
Tiger Wang
a28b0dc120
Speed improvements, crash fixes, & self-suggestions
2014-07-22 17:26:48 +01:00
Tiger Wang
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
Tiger Wang
8050a5b98a
Suggestions
2014-07-21 22:49:06 +01:00
madmaxoft
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
Mattes D
b41bd2da5c
Merge pull request #1213 from mc-server/chat-color
...
Refactored cChatColor
2014-07-20 20:36:08 +02:00
Tiger Wang
ba24f50e5e
Line tracer invalid chunk fix
...
* Fixes #1230
* Additionally improved speed in some scenarios
2014-07-20 13:39:14 +01:00
Tiger Wang
6ab9afd0fd
Bug and crash fixes
...
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
2014-07-20 10:46:45 +01:00
archshift
726312602d
Added m_TicksAlive to entities, allows projectiles to hit their creators
2014-07-20 01:43:07 -07:00
archshift
9e155c6add
Added destroy-timer system to splash potion entities
2014-07-20 01:38:36 -07:00
archshift
d5b163bd3d
Removed references to deprecated cChatColor::Color
2014-07-19 11:12:34 -07:00
madmaxoft
08748bafe2
Code style: Fixed braces on separate lines.
2014-07-19 15:23:40 +02:00
madmaxoft
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
Mattes D
4293db5eae
Merge pull request #1214 from mc-server/anti-glob
...
CMake - Explicitly lists all source files
2014-07-19 14:29:22 +02:00
Mattes D
c2aa7d78bf
Merge pull request #1223 from mc-server/fixes
...
Fixed small issues throughout the codebase
2014-07-19 13:31:35 +02:00
archshift
7c861f98a2
Minecart: slimmed down SpawnOn by keeping subtype in the payload enum
2014-07-19 02:55:36 -07:00
archshift
f5bcfdc58c
Splash potions: Renamed PotionParticleType to PotionColor for clarity
2014-07-19 02:51:39 -07:00
archshift
93c6520e1e
Fixed splash potion color on toss
2014-07-19 02:46:31 -07:00
archshift
041bfd5860
Fixed clamping issues
2014-07-19 01:40:29 -07:00
archshift
725d1fd1e2
Subdirs: Only add_library if not using MSVC
2014-07-18 17:41:43 -07:00
archshift
1d8e3e2bb8
Entities/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
madmaxoft
44a4a83292
Merge branch 'Entities'
2014-07-18 23:21:04 +02:00
Tiger Wang
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
Tiger Wang
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
archshift
ffe44c13d0
Moved ChatColor.h out of defines where it was not needed
2014-07-17 23:25:14 -07:00
archshift
bc94ad4b5a
Fixed NULL being passed instead of a double to AddEntityEffect
2014-07-17 14:34:58 -07:00
madmaxoft
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
madmaxoft
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
archshift
488ecb6912
Player.cpp: Fixed compile error
2014-07-17 14:08:54 -07:00
archshift
5c0789e15e
Player.cpp: Added Wither death message
2014-07-17 14:08:21 -07:00
madmaxoft
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
Howaner
52d4c49d5c
Fixed many slime bugs.
...
- Fixed slime hurt/death sound
- Added slime spawning on death.
- Fixed the max health.
- Fixed the attack damage.
- Little slimes should not attack players.
2014-07-17 22:32:23 +02:00
madmaxoft
7a9f9ab744
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-07-17 22:23:08 +02:00
madmaxoft
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
Tiger Wang
3dd9649665
Fixed mob knockback
...
* Fixes #901
2014-07-17 14:32:52 +01:00
madmaxoft
70f304a96b
Fixed 3 MSVC warnings in SplashPotionEntity.
2014-07-17 11:07:33 +02:00