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

6540 Commits (a92c22a7b301a0716045b0b583c554c82bcf49ea)
 

Author SHA1 Message Date
Maikel de Vries 6ae4e71e6e Rank -> Branch, rename and Place() functionality 2015-01-07 00:04:44 +01:00
Maikel de Vries 2d741dfb70 fixed mixed up variables in Loc_Wall() 2015-01-07 00:04:44 +01:00
Maikel de Vries 6f3518d733 fixed lights in Rock Bottom 2015-01-07 00:04:44 +01:00
Maikel de Vries a3bb831b33 add torch to basic knowledge for all worlds 2015-01-07 00:04:44 +01:00
Armin Burgmeier 9580c46056 Fix assertion failure when definition to append/include does not exist 2015-01-06 19:33:33 +01:00
Mark af3efead76 Fix reloading of skeletons (#1180) 2015-01-06 18:35:16 +01:00
Mark 10b343dba9 Append and include skeletons (#1180) 
Appending and including skeletons works now. Documentation updated.
Skins such as appendto.Clonk.Farmer.skeleton are handled as if the skin name were not included: appendto.Clonk.skeleton

This also changes a bit the structure of how meshes are reloaded in general,
in particular mesh materials are only reloaded once and not once per
C4DefGraphics instance. (Fix crash on reload with included skeletons, cherry picked from commit 2f69aa4850ab7a4b621e5f30cbc537d40f32c0df)

Fix linking of C4Script standalone tool (cherry picked from commit b03a332b73463b378c94e4e92b66d45b923b3b9c)
 2015-01-06 18:25:08 +01:00
Mark fc402c18ab Central skeleton loader (#1180) 
C4DefList now creates one StdMeshSkeletonLoader and stores all skeletons in this loader. Before this change every definition created its own loader.
 2015-01-06 18:24:30 +01:00
Armin Burgmeier dffed48b3d Fix crash on ambient map update outside landscape bounds (#1216) 2015-01-06 11:47:25 +01:00
Mark b5560dff25 Documentation for C4V_Def (#1215) 2015-01-06 00:19:51 +01:00
Maikel de Vries ab52803a4f Rock Bottom: add more weapons and clean up script 2015-01-05 20:31:46 +01:00
Maikel de Vries 8f6c8ae141 Cool Cavern: add torch 2015-01-05 19:55:39 +01:00
Maikel de Vries c92fb8b2fe Shiver Peak: add torch and fix chest placement 2015-01-05 19:54:19 +01:00
Martin Plicht b9c68f2208 mac: Fix build (C4Viewport ViewX/Y accessors) 2015-01-05 01:38:35 +01:00
Tobias Zwick 7e570c05b4 improve the smoke trail and fireworks with the new particle system a bit 2015-01-04 22:09:02 +01:00
Tobias Zwick 6cf5ba325a use true/false instead of 0/1 as return for a FnSetViewOffset 2015-01-04 22:09:01 +01:00
Tobias Zwick 53defbc6f9 document ShakeViewport and change remaining references to SetPlrViewRange to SetLightRange 2015-01-04 22:09:01 +01:00
Armin Burgmeier d4ac1d0694 Fix possible crash after a mesh has been reloaded 2015-01-04 18:29:44 +01:00
Armin Burgmeier 039e03824a Fix buffer underflow in GetExtension() 2015-01-04 18:29:36 +01:00
Sven Eberhardt 9092a42c65 Added missing Maze.ocs/ParameterDefs.txt file. 2015-01-04 15:56:28 +01:00
Sven Eberhardt 89c3f79398 Maze (Heart of the Mountain) parameters for map size and coop/race mode added. 
Medium (default) size is a bit smaller than the previous default, because the map got a lot harder due to fog anyway.

Also removed superfluous Landscape.txt.
 2015-01-04 15:55:23 +01:00
Sven Eberhardt c2d9e1b46e Change MouseAutoScroll default to off for now. 2015-01-04 15:49:11 +01:00
Sven Eberhardt cce2eaa389 Fix emergency mode of MapLayer->FindPosition() finding positions outside search rect. 2015-01-04 15:43:51 +01:00
Armin Burgmeier 1c68526440 Remove unused function C4DrawGL::EnsureAnyContext() 2015-01-04 13:36:29 +01:00
Maikel de Vries d610be43b6 new scenario: Dark Mine, a melee using the lights system 2015-01-04 13:29:13 +01:00
Maikel de Vries 6c4db47f43 added torch with basic functionality 2015-01-04 13:29:13 +01:00
Sven Eberhardt 2696dd04a2 HotIce weapons reworked and fog of war disabled. 
All chests now contain the same stuff, including bomb and fire arrows. Also gave a wind bag to everyone from the start.

With the wind bag, you can hop between islands and usually reach the chests early. This should add more action to the scenario and prevent stalemates due to people not being able to get to each other.
 2015-01-04 12:23:32 +01:00
Armin Burgmeier 338910949d Fix build with GTK+ 2015-01-04 12:13:48 +01:00
Maikel de Vries 32754c8a4e add bomb arrow 2015-01-04 09:18:40 +01:00
Maikel de Vries 8e54a567c4 add fire arrow 2015-01-04 09:17:59 +01:00
Maikel de Vries 629b4ee3d2 clean up arrow script and reduce its mass 2015-01-04 09:16:43 +01:00
Tobias Zwick 0993b3e2a2 change shake strength by distance calculation the same as for audibility 2015-01-03 23:25:28 +01:00
Sven Eberhardt 42b9ca4577 Add custom EditCursorCommands available in editor context menu. 
Example: this.EditCursorCommands = ["Explode(20)"] on an item will offer a menu entry to explode the object. Commands may be either strings or function pointers, but function pointers will always be called by name.
 2015-01-03 23:21:36 +01:00
Tobias Zwick 5e188aafb3 Fix setting small ViewOffsets. Refactor neighbouring code, enable a slight MouseAutoScroll by default 
* make ViewX,ViewY,ViewOffsetX and Y private, add getters and setters that update variables that are dependent on these
 2015-01-03 22:53:02 +01:00
Tobias Zwick b64d379579 tweak fadeoff of the shake effect 2015-01-03 22:53:01 +01:00
Tobias Zwick 659a697cf2 fix ShakeViewport effect, especially for explosions 
* The shake effect used to have a target object, which made it vanish as soon as it is removed (and on Explode, it is immediately). So, the shake was never visible. The shake effect is now global and manages all shakes currently on the landscape
* Additionally, if there are several explosions that cause a shake, they were not added up correctly
 2015-01-03 22:53:01 +01:00
Günther Brammer 86842da9bd Remove implementation details from C4SoundSystem.h 
This eliminates the need to include Audio toolkit headers from there.
 2015-01-03 22:01:08 +01:00
Günther Brammer 69f8ca27ec Move C4ApplicationSec1Timer to StdScheduler.h 
There is nothing "Application" specific about this class.
 2015-01-03 21:06:25 +01:00
Günther Brammer a0bddb92a3 Use size_t for a loop variable that is compared with a sizeof() result 
src/script/C4Script.cpp:159:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  for (long i = 0; i < sizeof(values) / sizeof(*values); ++i) \
                     ^
 2015-01-03 20:58:07 +01:00
Günther Brammer d9e3d9db3d Require filenames to be in unicode, remove iconv usage 
Every modern operating system and Clonk uses UTF-8, and windows uses UTF-16
and has its own conversion code.
 2015-01-03 20:41:03 +01:00
Günther Brammer 11844a87dd cmake: Re-enable debugging code in debug builds 
Partially reverts cf474e99aa.

Cmake starting to whine about usage of a deprecated feature is no excuse
for regressions. The cmake warning even explained how to do this!
 2015-01-03 20:40:50 +01:00
Sven Eberhardt ec7540e404 Fix ICONV build 2015-01-03 19:06:19 +01:00
Sven Eberhardt fed6f8d65f Fix Linux/Mac build. 2015-01-03 19:03:18 +01:00
Sven Eberhardt 98093961ec Add packet logging option. 
This should reduce log spam in network games.
 2015-01-03 18:15:41 +01:00
Sven Eberhardt 49f991c819 Move shader logging into separate file and log only in editor mode (#1209) 2015-01-03 17:53:59 +01:00
Armin Burgmeier 1e77de1044 Merge branch 'lights' 
Conflicts:
	src/c4group/C4Components.h
 2015-01-03 16:00:20 +01:00
Sven Eberhardt 59fe944e15 Make light effect static. 
Otherwise, it would fall down [Maikel].
 2015-01-03 13:03:52 +01:00
Sven Eberhardt f25edc64df Do not render lights of hostile objects on player-owned viewports. 2015-01-02 01:42:24 +01:00
Tobias Zwick f5ecd4776d new function SetLightRange (replaces SetPlrViewRange) 2015-01-02 01:06:00 +01:00
Günther Brammer 70cca346ec cmake: Simplify special handling of the -std=gnu++0x flag 2015-01-01 22:13:57 +01:00