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

5384 Commits (7789f9586a2739057a00b22c3db5053b61b55bfe)
 

Author SHA1 Message Date
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
Tobias Zwick 52a1d5c18e rename jar of winds to windbag 2013-05-25 00:08:54 +02:00
Tobias Zwick f0ea347eb6 new wind jar => wind bag 2013-05-25 00:08:19 +02:00
Clonkonaut 75cb0f2030 Added grenade launcher 
!!!!!!!!!!
 2013-05-24 21:21:07 +02:00
David Dormagen ae0a364587 Musket shots now exit at the correct position 
Launch() of the bullet now has offset parameters
LaunchProjectile() now only calculates own offset if none was passed to the function
 2013-05-24 20:45:32 +02:00
Martin Plicht 1d829361f7 mac: Minimal fix after scancode merge 2013-05-24 19:55:56 +02:00
Günther Brammer 9506c5ad97 Merge branch 'scancodes' 2013-05-24 17:47:59 +02:00
Günther Brammer 50eb1b6a76 Since internal keycodes are now scancodes, they do not need to be resolved 2013-05-24 17:41:14 +02:00
Tobias Zwick c4511bb892 fix ViewLock default in compile func 2013-05-24 01:03:29 +02:00
Tobias Zwick a28e441b51 wallkit preview only visible to owner 2013-05-24 01:00:12 +02:00
Tobias Zwick 8500400864 make bucket green and change picture when filled/not filled 2013-05-24 00:27:34 +02:00
Tobias Zwick 83935b033a bucket can be spilled also while climbing, swimming etc now 2013-05-23 23:23:58 +02:00
Tobias Zwick d4db0008f7 git is weird 2013-05-23 18:37:01 +02:00
Tobias Zwick fbcd419af2 adapt zoom defaults, set default view lock to true 2013-05-23 18:35:23 +02:00
Tobias Zwick 18975576ce fix steam engine object collection 2013-05-23 18:35:22 +02:00
Clonkonaut ecaf311dc6 WindGenerator in RubyCave will fail only 1 of 10 million times (est) 2013-05-23 18:34:12 +02:00
Clonkonaut 0709351ffd Play & Stop icons (used by the pump). GRAPHICS MISSING 2013-05-23 17:50:15 +02:00
Clonkonaut d3fc01abd5 Clonks hold breath for 20 seconds 2013-05-23 17:25:13 +02:00
Tobias Zwick 50b42572aa make tree mushroom a bit lighter - smaller texture 2013-05-23 16:49:04 +02:00
Tobias Zwick a09f78cf02 ruby cave: chest instead of lorry 2013-05-23 16:36:59 +02:00
Tobias Zwick 2c7c97e9f1 chest can contain more stuff 2013-05-23 16:23:30 +02:00
Tobias Zwick 4ebde230ab add missing description for mushrooms 2013-05-23 16:12:46 +02:00
Maikel de Vries d5dec949b2 Fixed position of the flag in CTFs 2013-05-23 14:36:21 +02:00
Pyrit 5b634c84d9 Small changes for Windmill.ocs 
- arrow is in front of windmills
 - bullet doesn't try to remove itself after it is already removed
 - wind generators don't show light bulbs anymore
 2013-05-23 14:19:56 +02:00
Pyrit 3198045185 Bow and musket work again in Windmill.ocs 2013-05-23 14:19:56 +02:00
Nicolas Hake 7a8352e672 CMake: Allow dynamic linking of Ogg/Vorbis 
Previously, MSVC builds did only allow static linking of libogg,
libvorbis and libvorbisfile. If there was a reason to do so, I have no
idea what it was, because it isn't documented in either VCS or a
comment. So I'll allow both dynamic and static linking.
 2013-05-20 16:10:17 +02:00
Günther Brammer dd07b1996b win32: Installer always creates Start Menu entries 
Apparently, the Games Explorer is a failed experiment. Players don't expect
a game to only appear there, lots of games do not bother with it, and
future windows versions don't include it.

Conflicts:
	tools/install/oc.nsi
 2013-05-18 00:21:46 +02:00
Sven Eberhardt 0fee226a2e Golden mountain, Dark castle scenario descriptions 2013-05-17 15:27:24 +02:00
Sven Eberhardt 77e498af17 Updated some settlement scenario names and descriptions 2013-05-17 13:45:10 +02:00
Sven Eberhardt 6d97dec15a EvilCastle.ocs renamed to DarkCastle.ocs 2013-05-16 20:32:48 +02:00
Sven Eberhardt 127ee8b46c Settlement scenario difficulties updated 2013-05-16 20:31:18 +02:00
Sven Eberhardt 3937fcd3b1 Sorted all playable scenarios from experimental folder into settlement/parkour/arena folders 2013-05-16 19:33:10 +02:00
Sven Eberhardt 359b5df806 Moved from experimental scenarios to main objects: Wall kit, gems, gem goals, reduced pickaxe strength (can't pick granite) 2013-05-16 16:50:34 +02:00
Sven Eberhardt 225683fbda Experimental maze: Added paint spray can (with placeholder graphics) 2013-05-10 09:38:09 +02:00