Tycho Bickerstaff
bbdb34252e
fixed a few remaining issues with worldstorage
2014-01-02 17:37:34 +00:00
Mattes D
d3dc12815b
Merge pull request #479 from mc-server/cmake-win
...
Cmake-win
2014-01-02 09:16:11 -08:00
madmaxoft
15dddc7701
More memory alignment fixes.
...
Ref.: #420 .
2014-01-02 18:08:38 +01:00
madmaxoft
c510683d2a
Fixed unaligned memory access in FastNBT.
...
This should fix #420 .
2014-01-02 17:33:18 +01:00
Tycho Bickerstaff
042b72bc17
rewrote queue not to use promises for waits
2014-01-02 12:32:55 +00:00
Tycho Bickerstaff
7694a0788c
Merge branch 'master' into threadsafequeue
...
Conflicts:
src/OSSupport/Queue.h
2013-12-31 16:32:08 +00:00
Tycho Bickerstaff
c52a46a5e3
merged changes from upstream
2013-12-31 16:24:53 +00:00
madmaxoft
d4e29a0d18
Merge branch 'FishingHook'
2014-01-01 15:31:57 +01:00
STRWarrior
db00a36ff8
OnPlayerFishing doesn't have a const cItems anymore
2014-01-01 15:09:53 +01:00
andrew
852c52bee9
Fixed GetPhysicalRAMUsage on Linux
2014-01-01 11:18:56 +02:00
Tycho Bickerstaff
098ed91a48
fogot to add promise classes
2013-12-31 16:13:13 +00:00
Tycho Bickerstaff
512d1b9ebe
clean up code for patching
2013-12-31 15:58:21 +00:00
Tycho Bickerstaff
18fb814c34
Merge branch 'master' into threadsafequeue
2013-12-31 15:53:17 +00:00
Tycho Bickerstaff
173ed0e653
Merge branch 'master' into cmake-fixes
2013-12-31 15:52:51 +00:00
Tycho Bickerstaff
f3736b1eb7
refactored chunk Queue to seperate class
2013-12-31 15:48:57 +00:00
STRWarrior
020a8b457d
implemented the recommendations Xoft gave.
2013-12-31 14:53:10 +01:00
Tycho Bickerstaff
c3e34ee81a
removed unneccisary cast
2013-12-31 09:16:44 +01:00
Tycho Bickerstaff
1957f982bc
fixed warnings in LineBlockTracer.cpp
2013-12-31 09:16:44 +01:00
Tycho Bickerstaff
8e7e990cfe
fixed warnings in LightingThread.cpp
2013-12-31 09:16:43 +01:00
Tycho Bickerstaff
3da41de553
take Z axis into account when calculating neighboors in LightingThread::ChunkReady
2013-12-31 09:16:43 +01:00
Tycho Bickerstaff
2e1588820d
fixed warnings in World.cpp
2013-12-31 09:16:42 +01:00
Tycho Bickerstaff
2e113c63f9
fixxed warnings in Server.cpp
2013-12-31 09:16:42 +01:00
Tycho Bickerstaff
3152c72959
fixed warnings in Inventory.cpp
2013-12-31 09:16:42 +01:00
Tycho Bickerstaff
c83dfdb66e
fixed warnings in bytebuffer.cpp
2013-12-31 09:16:41 +01:00
Tycho Bickerstaff
e41dec458c
fixed ClientHandle warnings
2013-12-31 09:16:41 +01:00
Tycho Bickerstaff
9ebc623a0a
fixed warnings in webadmin.cpp
2013-12-31 09:16:41 +01:00
Tycho Bickerstaff
25d42c44d5
fixed warnings in BlockArea.cpp
2013-12-31 09:16:40 +01:00
Morgan Redshaw
782818ffb5
Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure.
2013-12-30 21:30:20 -07:00
STRWarrior
cd435ffca9
Implented OnPlayerFishing and OnPlayerFished.
2013-12-30 22:56:08 +01:00
madmaxoft
ee15d4e08e
Fixed compilation in VC2008.
...
Also removed an unused inline header file (yuck).
2013-12-30 17:41:59 +01:00
madmaxoft
a1211bcdff
Added support for out-of-source builds.
2013-12-28 14:42:11 +01:00
madmaxoft
90213d324a
Merge branch 'master' into cmake-win
2013-12-27 11:53:12 +01:00
madmaxoft
1cf6502be2
Made cmake compilation possible on Windows.
2013-12-27 11:51:08 +01:00
Tiger Wang
f1142af455
Server now handles death messages
2013-12-26 14:55:19 +00:00
Mattes D
ac0c024e31
Merge pull request #472 from mc-server/Extreme_Hills_M
...
Extreme hills
2013-12-26 06:20:31 -08:00
madmaxoft
2560fb40c6
Added proper precompiled headers for MSVC.
2013-12-26 14:54:46 +01:00
STRWarrior
6884d4235e
Simplefied Extreme Hills M pattern select.
2013-12-26 14:37:48 +01:00
madmaxoft
5689c00131
cBlockArea: Fixed writing full-height areas.
2013-12-26 10:59:01 +01:00
Mattes D
e0e01d0615
Merge pull request #461 from mc-server/repeaters
...
Repeaters, pressure plates, and others
2013-12-25 23:57:02 -08:00
Tiger Wang
d0572e73a0
Moved increment operator to back of variables
2013-12-26 00:12:06 +00:00
STRWarrior
b767fd784c
Extreme Hills M biomes now generate gravel, stone and grass patterns.
2013-12-25 23:18:33 +01:00
STRWarrior
e282eb73c8
Changed tbGravel. Vanilla has 3 layers of gravel and then stone.
2013-12-25 23:05:22 +01:00
STRWarrior
caf3b6d70c
Normal extreme hills (plus) now generate a stone/grass pattern.
2013-12-25 22:43:26 +01:00
STRWarrior
2f59a93f2a
Re-added empty line.
2013-12-25 22:10:27 +01:00
STRWarrior
59b80c84fa
This generates gravel in Extreme Hills M biomes.
2013-12-25 22:08:41 +01:00
Mattes D
abbb82d442
Merge pull request #471 from mc-server/Fishing_Catapult
...
You are now able to sweep mobs to your position using fishing rods.
2013-12-25 11:48:26 -08:00
madmaxoft
77aaa5c367
Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer
2013-12-25 19:50:18 +01:00
madmaxoft
c2befd9777
Fixed block area height check.
...
The block area couldn't be read up to chunk height.
2013-12-25 19:39:07 +01:00
tonibm19
4cee3d8fe3
(Hopefully) fixed if conditions
2013-12-25 19:32:45 +01:00
STRWarrior
5eacf327b7
Fixed Parentheses.
2013-12-25 18:14:00 +01:00
STRWarrior
17a84111ce
You are now able to sweep mobs to your position using fishing rods.
2013-12-25 17:26:17 +01:00
Tiger Wang
548273c8f7
Preliminary mobile entity saving
...
* Fixes #252
* Alleviates #380
+ Adds mob saving
* Fixed some debug !ASSERTs
2013-12-25 16:07:52 +00:00
tonibm19
6b6b6e7498
Implemented xoft suggestion (partly)
...
I only get it working in first condition. It seems it's not compatible with else if...
2013-12-25 16:59:26 +01:00
Tiger Wang
1a02d94ed2
Fixed rails not updating with diagonals
2013-12-25 14:12:48 +00:00
Tiger Wang
40c2826a21
Braced up some code
2013-12-25 14:05:37 +00:00
Tiger Wang
508e505ace
Used IsGamemodeCreative() function
2013-12-24 23:47:04 +00:00
tonibm19
258bb45880
BLOCKTYPE...
2013-12-24 19:31:32 +01:00
tonibm19
96c94a79a7
Fixed compilation
2013-12-24 19:25:34 +01:00
tonibm19
e3f89400d8
Implemented xoft suggestion
2013-12-24 19:13:18 +01:00
tonibm19
276f7dae5c
Using BLOCKTYPE instead of int
2013-12-24 19:08:22 +01:00
tonibm19
59f8068cf4
Fixed comments
2013-12-24 18:41:49 +01:00
tonibm19
85fc1478fa
Changed a little how detection works and added comments.
2013-12-24 18:37:09 +01:00
tonibm19
c06388aa4a
Storing Y -1 and -2 blocks in a variable
2013-12-24 18:07:33 +01:00
Tiger Wang
9e5e415674
Merge pull request #469 from mc-server/Android_Update
...
Android update
2013-12-24 08:20:55 -08:00
Tiger Wang
ae6cb01e56
Fixed comments in main.cpp and Player.cpp
2013-12-24 15:16:30 +00:00
Tiger Wang
c6314e8935
Implemented stone and wooden pressure plates
2013-12-24 15:02:55 +00:00
Tiger Wang
89f87f66a5
Improved knockback animation
...
* Critical hits now actually increase damage
* Looking down at an entity and hitting them still produces upwards
motion (as per Vanilla experience)
* Reduced force to be more realistic
2013-12-24 15:02:35 +00:00
STRWarrior
b424877448
Fixed getting configure button going to port 0.
2013-12-24 14:44:24 +01:00
Alexander Harkness
200f37c41f
removed the function def also
2013-12-24 13:26:54 +00:00
Alexander Harkness
e1d3b201bd
Finally removed the function.
2013-12-24 13:25:58 +00:00
tonibm19
5e24577373
Using parenthesis
2013-12-24 12:35:40 +01:00
tonibm19
84bfffcc15
Fixed a possible crash
2013-12-24 12:23:20 +01:00
Alexander Harkness
8c91f7062a
fixed compile?
2013-12-24 10:36:06 +00:00
Alexander Harkness
af6389ea7a
finally removed them all?
2013-12-24 10:30:36 +00:00
Alexander Harkness
8674c6800f
updated another file...
2013-12-24 10:29:18 +00:00
Alexander Harkness
b397dc438b
Updated MakeColour's defenition in the header.
2013-12-24 10:24:08 +00:00
Alexander Harkness
085008ff8c
Update as per xoft's instructions.
2013-12-24 10:17:44 +00:00
Alexander Harkness
be79d12966
Update chat colours
...
@madmaxoft, is this right? fixes #467
2013-12-24 10:14:33 +00:00
madmaxoft
5bbe72bc90
Replaced esCreeper with esMonster.
...
Any monster will be able to explode, and also this fixes #425 .
2013-12-23 22:36:22 +01:00
Tiger Wang
1014c737a4
Improved player fall particle positions
2013-12-23 21:18:01 +00:00
Tiger Wang
76444470a4
Provides an enhancement to daylight sensors
2013-12-23 15:22:05 +00:00
tonibm19
99ade2fa12
Improved iron golem detection algorithm
...
- You need to make it like in vanilla
- Only used blocks are removed
2013-12-23 12:00:08 +01:00
Tiger Wang
9c796bf6b4
Clarified some code in Player.cpp
2013-12-23 09:51:41 +00:00
Tiger Wang
d8221854d2
Fixed a comment in Entity.cpp
2013-12-23 09:41:45 +00:00
Tiger Wang
003043f8ab
Added some comments in main.cpp
2013-12-23 09:41:34 +00:00
tonibm19
c6946fb8c4
Some fixes (SEE DESC)
...
-Added missing mobs (wither, enderdragon and iron golem) to type to string list.
-Wither and iron golem can now spawn
2013-12-23 10:32:49 +01:00
tonibm19
b95ee2d230
You can now spawn iron golems.
...
You can spawn them like in vanilla.
2013-12-23 10:26:45 +01:00
Tiger Wang
11fbfb458d
Daylight sensor sensing enhancement
2013-12-22 23:20:43 +00:00
Tycho Bickerstaff
d0cd9a2b36
added link dependency between WorldStorage and OSSupport
2013-12-22 22:52:21 +00:00
STRWarrior
5af74fe77c
Fixed bug where snowgolems could replace non-solid blocks to snow blocks.
2013-12-22 21:12:34 +01:00
Tiger Wang
48b388aa97
A fix for daylight sensors
2013-12-22 20:06:15 +00:00
Tiger Wang
b02a81678c
Implemented knockback and critical hit
2013-12-22 20:04:17 +00:00
Tiger Wang
43e8196309
Added many event catchers
...
* Window close
* CTRL-C
* etc.
2013-12-22 20:03:58 +00:00
Tiger Wang
945ba36d1b
Implemented fall particles
2013-12-22 20:03:09 +00:00
STRWarrior
5a9b26d322
Snow golems die in hot biomes and leave a snow trail.
2013-12-22 20:40:07 +01:00
STRWarrior
4115724736
You can spawn snow golems with snow blocks and pumpkins.
2013-12-22 20:15:56 +01:00
STRWarrior
488d7ddd7d
EnderDragons and SnowGolems are able to spawn.
2013-12-22 20:15:09 +01:00
STRWarrior
05c670dc50
Fixed cacus breaking when next to any non-air block.
2013-12-22 18:37:56 +01:00
Tycho Bickerstaff
75abce905d
fixed bad merge
2013-12-22 16:33:40 +00:00
Tycho Bickerstaff
10e5540f98
merged in more warning fixes
2013-12-22 16:25:02 +00:00
Tycho Bickerstaff
a295e0c342
merged in changes
2013-12-22 16:22:25 +00:00
Tycho Bickerstaff
09b9661fff
Merge branch 'master' into threadsafequeue
2013-12-22 16:14:34 +00:00
Tycho Bickerstaff
15a980a616
merged in warnings changes
2013-12-22 16:11:34 +00:00
Tycho Bickerstaff
a7a4b2886d
fixed accedental commit
2013-12-22 15:55:57 +00:00
Tycho Bickerstaff
a71299c46b
fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not
2013-12-22 15:41:01 +00:00
Tycho Bickerstaff
1a9d93665f
Merge remote-tracking branch 'upstream/master' into threadsafequeue
2013-12-22 15:21:34 +00:00
madmaxoft
248ba1ea9f
Added HOOK_PLUGINS_LOADED.
...
This fixes #482 .
2013-12-29 12:51:58 +01:00
Mattes D
d40ed86907
Merge pull request #481 from MikeHunsinger/master
...
Added function to create large birch tree images in birch forests
2013-12-29 00:04:08 -08:00
Mike Hunsinger
b93b4c4825
Added function to create Tall Birch tree in BirchTreeForest biomes
2013-12-28 23:49:51 -07:00
madmaxoft
725b997a28
Fixed a (valid) warning in RCONServer.
2013-12-28 22:00:01 +01:00
STRWarrior
318dc76fc9
Made the lure enchantment work.
2013-12-22 16:03:11 +01:00
madmaxoft
dfa81829fe
Fixed signedness warning in cItemGrid.
2013-12-22 15:45:45 +01:00
STRWarrior
5f18abaa27
Fixed compiler warning.
2013-12-22 15:30:47 +01:00
STRWarrior
8d51c22b36
Fishing underground is slower and fishing while raining is faster.
2013-12-22 15:22:50 +01:00
STRWarrior
caccf72b46
Fixed compiler warnings.
2013-12-22 14:54:07 +01:00
STRWarrior
9de847c9b1
Countdown time is between 100 and 900 ticks.
2013-12-22 14:51:19 +01:00
STRWarrior
7a299f1ba6
Fishing now uses a countdown instead of a random number each tick.
2013-12-22 14:48:22 +01:00
Tycho Bickerstaff
d724241407
converted commneted paramater names to the unused macro
2013-12-22 13:46:55 +00:00
STRWarrior
e9d1352f6e
Implented BroadcastParticleEffect
2013-12-22 14:45:25 +01:00
Tycho Bickerstaff
94ca07cfbf
Merge branch 'master' of github.com:mc-server/MCServer
2013-12-22 13:19:27 +00:00
Tiger Wang
acb5a36a6a
Daylight sensors
2013-12-22 00:33:22 +00:00
Tiger Wang
5b2ac381b6
Fixed them again, confound it
2013-12-22 00:30:21 +00:00
STRWarrior
c676216791
Using regular assignments.
2013-12-21 22:20:54 +01:00
STRWarrior
76ff71810a
Once again better Y direction for the items given when fishing.
2013-12-21 20:42:43 +01:00
STRWarrior
f244dbfb12
You are now able to get different items from fishing.
2013-12-21 19:58:52 +01:00
madmaxoft
abd1ca4fef
Bindings regen script updated.
...
The Bindings.cpp / .h files are no longer stored in the git repo.
2013-12-21 19:30:16 +01:00
STRWarrior
bd6574230a
Floater now dissapears when the player doesn't have an fishing rod equipped.
2013-12-21 17:31:05 +01:00
Tycho Bickerstaff
b3046a09e5
Chunk is now warnings clean
2013-12-21 15:58:21 +00:00
Tycho Bickerstaff
3289abde73
fixed hidden bug with furnaces ignoring time burnt
...
this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes
this did not cause a problem as this function was only called with the same value as the one
it was using for time burnt
2013-12-21 15:49:59 +00:00
Tycho Bickerstaff
9f41761e8e
Root is now warnings clean
2013-12-21 15:38:37 +00:00
Tycho Bickerstaff
5034ae29b8
Piston is now warnings clean
2013-12-21 15:08:01 +00:00
Tycho Bickerstaff
38f808ac3d
ChunkSender is now warnings clean
2013-12-21 15:00:31 +00:00
Tycho Bickerstaff
14d2085e35
basic threadsafe queue interface
2013-12-21 14:43:32 +00:00
Tycho Bickerstaff
b4fb8ace03
Merge branch 'cmake' of github.com:worktycho/MCServer into cmake
2013-12-21 13:33:09 +00:00
Tycho Bickerstaff
779aca6051
Merge branch 'master' into cmake
2013-12-21 13:32:40 +00:00
STRWarrior
128de10a2f
You could now only get fish from non-source blocks. Fixed it.
2013-12-21 14:11:21 +01:00
STRWarrior
3c73076be4
Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around.
2013-12-21 14:08:58 +01:00
STRWarrior
8efde94e4e
Fixed bug where you could get fish from non-source blocks.
2013-12-21 14:07:32 +01:00
Tiger Wang
432a28d935
Fixed repeaters delay, maybe
...
Also added basic daylight sensors, though because GetBlockSkylight
always is 15, it doesn't work.
2013-12-20 21:19:13 +00:00
STRWarrior
9c575681f8
Merge branch 'master' of https://github.com/mc-server/MCServer
2013-12-20 19:50:47 +01:00
STRWarrior
6afe6b7928
Increased the range an Floater can shoot to.
2013-12-20 19:49:30 +01:00
madmaxoft
f5e6124ee0
Fixed the rest of constructor reorders.
2013-12-20 19:10:15 +01:00
STRWarrior
61120686c6
Fish now actualy jumps to the player instead of a few block bellow them.
2013-12-20 18:35:13 +01:00
STRWarrior
af98fc6170
Fixed bug where the floater could pop in the water while you could already get a fish.
2013-12-20 18:34:08 +01:00
madmaxoft
8570d08eb4
More reordering fixes.
2013-12-20 17:11:51 +01:00
tycho
f739246e52
added precompiled headers
2013-12-20 16:05:12 +00:00
madmaxoft
fc97cb8c58
Fixed a typo in cBlockArea merging code.
2013-12-20 16:48:45 +01:00
madmaxoft
d6de11da07
Sorted a few constructors to remove warnings.
2013-12-20 16:39:20 +01:00
tycho
f6d5a788aa
fixed include of math on windows
2013-12-20 15:37:35 +00:00
Tycho Bickerstaff
32e6be002d
Merge branch 'master' into cmake
2013-12-20 15:33:04 +00:00
