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

5617 Commits (a51d429611dccca0284f5cb9154830905e0c23e2)
 

Author SHA1 Message Date
Tobias Zwick 67e00d8a98 reintroduce position parameter in (Can)InsertMaterial 2013-06-04 20:07:43 +02:00
Tobias Zwick b403bb6357 Merge branch 'master' into pumpfix 2013-06-04 18:46:04 +02:00
Tobias Zwick f6d64e46f8 fix querying InsertMaterial for bodies of water that stretch to the edge of the landscape 2013-06-02 17:59:13 +02:00
David Dormagen fec0870133 fixed a message of the pipe to use the correct string-table-entry 2013-05-31 22:35:16 +02:00
David Dormagen 81629cd691 the pump now behaves correctly in regards to the power usage 2013-05-31 22:34:17 +02:00
Martin Plicht 405453aed3 Merge branch 'debugrecoption' 2013-05-31 14:39:16 +02:00
Tobias Zwick c4c781631f Merge branch 'master' into pumpfix 2013-05-30 22:18:23 +02:00
Tobias Zwick 7eb0fee45d fix scancodes convert on windows for non-fullscreen 2013-05-30 22:15:30 +02:00
Tobias Zwick 43a3119bbf buildfix 2013-05-30 22:11:56 +02:00
Tobias Zwick 131ec86b98 refactor pump done. Remaining problem: power system (usage) 2013-05-30 22:11:39 +02:00
Tobias Zwick a6adc2465f fix scancodes convert on windows for non-fullscreen 2013-05-30 21:51:34 +02:00
Tobias Zwick c4a957a6b1 Merge branch 'master' into pumpstuff 
Conflicts:
	planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
 2013-05-28 22:47:37 +02:00
Sven Eberhardt c724ce2291 Fix DeadlyGrotto game goal 2013-05-28 13:07:12 +02:00
Tobias Zwick 855ba27d6f tried to refactor pump 2013-05-27 21:51:26 +02:00
Armin Burgmeier 695a9a88c3 Add TransformBone and SetAnimationBoneTransform script functions 2013-05-27 21:33:29 +02:00
Armin Burgmeier 90ee4d2380 Fix crash when an object whose mesh is attached to another mesh is removed 2013-05-27 15:55:18 +02:00
Matthias de75275f61 Changed pump to use mesh and script animations 2013-05-27 13:24:42 +02:00
Martin Plicht 71a5b48b63 Make Clonk loadable again 2013-05-26 18:29:26 +02:00
Tobias Zwick d3312cb3c5 convert some textures to jpg 2013-05-26 18:11:51 +02:00
Tobias Zwick 61ee6d393f Correct the scancode numbers for windows 
Also reduce the duplication of these numbers in C4Window.h and C4KeyboardInput.cpp.
 2013-05-26 18:07:09 +02:00
Günther Brammer 92a8ca5a79 Crop the background wallpapers instead of stretching them 2013-05-26 17:56:43 +02:00
Günther Brammer 030c249f87 Draw the paper dialog background separately from the background wallpaper 
Drop the paper in the player selection dialog entirely, use transparent
black instead. Adjust the widget sizes in the scenario selection dialog
slightly.
 2013-05-26 17:56:42 +02:00
