marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,515 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

6515 Commits (3d59e77f487cda0b2b5aa06d99c66d78aa79a516)
 

Author SHA1 Message Date
Sven Eberhardt 3d59e77f48 Do object post-load actions after global prop list denumeration. (#1240) 
Post-load would access the action proplist which might have a non-denumerated prototype.
 2015-01-21 23:18:07 +01:00
Maikel de Vries 4311ea9aac no FoW for Overcast and Thunderous Skies 2015-01-20 19:35:05 +01:00
Maikel de Vries 4e9f054ca5 don't incinerate clonk with fire arrow when blocked by shield 2015-01-19 21:29:38 +01:00
Pyrit 576922dd5e Fix holes in landscapes that used the Granite-rock entry before. 
Added Granite-granite with index 42 to the TEXMAP.TXT
 2015-01-19 20:03:11 +01:00
Maikel de Vries 237a88ce41 fix typo which makes docs compile again 2015-01-19 16:02:00 +01:00
Nicolas Hake bc7fcf5daa OpenAL <1.15: check some additional include directories 
OpenAL's pkg-config database doesn't list include/AL as a location for
AL headers, but including <AL/al.h> is unusable because some systems
store the headers in OpenAL instead of AL. So check if the file can
actually be found as <al.h> and amend the include directory list
otherwise.
 2015-01-19 13:39:18 +01:00
Nicolas Hake 9759f72b89 Downgrade requirements to Ubuntu Precise (12.04LTS) 2015-01-19 12:26:42 +01:00
Nicolas Hake 2ef2c637a7 Remove several instances of disabled legacy code 2015-01-18 22:59:45 +01:00
Nicolas Hake fef96eca9c Replace C4Surface::ppTex by a vector 
This should improve cache coherency by having all surface tiles adjacent
instead of strewn across the heap. This will also remove an indirection
in the common case of only using one tile.
 2015-01-18 22:59:44 +01:00
Nicolas Hake 57044a9eeb Move STATUS_ASSERTION_FAILURE definition to where it's actually needed 2015-01-18 21:55:16 +01:00
Nicolas Hake 4060991124 CMake: Add support for Boost 1.57.0 
For some reason, even the most recent (as of this writing) CMake 3.1.0
doesn't know about Boost 1.57.0, which was released two months before
CMake. Add it to the known version list.
 2015-01-18 20:50:33 +01:00
Nicolas Hake ee62586013 CMake: Fallback to the system FindFreetype if pkg-config fails 
Instead of shipping our own copy of FindFreetype.cmake, use the system
one if pkg-config is not available or can't find FreeType.
 2015-01-18 20:50:32 +01:00
Nicolas Hake 2b2d70d02a CMake: Update for 3.1 compatibility 
CMake 3.1's if() by default now interprets quoted variable names as
strings. This is a good idea from a strictness perspective, so make it
do this even if we're in 2.8.9 compatibility mode.
 2015-01-18 20:50:31 +01:00
Nicolas Hake fad70eb204 Increase required CMake version to 2.8.9 
Debian Wheezy is shipping 2.8.9, and nobody is testing older versions
anyway.
 2015-01-18 20:50:30 +01:00
Sven Eberhardt 9ac3bd6c1b Some new weapons for DarkCastle enemies. 2015-01-18 19:21:48 +01:00
Sven Eberhardt 3286095755 AI can use grenade launcher. 2015-01-18 19:13:10 +01:00
Sven Eberhardt 282b937a60 Fix null pointer when coniferous burns down. 2015-01-18 15:20:25 +01:00
Sven Eberhardt 4c4d4233bf Fix non-free BaseRespawn on neutral flagpoles. 
It would try to buy clonks from player -1, which never worked.
 2015-01-18 15:19:46 +01:00
Sven Eberhardt caec5939b0 Fix right-click buying when many items are available. 2015-01-18 15:18:39 +01:00
Sven Eberhardt 7e45475cbe Scenario saving: Concatenate multiple equal calls to CreateContents. 2015-01-18 14:28:10 +01:00
Sven Eberhardt c5af9bc7f2 Fix bomb arrow name. 2015-01-18 13:45:28 +01:00
Maikel de Vries 26aca1abe2 make the lava chunk a small light source 2015-01-18 12:50:53 +01:00
Maikel de Vries 8b5a1f7e18 fix AI test scenario 2015-01-18 12:47:00 +01:00
Sven Eberhardt 763f9de0ec Fix player knowledge in DeepSeaMining (#1239) 
The section is switched when the first player joins, so the second player will initialize from the Scenario.txt of the intro section.
 2015-01-17 23:10:55 +01:00
Sven Eberhardt f815d7ea6c Fix EditCursor selection and deselection callbacks when duplicating objects. 2015-01-17 22:53:21 +01:00
Sven Eberhardt 6fac0f0567 Clip AI guard range to landscape size. 2015-01-17 22:39:09 +01:00
Sven Eberhardt 4d1d869760 Add editor commands to clonks to enable enemy AI. 2015-01-17 22:36:19 +01:00
Sven Eberhardt f69872c401 AI guard range can be adjusted via drag+drop in editor. 
Just select the clonk and move the corner markers.
 2015-01-17 21:22:29 +01:00
Sven Eberhardt 7c19f0e0c3 Elevator adjusts case and rope position when moved in editor. 2015-01-17 21:21:27 +01:00
Sven Eberhardt 2cde706611 Object movement in editor respects Def->HorizontalFix and attachment procedure. 
When moving attached objects, it will now move the attachment target along with the object. This makes moving elevator cases and wind generators a lot easier.
 2015-01-17 21:19:56 +01:00
Sven Eberhardt cf9aca70fe Add callback EditCursorMoved. 2015-01-17 20:53:45 +01:00
Sven Eberhardt c00d8c7a4d Add next_selection parameter to EditCursorDeselection. 
If an object is deselected due to a new object selection, that newly selected object is passed as next_selection.
 2015-01-17 20:37:54 +01:00
Sven Eberhardt 49c5b22591 Remove some empty graphics files. 2015-01-17 18:22:06 +01:00
Sven Eberhardt f0cbe45afb Remove mention of "fire monsters" from docs. 
Since, sadly, we don't have those :(
 2015-01-17 18:10:56 +01:00
Sven Eberhardt 8dddbe5a10 Allow definitions without graphics. 2015-01-17 18:10:21 +01:00
Sven Eberhardt d33dfd6c55 Scenario Saving: Select between CreateObject/CreateObjectAbove and fix some unnecessery property saving issues. 
* CreateObject for goals/rules/environment, rotated, contained and earth objects
* Allow properties to overwrite default behavior of CreateObject vs CreateObjectAbove
* Random initialization of seaweed phase instead of saving it
* Do not save color of ColorByOwner objects that have their owner color
* Fix block spacing between objects of same type if objects of different type occur inbetween but are not saved
 2015-01-17 17:00:58 +01:00
David Dormagen 7e7bbf17fa fixed additive blitting of particles (#1213) 
This was accidentally removed by ck in 526b97c60c
 2015-01-17 11:13:08 +01:00
Pyrit 742390fe92 Change default granite texture from rock to granite. 2015-01-16 01:03:11 +01:00
Pyrit e2f50324ee Add normal maps to landscape materials. 2015-01-16 01:02:21 +01:00
Sven Eberhardt 6e99843fec Add editor helper functions to open and close stone doors and connect spin wheels. 2015-01-15 22:06:05 +01:00
Armin Burgmeier 166b5de519 Fix mape build 2015-01-15 14:42:22 -05:00
Nicolas Hake df7d19c7c5 Improve C4Landscape const correctness 2015-01-15 19:13:36 +01:00
Nicolas Hake f943866d36 Remove unused and unimplemented C4Landscape::FindMatPathPull 
The function has been stubbed since we imported the code from CR.
 2015-01-15 19:13:33 +01:00
Maikel de Vries e993b0725e lorry ejects contents on destuction from explosion 2015-01-15 18:34:35 +01:00
Maikel de Vries 75cb5ce800 more tests for exploding containers 2015-01-15 18:31:23 +01:00
Maikel de Vries 91cd68d641 improve explosions propagating inside containers 
This fixes the double damage done to containers and iterates through all parent containers until one is found which contains the blast
 2015-01-15 17:46:54 +01:00
Maikel de Vries a0faaf9082 add Test scenario for explosions in containers 2015-01-15 17:46:54 +01:00
Maikel de Vries 615b26b453 RemoveObject(true) first tries to put contents into parent container before exiting them 2015-01-15 17:46:54 +01:00
Maikel de Vries 4ea0cb0ca6 make ContainBlast a property instead of DefCore entry 2015-01-15 17:46:53 +01:00
Nicolas Hake aa6b1384a7 Fix build with C4NET2IO_DUMP_LEVEL > 1 
Instead of using the preprocessor to filter out debugging code, we might
want to make more use of the optimizer's DCE. That way, renaming and
moving a function or variable won't immediately break a rarely tested
configuration.
 2015-01-15 16:33:20 +01:00