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 |
|
Alexander Harkness
|
61b68bd519
|
Merge pull request #788 from worktycho/warnings
Fixed some warnings
|
2014-03-10 17:44:08 +00:00 |
|
madmaxoft
|
0b9763fc5a
|
Fixed MSVC2008 compilation.
|
2014-03-10 07:55:47 +01: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
|
1985a9c33e
|
Merge pull request #731 from mc-server/ballisticmissiles
Ballistic firework missiles
|
2014-03-09 21:43:15 +00:00 |
|
worktycho
|
2eaae82a2a
|
Mentiod that we use some c++11 exstensions
Eg override, abstract, va_copy, long long.
|
2014-03-09 18:57:43 +00:00 |
|
Tiger Wang
|
3aff0b44bc
|
Fixed #778 - stack overflow.com
|
2014-03-09 17:51:02 +00:00 |
|
madmaxoft
|
5c4c147e48
|
Silenced useless MSVC warnings in cMetaRotater.
|
2014-03-09 17:58:01 +01:00 |
|
madmaxoft
|
b8cd0b0897
|
Hotfix for MSVC compilation.
|
2014-03-09 17:48:17 +01:00 |
|
Tiger Wang
|
77787fb719
|
!= FACE_NONE
|
2014-03-09 14:55:47 +00:00 |
|
Mattes D
|
d3c38c40e4
|
Merge pull request #777 from jfhumann/issue317
Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
|
2014-03-09 15:13:27 +01:00 |
|
Mattes D
|
8a715db41f
|
Merge pull request #775 from worktycho/warnings
Fixed a few warnings
|
2014-03-09 15:04:12 +01:00 |
|
Tiger Wang
|
c2978a3457
|
Merge branch 'master' into ballisticmissiles
Conflicts:
src/ClientHandle.cpp
|
2014-03-09 12:53:50 +00:00 |
|
Tiger Wang
|
76bf7ad813
|
Hexified colours
|
2014-03-09 12:49:00 +00:00 |
|
Tiger Wang
|
a2fb28dd08
|
Fixed data length issues
|
2014-03-09 12:48:59 +00:00 |
|
Tiger Wang
|
124fc8bc66
|
Demonstrated issues with GetDataLength()
|
2014-03-09 12:48:58 +00:00 |
|
Tiger Wang
|
d5180ef230
|
Added extra dye rules to crafting.txt
|
2014-03-09 12:48:56 +00:00 |
|
Tiger Wang
|
8f134adb6d
|
Improved formatting of username tabcomplete
|
2014-03-09 12:48:55 +00:00 |
|
Tiger Wang
|
217aaca699
|
Moved firework handler to separate function
* Also simplified and improved readability of code
|
2014-03-09 12:48:53 +00:00 |
|
Tiger Wang
|
c05a1db88d
|
CheckBlockInteractionsRate() fixed & enabled
|
2014-03-09 12:48:52 +00:00 |
|
Tiger Wang
|
e2cbebe522
|
Fix Linux compile
|
2014-03-09 12:48:49 +00:00 |
|
Tycho
|
4cb0b82d1d
|
Fixed some warnings
|
2014-03-09 05:05:37 -07:00 |
|
Tycho
|
14c2f620d1
|
FIxed int in test
|
2014-03-09 04:43:22 -07:00 |
|
Jan-Fabian Humann
|
f74ee8fb51
|
Adjusted style of switch/case
|
2014-03-09 10:55:06 +01:00 |
|
Tiger Wang
|
d872f2e41d
|
Updated Core
|
2014-03-09 01:49:32 +00:00 |
|
Tiger Wang
|
8d2ebf8e19
|
Slight plugin messaging changes
- Clients are not allowed to register duplicate channels
- Clients are not allowed to use channels that were not registered
|
2014-03-09 00:36:02 +00:00 |
|
Mattes D
|
17f27d1750
|
Added switch case indent notice
|
2014-03-08 21:14:59 +01:00 |
|
Tycho
|
6b530bde75
|
Added static
|
2014-03-08 11:53:37 -08:00 |
|
Tycho
|
a6ed75c1fb
|
Added tons more asserts to bytebuffer
|
2014-03-08 11:18:51 -08:00 |
|
Tycho
|
27fa2b72ba
|
Enabled self test of bytebuffer
|
2014-03-08 11:05:37 -08:00 |
|
Jan-Fabian Humann
|
72f9c8b069
|
Changed if-else to switch-case
|
2014-03-08 19:26:32 +01:00 |
|
Mattes D
|
3a6499b192
|
Merge pull request #729 from worktycho/MetaRotate
Alternitive solution to #503
|
2014-03-08 18:27:24 +01:00 |
|
Jan-Fabian Humann
|
66970fe943
|
Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.
|
2014-03-08 17:55:53 +01:00 |
|
Tycho
|
307fad0f25
|
Fixed issues with int vs size_t and a few other warnings
|
2014-03-08 08:33:38 -08:00 |
|
Tycho
|
9b47366d03
|
Actually Fixed ByteBuffer
|
2014-03-08 07:36:52 -08:00 |
|
worktycho
|
10a973abbc
|
Disable -Werror on this branch
|
2014-03-08 15:21:09 +00:00 |
|
Tycho
|
c3758112cc
|
Merge branch 'master' into warnings
|
2014-03-08 07:13:45 -08:00 |
|
worktycho
|
16ebbca35b
|
Moved returns
|
2014-03-08 14:23:00 +00:00 |
|
Alexander Harkness
|
4638d8f5e2
|
Merge pull request #770 from xdot/master
cBlockInfo-related changes from #723
|
2014-03-08 11:44:16 +00:00 |
|
Howaner
|
60091bcba3
|
Change tnt documentation to ticks
|
2014-03-08 12:31:20 +01: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 |
|
andrew
|
6679641b9e
|
cBlockInfo-related changes from #723
|
2014-03-08 12:53:15 +02:00 |
|
Howaner
|
baeff21a5b
|
Add new tnt documentation
|
2014-03-08 10:29:57 +01:00 |
|
Howaner
|
f5e374be41
|
Add TNT Save/Load and add Netbeans projects to .gitignore
|
2014-03-08 10:25:46 +01:00 |
|
Mattes D
|
ae84cdf242
|
Merge pull request #764 from xdot/master
Fixed water/lava interaction
|
2014-03-07 21:33:22 +01:00 |
|
madmaxoft
|
ffdf5f2022
|
Fixed cBlockArea schematic string saving signature.
|
2014-03-07 21:28:52 +01:00 |
|
Tycho
|
21e85b0745
|
Warnings
|
2014-03-07 11:15:04 -08:00 |
|