1
0
Fork 0
Commit Graph

151 Commits

Author SHA1 Message Date
Raekye 378528136c use DoSetSpeed in AddSpeed* in Entity.cpp 2015-02-25 20:56:45 -05:00
Mattes D e211aafaa4 Fixed type-conversion warnings. 2015-01-18 11:02:17 +01:00
Tycho 2a9664d6ca Initial convertion of a_Dt to std::chrono
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
2015-01-11 21:12:26 +00:00
Mattes D e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Mattes D 44644ae025 Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Tiger Wang a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Tycho a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Tycho 9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Chris Darnell 806871b86f A few compiler warning fixes 2014-09-22 18:23:56 -04: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
Chris Darnell 195b646aa4 Made it compile with clang 2014-09-22 03:22:36 -04: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
Howaner 92e7e5c615 Merge branch 'master' into 1.8-Protocol 2014-09-14 14:16:17 +02:00
Tiger Wang 52d86728e6 Entities experience water resistance 2014-09-13 22:49:05 +01:00
Howaner 69afc4dbba Merge branch 'master' into 1.8-Protocol
Conflicts:
	src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
Tiger Wang 4019847857 Fixed friction being applied whilst airborne
Reported by tonibm9 in #1300.
2014-09-12 20:50:24 +01:00
Howaner f94df06b66 Added the player list to the 1.8 protocol. 2014-09-09 03:02:25 +02:00
madmaxoft 1cc65b6264 Fixed style and alpha-sorting. 2014-09-03 10:29:10 +02:00
madmaxoft 8821c476bb Fixed previous commit's wrong assumptions.
The equipment-getting functions return a copy already, so we can't take a pointer, really.
2014-09-01 14:35:52 +02:00
madmaxoft 7d8a474f13 Fixed MSVC compilation, improved performance.
We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads.
2014-09-01 14:31:05 +02:00
Jaume Aloy 6180f7df09 Fixed style 2014-08-31 11:28:42 +02:00
Jaume Aloy 4900645b28 Added a_Digger check 2014-08-30 00:27:33 +02:00
Jaume Aloy 7d771953c0 More Enchantments
- Added Thorns and Respiration enchantments
2014-08-22 11:49:49 +02:00
Jaume Aloy 19d1c976e7 Protection Enchantments, some fixes
- Protection echantments (fire, blast, feather falling, protection and
projectile). It isn't finished, add secondary effects and optimize the
code.
- Removed some brackets.
- Silk touch fixed.
2014-08-21 12:08:38 +02:00
Jaume Aloy 5008eb8c83 Changed if in BlockHandler 2014-08-19 18:40:42 +02:00
Jaume Aloy 07350de514 Changed if for switch 2014-08-19 16:47:33 +02:00
Jaume Aloy 1897f678f9 Added more enchantments and some fixes
- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
2014-08-19 16:08:17 +02:00
Jaume Aloy d3fd63c9eb Added some Enchantments
- Bow enchantments: Infinity, Flame and Power
- Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite,
Sharpness
2014-08-19 12:38:15 +02:00
Howaner 0911072d27 Attempt to fix knockback and swimming. 2014-08-04 01:34:12 +02:00
archshift e461df0030 Entity.cpp: Air timer comment fix 2014-08-03 02:20:48 -07:00
archshift 9ecce2366e Code reduction and clarity fixes 2014-08-02 22:35:29 -07:00
archshift 7915c4ca7c Entity.cpp: On portal check, use if-else for current dimension
If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
2014-08-02 21:44:02 -07: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
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
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 041bfd5860 Fixed clamping issues 2014-07-19 01:40:29 -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
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
madmaxoft 5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00