Tobias Zwick 064166d09e make most sound effects mono 2013-05-26 17:42:37 +02:00
Tobias Zwick 8f752d1d9e clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
Clonkonaut d28959a161 Some fixes to the cable cars for possible future development. 2013-05-26 15:25:27 +02:00
David Dormagen de0b22ec1b removed ColorByOwner entry of the flag-marker to suppress warning 2013-05-26 15:21:16 +02:00
David Dormagen 4d7ff01c3b modified loom-material-script to not use unsupported options 2013-05-26 15:20:53 +02:00
Martin Plicht eb070c98a2 debugrecread/write: required_argument, optarg for Windows does not support optional_argument 2013-05-26 14:15:15 +02:00
Tobias Zwick d5e349ab10 stop and play icons 2013-05-26 13:10:44 +02:00
Martin Plicht 8b3390a5f4 No --debugrec option but --debugrec(write|read) with optional external file as argument. If not specified, record-internal debugrec file is used 2013-05-26 13:07:24 +02:00
Maikel de Vries fccebbb96f Updated libglew dependency in README.linux.txt 2013-05-26 10:03:30 +02:00
Martin Plicht a915cdb15f Make Eclipse happy by changing some zeros to nils and stuff 2013-05-26 00:01:08 +02:00
Martin Plicht eaf93d6a0e Also check for DebugRec flag in #ifdef DEBUGREC_* blocks 2013-05-25 23:01:41 +02:00
Martin Plicht 524fe879aa Make DEBUGREC define a commandline option 2013-05-25 22:51:32 +02:00
Tobias Zwick d1be5d109c adjust gamma calculation of time 2013-05-25 22:26:41 +02:00
Pyrit 6b8b386658 Added SetGamma() to the time object, so that the whole game gets dark at night, not just the sky. 
Signed-off-by: Tobias Zwick <newton@westnordost.de>
 2013-05-25 20:55:20 +02:00
Tobias Zwick c01391725a convert some highres title.pngs to jpegs 2013-05-25 20:48:15 +02:00
Tobias Zwick 003e29f223 enable loading Title.jpg for scenario (folders) 2013-05-25 20:48:14 +02:00
Martin Plicht 928ecc1892 mac: Lazy cmake fix 2013-05-25 20:11:21 +02:00
Martin Plicht 251ef5169c DEBUGREC compile fix 2013-05-25 19:06:01 +02:00
Günther Brammer 74eda19838 Round C4Fixed towards positive infinity instead of away from zero 
The movement code relies on itofix(a + 1) == itofix(a) + 1, which requires
always rounding in the same direction. Since negative numbers are rounded
less often (Objects rarely are outside the landscape), change the behavior
for them.
 2013-05-25 18:44:05 +02:00
Günther Brammer bf130d664d Use a less convoluted way to avoid overflow when rounding large C4Fixeds 
Instead of using a special path for the numbers that would overflow, make
use of the available bits to avoid overflow entirely.
 2013-05-25 18:44:05 +02:00
Günther Brammer 27ef3edff0 Consistently use rounded and precise values in movement code 
Movement is done in single-pixel or single-degree steps, until the
rounded position that's used for collision detection is equal to
the target. The underlying position is maintained with subpixel
precision as much as possible, however.
 2013-05-25 18:44:00 +02:00
Günther Brammer 398809dc55 Do not unnecessarily truncate the position of rotating objects 
Rotating attached objects can move them, but for unattached objects this
would only reset them to the same pixel position there were at, but without
the subpixel fraction.
 2013-05-25 15:09:56 +02:00
Günther Brammer 4e875f4495 Don't store object rotation twice 
Rotation was still stored as an integer and as a fixed point number.
Compute the integer on demand from the fixed point instead, like the
position. Rewrite the movement code where the two variables were
temporarily out of sync.
 2013-05-25 14:59:58 +02:00
Günther Brammer ecae81d985 Enlarge rotated shape only by the minimum necessary 
Previously, a rotated object had a quadratic shape that could hold all
possible rotations.
 2013-05-25 14:47:54 +02:00
Günther Brammer bc45d417a9 Remove some dead blitting code 2013-05-25 14:47:54 +02:00
Tobias Zwick fe5a29b198 throw out DVORAK keyboard layout (controls are keyboard layout independent now) 2013-05-25 14:41:58 +02:00
Tobias Zwick 2425bb2793 fix wind bag rotation and vertices 2013-05-25 14:36:22 +02:00
Tobias Zwick ba426651ad fix wind bag rename 2013-05-25 14:36:04 +02:00