1
0
Commit Graph

6123 Commits

Author SHA1 Message Date
Howaner
e50423991e Add bow charging animation 2014-06-16 21:57:23 +02:00
Tycho
74cd730589 FIxed second weird enum 2014-06-16 18:06:09 +01:00
Tycho
6fa99a211e Refactored reversing logic into seperate function 2014-06-16 17:55:58 +01:00
worktycho
4fddbf9dfc Merge pull request #883 from mc-server/CutOffLighting
Lighting reads blocktypes only for blocks under heightmap.
2014-06-16 17:37:07 +01:00
madmaxoft
d379f27ea4 Fixed gcc compilation. 2014-06-16 16:51:30 +02:00
Tycho
3a7c0c8ce9 Fixed tigers weird enums 2014-06-16 15:29:49 +01:00
Tycho
d5c84b5fe6 Merge branch 'master' into redstonerefactor
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-06-16 15:22:02 +01:00
Tycho
6ee562caf3 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:13:10 +01:00
Tycho
ee50790398 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:12:50 +01:00
Tycho
aa3537112d Moved repeater handling to seperate pass 2014-06-16 15:07:41 +01:00
Tycho
84c83e0deb Fix a few warnings 2014-06-16 15:03:07 +01:00
Mattes D
24b0878af7 Merge pull request #1024 from worktycho/AllocationPool
First attempt at implementing an Allocation pool
2014-06-16 16:00:14 +02:00
Tycho
1e57161ecc Added override 2014-06-16 14:12:10 +01:00
madmaxoft
6b503b45a0 Fixed a copypasta error in WormNestCaves generator settings. 2014-06-16 14:53:33 +02:00
madmaxoft
c41299b4d4 Updated the SandFlatRoofVillage prefabs. 2014-06-16 10:18:44 +02:00
madmaxoft
d9719e696c Added random offsets to cGridStructGen.
Fixes #740.
2014-06-15 23:34:44 +02:00
Mattes D
a72ec6300d Merge pull request #1090 from mc-server/saveoncrash
Data is saved on crash
2014-06-15 23:16:37 +02:00
Tiger Wang
abbd11be6d Players are saved regularly
* Fixes #1076
2014-06-15 20:28:08 +01:00
Tiger Wang
f822a46bdb Fixed bad comparison crash
* Fixes #1095
2014-06-15 19:42:14 +01:00
Tiger Wang
2a6ca71a0b Fixed daylight sensor unpowering
* Fixes #1094
2014-06-15 16:27:20 +01:00
Tycho
8a2aa6cb16 Changed names of callbacks 2014-06-14 20:24:52 +01:00
Tycho
6ddcf42409 Removed spaces 2014-06-14 20:10:49 +01:00
Tycho
41e5a64ff8 Documented starvation callbacks 2014-06-14 20:07:17 +01:00
Tycho
2643a46c69 Documented cAllocationPool 2014-06-14 20:04:35 +01:00
Tycho
f97116141f Reformated ChunkMap.h 2014-06-14 19:56:01 +01:00
Tycho
3efbdb1c9b Moved m_Sections 2014-06-14 19:54:09 +01:00
Tycho
94c48febd2 Added generic Allocation Pool Interface 2014-06-14 19:46:34 +01:00
Tycho
a1520c7a40 reverted accedental android changes 2014-06-14 19:08:14 +01:00
Tycho
6b99e55646 fixed spaces 2014-06-14 19:05:02 +01:00
Tycho
0310a50192 fixed spaces 2014-06-14 18:43:36 +01:00
Tycho
a2df68b80b fixed compile 2014-06-14 18:19:34 +01:00
Tycho
f6af584efa fixed const issue 2014-06-14 18:11:43 +01:00
Tycho
bff76f201f Fill with buffer on startup 2014-06-14 17:59:47 +01:00
Mattes D
c684812b30 Merge pull request #1019 from mc-server/cPlayerSetSpeed
cPlayer set speed
2014-06-14 18:57:32 +02:00
Tycho
8bf37f3dd7 Fixed comments 2014-06-14 17:57:21 +01:00
Tycho
061102c778 Added logging 2014-06-14 17:23:57 +01:00
madmaxoft
493d364331 Removed an unused tolua_end and tolua_begin pair. 2014-06-14 18:23:27 +02:00
Tycho
039c1a75f3 merge master 2014-06-14 17:19:28 +01:00
madmaxoft
a89422ea4c Simplified speed clamping. 2014-06-14 18:16:10 +02:00
madmaxoft
3f009a7c9e Refactored speed-setting to use a common function for all cases. 2014-06-14 17:10:53 +02:00
Mattes D
c0bc4a9d3a Merge pull request #1093 from mc-server/BindingsFix
Fixed MSVC Bindings generation.
2014-06-14 17:03:06 +02:00
Mattes D
f1e3010839 Fixed bindings generation for Win64 builds.
Fixes #1092.
2014-06-14 15:47:37 +02:00
Mattes D
af981cc718 Fixed MSVC Bindings generation. 2014-06-14 15:00:57 +02:00
worktycho
d5a99d5b78 Remove windows bindings crutch 2014-06-14 13:48:12 +01:00
madmaxoft
f8f7748a09 Merge branch 'master' into cPlayerSetSpeed 2014-06-14 12:06:48 +02:00
Tiger Wang
c1deda5d8f Fixed a repeater issue
* Repeaters now properly continuously update their powering
* Minor cosmetic improvements
2014-06-14 10:47:10 +01:00
Tiger Wang
4b28a24514 Reduced cPluginManager code duplication 2014-06-14 09:51:42 +01:00
STRWarrior
b0f1707d50 Fixed ChunkWorx stop button giving an error 2014-06-13 23:16:52 +02:00
Mattes D
90e3e2b4e6 Merge pull request #1089 from mc-server/tolua-auto
automaticlly build tolua and generate bindings as part of build.
2014-06-13 16:32:34 +02:00
madmaxoft
f76420ac55 Removed an unused fwd declaration. 2014-06-13 09:38:25 +02:00