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

6667 Commits (issue1247)
 

Author SHA1 Message Date
Maikel de Vries febf1234a9 always register power need in producer library even if zero 2015-02-04 10:35:15 +01:00
Maikel de Vries f9f790cbd6 fixed callbacks from the power library to producers and consumers 2015-02-04 10:35:15 +01:00
Maikel de Vries 86a7728650 add new power test for power producing pumps 2015-02-04 10:35:15 +01:00
Maikel de Vries fbe937b3e4 improve sawmill tree collection speed 2015-02-04 10:35:15 +01:00
Maikel de Vries eec38a9f17 reimplement power network handling by the flag library 2015-02-04 10:35:14 +01:00
Maikel de Vries ac5f9dbce7 correctly implement handling of steady power producers 2015-02-04 10:35:14 +01:00
Maikel de Vries 2d00588dff new power system (work in progress) 2015-02-04 10:35:14 +01:00
Sven Eberhardt a237caa467 Save config to disk at round end (#1260) 
This should ensure that MissionAccess gained in this round is always saved even if a crash happens during scenario shutdown or in a following round.
 2015-02-03 22:49:55 +01:00
Sven Eberhardt a9ba6a3eb3 Gyro name change due to copyright considerations. 
Also commit missing dialogue file.
 2015-02-03 21:18:01 +01:00
Sven Eberhardt d7b9027a32 Add another NPC to crash landing. 
Gyro talks about catapult usage. Dialogue by Pyrit.
 2015-02-03 20:39:17 +01:00
Sven Eberhardt c714e5e3b2 Fix full map screenshots (#1220). 
Fixed upperboard, borders when screenshotting while at the side of the map and issues when multiple viewports were open.
 2015-02-03 01:00:16 +01:00
Maikel de Vries 041532505b reduce lag when night by removing gamma change 
The cool effect is then gone, but it has to be replaced anyways by shader effects.
 2015-01-29 18:04:46 +01:00
Sven Eberhardt 7eab59df4f Crash Landing: Minor landscape rework. (#1138) 
It's the second mission so it's supposed to be easy. But the huge firestone reservoir just beside the bottom granite were just inviting to blast through there.

Also removed some brick areas to make the pumping path less forced. You can now also reroute the lava lake into your starting caves if you want (although this is quite dangerous because you need a lot of space and you're screwed if it fails).
 2015-01-28 23:05:19 +01:00
Sven Eberhardt eda637a108 Fix deep script recursion when lots of stacked dynamite boxes explode. (#1252) 2015-01-28 22:51:22 +01:00
Sven Eberhardt 86b2dbb2ca Document light material property. 2015-01-28 22:37:59 +01:00
Sven Eberhardt 7b8ffd79a4 Make Lava/DuroLava emit ambient light as a material property. (#1205) 2015-01-28 22:35:14 +01:00
Nicolas Hake c087a88977 Fall back to COMPILE_DEFINITIONS_DEBUG for old CMake 
Debian Stable still ships 2.8.9, so for the time being we want to
support that version.
 2015-01-27 17:58:31 +01:00
Maikel de Vries 314680ae04 more materials for Chine scenario 
This is needed for a succesful completion of this round through various strategies
 2015-01-26 20:48:53 +01:00
Maikel de Vries d2214de19f rockfall spawns away from crew members 2015-01-26 20:38:50 +01:00
Maikel de Vries c92a5b5652 make dynamite box explode in lava 2015-01-26 18:50:47 +01:00
Sven Eberhardt e717dd0dab Fix MSVC build. 2015-01-26 18:46:41 +01:00
Günther Brammer 4f9bc068ad Merge #include cleanup and SDL-mainloop fix 2015-01-25 20:47:50 +01:00
Günther Brammer 36ce941e4d cmake: Restore SDL-Mainloop build 2015-01-25 19:05:06 +01:00
Günther Brammer 5bcedb5bbf Remove some redundant #includes 2015-01-25 18:53:48 +01:00
Günther Brammer a92c22a7b3 Merge various build system fixes and cleanups 2015-01-25 18:50:29 +01:00
Sven Eberhardt b00ff573cd Fix leaked light and some possible dead pointers on game end and section switch. 2015-01-25 18:39:34 +01:00
Sven Eberhardt 1c4444d5fc Fix memory leaks on definitions without or with invalid bitmap graphics. 2015-01-25 18:24:27 +01:00
Sven Eberhardt 8f866cceee Fix assertion on landscape changes outside landscape rectangle (#1232) 2015-01-25 18:23:43 +01:00
Sven Eberhardt 089b4794a8 Fix a few warnings in Win64 build. 2015-01-25 16:43:51 +01:00
Sven Eberhardt e1a09298d4 Fix a few harmless warnings. 2015-01-25 16:16:06 +01:00
Sven Eberhardt 5e365e5236 Remove deprecated evaluation of CNMT rule in engine. 2015-01-25 14:35:18 +01:00
Sven Eberhardt 6be3796e33 Do DigOutObject callback when digging out new objects from material. 
It was already done when blasting free and when digging out existing objects, but the case of digging out new materials was still missing. This helps collect firestones when digging in firestone material.
 2015-01-25 14:19:39 +01:00
Nicolas Hake 185c82fd1c Enable cross-compilation to Darwin/Mac OS X 
This set of changes make it possible to do a cross build targeting Mac
OS X 10.9 ("Mavericks") from a Linux host. Tools required for a build
(in addition to the standard build toolchain, obviously): otool,
install_name_tool, c4group.

Since CMake does not (yet?) support passing environment variables to
custom build commands, you should make sure to have the
INSTALL_NAME_TOOL and OTOOL variables set to reasonable values during
the entire build. Additionally, if you have not unpacked your OS X SDK
directly into the root directory (you probably shouldn't), you need to
set the SYSROOT environment variable to the root of the SDK (the
directory containing the "System" directory). Setting up a CMake
toolchain file is left as an exercise to the reader.
 2015-01-25 01:23:20 +01:00
Nicolas Hake 2e1bdd742f OSX: Bundle libraries even when not compiling with XCode 
We have half-arsed support for building Darwin executables with Unix
tools instead of XCode. Make it slightly more whole-arsed.
 2015-01-24 23:28:33 +01:00
Nicolas Hake c1a1938b83 OSX: Stop pretending to support 10.6 and i386 
OpenClonk doesn't actually support anything older than 10.8 "Mountain
Lion", so let's not pretend to support 32 bit builds and 10.6.
 2015-01-23 23:52:46 +01:00
Nicolas Hake d44d7ba33e OSX: Use /bin/bash to pack game data 
Since the script is using bashisms, a posixly correct /bin/sh isn't
sufficient. Explicitly use /bin/bash instead.
 2015-01-23 19:22:04 +01:00
Nicolas Hake a7548cfa12 Get CMake to use tools from a native build when cross-compiling 2015-01-23 19:20:55 +01:00
Nicolas Hake d994b893ba OSX: Fix capitalization of several imports and includes 2015-01-23 18:24:31 +01:00
Nicolas Hake 53ff6da5ef Remove some OSX-specific hacks from the main CMakeLists 2015-01-23 17:15:56 +01:00
Nicolas Hake f4e95ea85c Use find_package for finding libbz2 instead of hard-coding the path 2015-01-23 17:11:23 +01:00
Sven Eberhardt c5415aa330 DarkCastle: Fix cannoneer grabbing cannon in intro. (#1248) 2015-01-22 20:44:01 +01:00
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