Tiger Wang
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
Tiger Wang
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
Tiger Wang
35b79e5d71
Portal improvements and suggestions
2014-06-10 20:43:27 +01:00
madmaxoft
366ecf9dfd
Fixed a race condition when adding a player to a world.
2014-06-10 18:25:53 +02:00
Mattes D
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
Mattes D
b904223b9d
Added queue for adding entities to cWorld.
...
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02:00
worktycho
43342540c8
Fixed Time of day
2014-06-06 23:54:24 +01:00
Tiger Wang
156c9851b8
Suggestions
2014-06-05 17:58:29 +01:00
Tiger Wang
ea49abd113
Time and weather is saved, part of #1058
...
Also fixed unreliability in Health and LootPickup loading.
2014-06-04 20:52:54 +01:00
Tiger Wang
ccbf6cc446
Configurable portals
2014-06-04 20:00:55 +01:00
Tiger Wang
86e5273cd1
Merge remote-tracking branch 'origin/master' into portals
2014-06-04 13:14:38 +01:00
Tiger Wang
8bff3e5af2
Implemented end and nether portals
2014-05-31 22:28:51 +01:00
Tiger Wang
365c6f50bd
Changed block send queue to use vectors
...
As suggested by @worktycho.
2014-05-29 11:57:06 +01:00
Tiger Wang
ee929793f0
Hopefully fixed piston duplication issues
...
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
Mattes D
dd350bc1f3
World pre-generation distance is settable in world.ini.
2014-05-09 18:32:04 +02:00
Mattes D
fb58ef55be
Fixed MSVC 64-bit build warnings.
2014-05-09 18:32:03 +02:00
archshift
2c0bb7b717
Moved the weather picker out of TickWeather(), squashing a warning and improving readability.
2014-04-25 16:55:38 -07:00
archshift
c124fc39d4
Removed impossible default case.
...
Squashed a warning.
2014-04-25 16:32:34 -07:00
archshift
083cec5a09
Removed extraneous switch{} in Start()
...
Squashed a warning.
2014-04-25 16:27:15 -07:00
archshift
62e5234535
Small changes; warning fixing.
2014-04-24 20:25:03 -07:00
Mattes D
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
jfhumann
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
jfhumann
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
Tiger Wang
200ea6254c
Fixed #904
2014-04-18 12:54:17 +01:00
Tiger Wang
82b3d543e7
Rewrote redstone powering to use power levels
2014-04-15 13:15:56 +01:00
Tiger Wang
b3f6afefe9
Simplified pickup speed randomisation
2014-04-12 13:14:35 +01:00
madmaxoft
22794e7208
Fixed double projectile spawning.
...
Two spawn packets were sent per projectile.
2014-04-05 22:26:10 +02:00
madmaxoft
9032ff96c7
Removed unused constants.
...
DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now.
2014-03-25 23:35:50 +01:00
madmaxoft
b1ad3322e5
Fixed code style after recent merge.
2014-03-20 09:28:29 +01:00
Tiger Wang
3e49cada80
Added braces
2014-03-19 23:07:58 +00:00
Tiger Wang
0524d70774
ENUMified shrapnel level
2014-03-19 23:06:39 +00:00
Tiger Wang
b8fe024f9d
Merge branch 'master' into awesometnt
...
Conflicts:
src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Tiger Wang
23ffaa19b7
Added levels of shrapnel
2014-03-18 20:45:10 +00:00
Tycho
8b83c1a653
Merge branch 'master' into warnings
2014-03-14 06:46:20 -07:00
madmaxoft
35fe96b07d
Fixed a warning.
2014-03-14 14:36:44 +01:00
Tycho
862e219443
Added additional macros to support the MSVC size_t format and changed all formats to use the macros
2014-03-12 10:34:50 -07:00
Tycho
d904e89712
Merge branch 'Werror' into warnings
...
Conflicts:
src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho
7e6ee7ef81
Fixed more Format issues
2014-03-11 14:43:14 -07:00
andrew
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
Tiger Wang
e672988577
Merge remote-tracking branch 'origin/master' into awesometnt
...
Conflicts:
src/Items/ItemLighter.h
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-03-10 18:59:11 +00:00
Tiger Wang
cc2d805238
Merge branch 'master' into awesometnt
2014-03-10 18:36:55 +00:00
Tiger Wang
462829e23d
Shrapnel now configurable
2014-03-10 18:35:02 +00:00
Tiger Wang
09c5542123
Merge pull request #768 from Howaner/BlockEntitys
...
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tiger Wang
8f134adb6d
Improved formatting of username tabcomplete
2014-03-09 12:48:55 +00:00
Howaner
527f358510
Merge branch 'master' into BlockEntitys
2014-03-08 12:29:45 +01:00
Howaner
b37966fd21
Change TNT Fuse to ticks
2014-03-08 12:24:33 +01:00
Mattes D
f72c747b50
Merge pull request #763 from Howaner/BlockEntitys
...
Add Flower Pots
2014-03-07 17:54:10 +01:00
Howaner
c2090c0d11
Add Lua Bindings for FlowerPotEntity.h and add documentation.
2014-03-07 11:44:16 +01:00
Howaner
787a71929c
Add Flower Pots
2014-03-07 01:30:34 +01:00