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

6796 Commits (03b049b0cabc9634024676563f061d371d8859fd)
 

Author SHA1 Message Date
Maikel de Vries 03b049b0ca add cause_plr to OnShockWaveHit callback 
This can be used to damage and kill tracing for objects which die, receive damage or are destroyed on shockwaves.
 2015-05-16 21:16:01 +02:00
Armin 035e1fc808 Docs: Correct DoEnergy() and AddCommand() examples (#1305) 
Signed-off-by: Maikel de Vries <mdt.maikel@gmail.com>
 2015-05-14 12:42:23 +02:00
Maikel de Vries 8a297766b3 fix pump power consumption (#1309) 2015-05-13 21:18:15 +02:00
Maikel de Vries 87079c7aa0 make cabin invincible in Crash.ocs for goal checking 2015-05-13 15:52:23 +02:00
Maikel de Vries 0157e7b496 remove obsolete BuildTurnTo defcore entry 2015-05-11 21:47:55 +02:00
Nicolas Hake a405dcdf4c StdCompilerINIRead: Maintain line break cache for error msgs (#1310) 
Deserializing proplists tries to read a boolean variable from the
representation in order to be backwards compatible to old (<6.0)
savegames. Newer savegames do not write this boolean, so StdCompiler
(correctly) throws an exception. This exception uses line numbers, which
StdCompiler used to obtain by scanning through the entire buffer. Having
to scan through the entire buffer for every serialized proplist is
ridiculously slow (and the data isn't used anyway in this instance).
Since line information is still valuable outside of proplist
deserialization, replace the repeated SGetLine calls with an on-demand
cache.
This reduces load times of a 14 MB Game.txt from slightly over 3 minutes
to 7 seconds on my computer.
 2015-05-10 20:52:35 +02:00
Maikel de Vries d3b38b3bbd option to choose goal in scorched gardens 2015-05-10 19:41:44 +02:00
Nicolas Hake 0fe248692e Fix mismatched mape function stub 
21500a8 changed a function prototype inside C4Landscape but neglected to
change the mape stub to match. Fix this so the build stops failing.
 2015-05-09 22:14:40 +02:00
Sven Eberhardt 7db849a804 Remove duplicate crashed plane skin from Treasure Hunt mission. 
Already defined in decoration folder.
 2015-05-07 20:29:51 +02:00
Sven Eberhardt 067c4d4e57 Light up target door on remote control by switch (#1296). 2015-05-07 20:26:16 +02:00
Sven Eberhardt 341712eba5 Remove dialogue when target NPC dies (#1295). 2015-05-07 19:54:14 +02:00
Sven Eberhardt 21500a81a9 Fix pump to clear the last row of pixels (#1057) and allow pumping from pump without source pipe. 
ExtractMaterial has been changed to be able to slurp in from the most distant horizontal position rather than the closest to the extraction top center.

Also speed up ExtractMaterial for the common case of no required horizontal shifts.
 2015-05-01 18:13:41 +02:00
Sven Eberhardt 00b0a6f52d Add Find_InArray to docs for FindObject(s) and ObjectCount. 2015-04-28 21:14:24 +02:00
Sven Eberhardt 116a5b4ae6 Add Find_InArray (#1073). 2015-04-28 18:59:50 +02:00
Sven Eberhardt 976ed549b6 Change C4FO and C4SO constants to be increasing regularly. 
Regular values allows compilers to use jump table optimizations for switch statements and I don't see any upsides of the previous values.
 2015-04-28 18:29:27 +02:00
Sven Eberhardt 38131aae74 Allow CNAT_* constants in VertexCNAT definition of DefCore (#1307) 
Also fix decompiling of none-values in bitfields.
 2015-04-28 00:18:32 +02:00
Martin Plicht c82adb7853 C4DrawGLMac: Put OSX 10.9 API usage into #ifdef block 2015-04-27 22:13:15 +02:00
Nicolas Hake 5c9d687d67 Merge pull request #6 from mistydemeo/mac_timer 
StdSchedulerMac: don't call setTolerance:
 2015-04-26 21:31:41 +02:00
Misty De Meo 5768410a83 StdSchedulerMac: don't call setTolerance: 
respondsToSelector isn't properly guarding against calling this method
on unsupported platforms, possibly because it existed as a private
method in OS X before 10.9. For example, attempting to build this on
OS X 10.8 fails with the error:
no visible @interface for 'NSTimer' declares the selector 'setTolerance:'

Since the default tolerance is 0 anyway, this can be removed without
adverse effect.
 2015-04-26 12:08:02 -07:00
Sven Eberhardt dfd9431e8d HotIce alternate map added. 
Also converted old map to Map.c and fixed some spawning issues.
 2015-04-17 16:57:32 +02:00
Armin d03271ec6e SetCommand Jump uses flight control and fix ObjectComJump() 
Signed-off-by: Maikel de Vries <mdt.maikel@gmail.com>
 2015-04-11 12:03:39 +02:00
Maikel de Vries 73ebce9f9a remove celestial environment object in favor of scenario callback 2015-04-08 20:18:24 +02:00
Maikel de Vries fdb007bfb4 clean up moon and star objects 2015-04-08 20:18:24 +02:00
Maikel de Vries f4324664e7 use ambient brightness for time of day 2015-04-08 20:18:24 +02:00
Maikel de Vries 6ae279d7ac improve moving objects out of basement on completion 2015-04-08 20:15:23 +02:00
Maikel de Vries f3de7d4b06 construction site: sign in front and transparency for non-mesh structures 2015-04-07 23:21:57 +02:00
Maikel de Vries 71df13b803 fix attachment of basement to tall structures 2015-04-07 19:04:21 +02:00
Maikel de Vries 58c1220a19 fix scenario saving of basements 2015-04-07 18:54:29 +02:00
Armin Burgmeier cd80784140 Save ambient brightness value in savegames 2015-04-06 20:48:59 -04:00
Maikel de Vries 518125fc32 no overpowered weapons on dark mine respawn 2015-04-05 18:11:44 +02:00
Maikel de Vries 7d2386b7f6 add missing descriptions for chest and gold idol 2015-04-05 17:53:12 +02:00
Maikel de Vries 9bfe95f88e fix Dark Mine relaunch description 2015-04-05 12:01:01 +02:00
Maikel de Vries 9394909cfb fine-tune windbag force on clonk and objects 2015-04-04 17:15:57 +02:00
Maikel de Vries 3c17ebdc02 make windbag burst more gradual and slightly depend on mass (#1297) 2015-04-03 12:21:28 +02:00
Maikel de Vries 70d75a7bca remove big conifers from skylands to prevent large forests 2015-04-02 21:39:19 +02:00
Maikel de Vries 9e2ccdb8b6 prohibit creation of more plants than seed amount in seed area 2015-04-02 19:46:33 +02:00
Maikel de Vries 3a4c3c1d26 five new goal graphics thanks to Foaly 2015-04-02 19:07:49 +02:00
Maikel de Vries 147624f9f5 increase wallkit thickness to make clonks not go stuck 2015-04-02 18:42:42 +02:00
Maikel de Vries 69963e104f fix loam bridge construction y offset by one 2015-04-01 18:45:24 +02:00
Nicolas Hake 7381ef7df0 gl: Enable shader logging if DebugOpenGL is active 2015-03-31 17:57:59 +02:00
Nicolas Hake 5f46161433 Remove unused clone of C4PathFinder 
Why the hell is there a second implementation of C4PathFinder around? It
wasn't even used anywhere.
 2015-03-31 17:57:58 +02:00
Nicolas Hake 2338bead11 Move C4PathFinderRay from header into implementation 
C4PathFinder is the only consumer of C4PathFinderRay, so we don't need
to declare it in the public header.
 2015-03-31 17:57:56 +02:00
Nicolas Hake 874a9f2632 Pathfinder: Use callback functors instead of raw function ptrs 2015-03-31 17:21:52 +02:00
Nicolas Hake 22a838a0f3 Don't use formatting log function for fixed string (#1293) 2015-03-28 15:10:35 +01:00
hasufell 5f29846b7d Fix USE_SYSTEM_TINYXML 
* fix the if-conditional
* don't use pkgconfig (there is no .pc file upstream)

Signed-off-by: Julius Michaelis <caesar@hg.openclonk.org>
(Added license to FindTinyXML.cmake)
 2015-03-28 22:58:53 +09:00
Maikel de Vries fce2bce58e clonks do not attempt to scale underwater (#1176) 2015-03-26 19:52:26 +01:00
Maikel de Vries 9c60cf0949 fix vertex changing when swimming (#1176) 2015-03-26 19:52:25 +01:00
Nicolas Hake d951827f17 Particles: Don't force vertex buffer workaround on Win32 
Win32 now uses a single rendering context, so it's no longer necessary
to disable VBA use in the editor.
 2015-03-26 15:51:03 +01:00
Nicolas Hake c58e474f76 win32/GL: Reuse the same rendering context for everything 
Some resources can't be shared across different rendering contexts while
others can. Additionally, the standard GLEW library does not support
multiple rendering contexts (that's what GLEX MX is for), even though it
might work on some (or even most) cards. WGL supports reuse of a
rendering context across multiple windows as long as the pixel formats
are the same.
 2015-03-26 15:51:01 +01:00
Nicolas Hake b2f742f997 gl: Check glew for GL_KHR_debug support 
Debian wheezy's glew doesn't support GL_KHR_debug yet, so make sure
we're only using it if we can.
 2015-03-25 23:15:45 +01:00