madmaxoft
173fd0dd92
Merge branch 'howaner/GlobalFixes'.
2014-03-28 16:39:32 +01:00
madmaxoft
910e770a18
Fixed Prefab's rotations.
2014-03-28 16:36:33 +01:00
Howaner
a2c4def518
Add missing ChunkDesc import.
2014-03-28 14:59:40 +01:00
madmaxoft
7b585290fc
cPrefab can draw itself into a cChunkDesc.
2014-03-27 23:03:57 +01:00
madmaxoft
8c2c4f2463
Prefabs support connectors, rotations and merge strategy.
2014-03-26 22:01:01 +01:00
madmaxoft
37778e5f82
Added a basic cPrefab class.
...
Can be defined in the source by GalExport's cpp output.
2014-03-25 22:10:53 +01:00
madmaxoft
87e0bd54b4
BlockArea: Switched internal coords to Vector3i.
2014-03-25 21:59:41 +01:00
madmaxoft
c9163d39f7
Implemented faster upscaling using templates.
...
Fixes #819 .
2014-03-21 22:53:46 +01:00
Tycho
cd6ab5617c
Fixed xofts issues
2014-03-14 06:11:49 -07: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
a584b7b3bc
Fixed printf format compatabilty
2014-03-12 10:09:08 -07:00
Tycho
3caa4a38b9
Merge branch 'master' into Werror
...
Conflicts:
src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -07:00
madmaxoft
d545be9614
Fixed missing comment terminator.
2014-03-12 15:33:28 +01:00
Tycho
16b27c4b7a
Fixed a load of format string errors
2014-03-11 14:16:08 -07:00
Tycho
728870ed9d
Fixed Warnings in PieceGenerator
2014-03-11 12:35:44 -07:00
madmaxoft
26d7ed6612
Removed debugging output.
...
Kept it commented-out for later revisions, if needed.
2014-03-10 21:16:13 +01:00
madmaxoft
6c48075561
POCPieces: Added height.
...
Now the pieces connect in different heights, too, creating a true 3D maze.
2014-03-10 08:38:40 +01:00
madmaxoft
0e985293b5
A working POCPiece generator.
2014-03-09 22:04:29 +01:00
madmaxoft
1fdeabcf78
cPieceGenerator: New connectors are added to the free pool.
2014-03-09 19:30:38 +01:00
madmaxoft
b9190fc04e
PieceGenerator can connect two connectors of the same type.
...
Also added extensive debugging output and a test.
2014-03-09 15:24:12 +01:00
madmaxoft
e6305d29a5
Added the first skeleton code for PieceGenerator.
...
This is a WIP and won't work / isn't used at all.
2014-03-09 15:24:11 +01:00
Tycho
21e85b0745
Warnings
2014-03-07 11:15:04 -08:00
Mattes D
b17d04737d
Merge pull request #738 from xdot/master
...
Refactored global block property arrays
2014-03-02 16:13:43 +01:00
madmaxoft
2325a1a162
ChunkDesc warns about StructureGen's deprecation.
2014-03-01 20:59:41 +01:00
madmaxoft
2f85c9648b
Unified StructureGens and FinisherGens.
...
Now they are all Finishers. Fixes #398 .
2014-03-01 20:59:41 +01:00
andrew
d73cdba1f6
g_BlockXXX => cBlockInfo::XXX
2014-03-01 21:34:19 +02:00
Tiger Wang
f77720c43f
Merge pull request #669 from xdot/master
...
Implementation of in-game maps :D
2014-02-24 10:28:34 +00:00
andrew
f201f4f176
Thread safe cMap manager
2014-02-20 16:38:37 +02:00
Howaner
16f3809ded
Add BlockNewLeaves.h and rename Darkoac to Darkoak
2014-02-19 19:18:40 +01:00
Howaner
a5a52fe160
Add new Trees (without Generator)
2014-02-19 16:58:31 +01:00
Tiger Wang
c68bdaf34b
Fixed compile and some warnings in MSVS
2014-02-09 00:57:22 +00:00
Tycho
4b19247305
Fogot to save Biogen
2014-02-03 13:07:38 -08:00
Tycho
d9fb83300c
Fixed Compile errors
...
c++11 introduces scoped enums, so the code didn't fail in clang
2014-02-03 13:01:12 -08:00
Tycho
80807eec2c
Increased Type safety of Biomes
...
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
2014-02-03 12:26:17 -08:00
Tycho
fec17409d2
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/World.h
2014-01-31 15:31:05 -08:00
madmaxoft
66427d754b
Added cChunkDest::UpdateHeightmap()
...
This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator.
2014-01-31 16:01:15 +01:00
Tycho
bed2ee22e8
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockRail.h
src/World.h
2014-01-26 06:28:51 -08:00
Mattes D
f78a62a5e3
Merge pull request #575 from worktycho/GeneratingBenchmark
...
More Interfaces to decouple Generator from the rest of the code
2014-01-25 13:55:33 -08:00
Tycho
03b08456b6
dded dependecy on Blocks to Generator
2014-01-25 10:23:18 -08:00
Tiger Wang
314fc3cdac
Mob bugfixes
...
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
2014-01-25 14:42:26 +00:00
Tiger Wang
1112f5adc6
Fixed a generator bug
2014-01-24 23:56:19 +00:00
Tycho
16375f6aad
Merge branch 'master' into GeneratingBenchmark
...
this merge is necessary,
2014-01-20 09:21:47 -08:00
Tycho
bd4278aca1
Added Inifile and OSSupport Linking
2014-01-19 12:51:23 -08:00
madmaxoft
e68521deac
Alpha-sorted the finishers.
2014-01-18 17:03:43 +01:00
madmaxoft
896f1a26ec
Merged branch 'NetherFinish'.
2014-01-18 17:03:31 +01:00
STRWarrior
188cb1f6bc
Fixed errors.
2014-01-18 14:17:26 +01:00
STRWarrior
ca27f87272
Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's
2014-01-18 14:16:07 +01:00
STRWarrior
dd7c02bba9
Some tweaks.
...
Everything generates more often.
Fire can only spawn on ForeverBurning blocks.
2014-01-18 13:45:41 +01:00
STRWarrior
087d650aed
Fixed bug where only brown mushrooms would spawn.
2014-01-18 00:37:21 +01:00
