1
0
Commit Graph

74 Commits

Author SHA1 Message Date
Tiger Wang
198ac1892c Fixed pickups 2013-09-18 22:20:08 +01:00
Tiger Wang
9711fd7970 Fixed friction for entities
Due to a misplaced else, other entities weren't getting friction
2013-09-16 19:19:25 +01:00
Matyas Dolak
7e0f56ccce Attempt at fixing linux crash on player login.
Ref.: http://forum.mc-server.org/showthread.php?tid=1244
2013-09-16 15:23:16 +02:00
madmaxoft
5cde7d8a29 Merge branch 'pickups' of git://github.com/tigerw/MCServer into tigerw-pickups
Conflicts:
	source/BlockID.cpp
	source/Entities/Entity.cpp
2013-09-15 20:49:08 +02:00
Tiger Wang
11bbfbc98a Added break 2013-09-15 12:15:27 +01:00
Tiger Wang
47119b3027 Even better pickup physics 2013-09-13 19:54:50 +01:00
Tiger Wang
22b8f3a2e0 Even more fixes [SEE DESC]
* Fixed minecarts breaking completely due to stuff
* Rails are now non solid again
+ Added IsRail inline bool
- Removed Herobrine
2013-09-12 23:57:02 +01:00
Tiger Wang
a39564a46a Fixed water speed issues 2013-09-12 23:31:26 +01:00
Tiger Wang
8163ca9549 Implemented xoft's suggestions again 2013-09-12 10:25:13 +01:00
Tiger Wang
a1d5d25525 Implemented xoft's suggestions
I totally didn't copy this from the fire simulator...

(I did, but I changed it quite a bit :P)
2013-09-11 22:10:29 +01:00
Mattes D
85804d085d Merge pull request #159 from tigerw/bugfix
Multiple fixes and features
2013-09-11 12:19:39 -07:00
Tiger Wang
3a1def2c90 More changes [SEE DESC]
* Improved (again) pumpkin direction handling
* Fixed spacing in Entity.cpp
2013-09-11 20:07:51 +01:00
Tiger Wang
e9321bc715 Better player gamemode detection 2013-09-11 18:56:03 +01:00
Tiger Wang
277b26b4c2 Fixed two bugs 2013-09-11 18:51:27 +01:00
Tiger Wang
cb167f78e3 Added player void damage 2013-09-10 23:02:35 +01:00
Tiger Wang
c8f8597774 Added void damage 2013-09-10 23:01:02 +01:00
Tiger Wang
010bc94a34 Entities now maintain speed outside of world 2013-09-10 22:51:07 +01:00
Tiger Wang
57c17a02db A few Minecart fixes
* Removed unneeded flatrail setpos
* Fixed health checking
2013-09-09 18:55:42 +01:00
madmaxoft
5945166a98 Merge branch 'boats' of git://github.com/tigerw/MCServer. 2013-09-09 11:13:14 +02:00
madmaxoft
db6cfefadd Removed the "charging bow" debug message. 2013-09-08 22:43:21 +02:00
Tiger Wang
50e24fb75f Fixed a bunch of stuff
* Fixed compilation
* Made it less obvious I COPIED ALL THE CODE from Minecarts
* Fixed alignment spaces to make xoft happy
2013-09-08 16:56:16 +01:00
Tiger Wang
c789a8ddf5 Initial boat support
+ Boats are saved
+ Boats have physics
+ Boats spawn
2013-09-08 00:14:57 +01:00
Tiger Wang
35efe9c727 Fixed formatting and removed gravity thing 2013-09-07 21:42:33 +01:00
madmaxoft
d31142811d Merged branch 'Projectiles'. 2013-09-07 22:06:30 +02:00
madmaxoft
d1b68f6150 Added a (disabled) block logging to projectile path-tracing. 2013-09-07 21:56:22 +02:00
madmaxoft
7938f18c57 Implemented loading more projectiles from MCA. 2013-09-07 21:26:17 +02:00
madmaxoft
06b01af017 Implemented ghast fireball and firecharge projectiles 2013-09-07 18:53:14 +02:00
madmaxoft
3b1c83acf8 Renamed cWorld::DoExplosiontAt() to cWorld::DoExplosionAt() 2013-09-07 18:12:22 +02:00
madmaxoft
3f4718154b Arrows have proper yaw and pitch when shot, and stop when they hit a block. 2013-09-07 17:14:37 +02:00
madmaxoft
f300ed54e5 Implemented SteerVehicle packet. 2013-09-06 16:50:21 +01:00
madmaxoft
67e8f75318 Implemented SteerVehicle packet. 2013-09-06 00:04:49 +02:00
Tiger Wang
178b5884fc Further physics improvements [SEE DESC]
This was mainly focused on pickups, but it works for other things too.

* Entities no longer clip through blocks positive-vertically (this fixes
pickup issues as well).
* Entities lie flat against a block when they hit it.
* Reduced entity (mainly pickup) block clipping in non vertical
directions.
2013-09-05 21:41:47 +01:00
Tiger Wang
ad89a0d460 Pickups spawn with correct speed and position
Added a comment-space as well.
2013-09-04 18:26:00 +01:00
Tiger Wang
6059c44dcb Players toss a little further 2013-09-04 18:15:20 +01:00
Tiger Wang
fd35f6d707 Pickups are a little less jittery
They also spawn closer to player mouth.
2013-09-04 18:13:46 +01:00
Tiger Wang
3300cfe491 Added better push out of entities 2013-09-04 17:52:15 +01:00
Tiger Wang
9c22cf1520 Fixed inconsistent meta naming 2013-09-03 12:33:54 +01:00
madmaxoft
4c24781a62 Added cEntity's gravity to the Lua API. 2013-09-03 10:20:56 +02:00
madmaxoft
2c5e566fe7 Implemented exact block hit position.
Arrows now stick out of blocks at the exact position where they hit.
2013-09-03 09:41:31 +02:00
madmaxoft
f7d5894427 Added cArrowEntity's criticalness to the API. 2013-09-03 08:39:35 +02:00
madmaxoft
3a921955d9 Arrows deal damage based on their speed. 2013-09-03 08:37:15 +02:00
madmaxoft
e8b77ea2f5 Projectiles slow down in water and lava. 2013-09-02 21:56:55 +02:00
madmaxoft
7433b3723c Projectiles don't collide with their creators. 2013-09-02 21:40:56 +02:00
Tiger Wang
20b64e18e4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	source/Bindings.cpp
	source/Entities/Entity.cpp

Updated from upsteam
2013-09-02 14:15:28 +01:00
Tiger Wang
b5c63d8fc5 Minecart enhancements [SEE DESC]
Curved rails.
Better physics.
Better code as improved by xoft.
Stuff.
2013-09-02 12:01:49 +01:00
madmaxoft
a884fbb919 Arrows deal damage.
Still needs some tweaks, they hit the shooter most of the time.
2013-09-01 22:40:35 +02:00
madmaxoft
42ea85786a Thrown ender pearls now teleport and hurt. 2013-08-30 23:48:03 +02:00
madmaxoft
d7a5287000 Basic support for thrown items - eggs, snowballs and ender pearls.
They can be thrown, but they don't do anything on impact. Also they don't save to nor load from  MCA.
2013-08-30 18:10:58 +02:00
madmaxoft
88f3fe7f00 Moved throw pos and speed calculation from cProjectileEntity into cPlayer. 2013-08-30 17:29:46 +02:00
madmaxoft
c28ccdc9d5 Merged in the Projectiles branch.
Although the projectiles are not yet finished, the branch has several bugfixes that are needed in master as well.
2013-08-30 14:32:07 +02:00