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

8314 Commits (44f913d0e5c3f8ae07b6cd4fa3a75dcfd26b07fb)
 

Author SHA1 Message Date
Sven Eberhardt 56fa4c2c5d DarkMine+Maze: Ensure free spawn position #1578 2016-01-10 22:07:23 -05:00
Sven Eberhardt 7208a3c299 Ignore CarryHeavy for collection limit #1587 
It was always ignored when picking up the CarryHeavy, but not when collecting another item. Now CarryHeavy consistently gives an extra item slot.
 2016-01-10 21:52:44 -05:00
Sven Eberhardt e8b0b9c16f WoodenBridge construction plan for some missions. 2016-01-10 21:39:56 -05:00
Sven Eberhardt a34912d9c2 Individual stacking and name/desc of source and drain pipes. 2016-01-10 21:34:41 -05:00
Sven Eberhardt e2acb8b9bb Add missing sounds for Grab/UnGrab #1585 2016-01-10 21:17:06 -05:00
Sven Eberhardt bdc0274e3d CommandFailure: Route missing sound effect to failure function playing clonk skin sound. 2016-01-10 21:16:34 -05:00
Armin Burgmeier ef63aa0975 mac: send keydown events for modifier flags change (#1574) 
For example, keydown events when pressing/releasing the shift, alt, or control
keys. With this version this is needed ingame e.g. to pick up objects with
Shift.
 2016-01-10 18:11:29 -08:00
Günther Brammer 9b7b4bf30a Remove unused variable in C4Landscape::DrawBrush 
This was forgotten in 47e422f452.
 2016-01-11 01:50:34 +01:00
David Dormagen 1c35bdf8e3 particles: fix high severity OpenGL API error 
glObjectLabel would result in invalid VBOs if called on a not-instantiated object. glGenBuffers does apparently only reserve the name and not create the buffer itself.
For me the landscape and some objects were drawn completely black.

More information: http://stackoverflow.com/questions/26614130/opengl-debug-extension-with-globjectlabel
Found via --debug-opengl
which lead to
gl: high severity API error: GL_INVALID_VALUE error generated. ObjectLabel: unknown buffer object <name>
 2016-01-10 23:31:17 +01:00
Maikel de Vries c35df88ae9 add tutorial 5 explaining melee weapons 2016-01-10 22:53:04 +01:00
David Dormagen 9bca345342 tutorial 2: added German translation 2016-01-10 21:57:20 +01:00
Maikel de Vries d94b2356b1 add function to tutorial guide to get the amount of messages it has 2016-01-10 20:54:03 +01:00
Maikel de Vries f1a9db89bf increase gems in landscape to make sure goal can be completed 2016-01-10 20:54:03 +01:00
Sven Eberhardt 3735b135ac DarkCastle: Pre-damage last stone doors. 2016-01-10 14:20:46 -05:00
Sven Eberhardt f54a49d044 Resource goals: Reduce display of available resources by 10% to better match actually mined gems. 
Some material always gets lost on blasting/pickaxing.
 2016-01-10 13:41:04 -05:00
Sven Eberhardt 95ac155f6b GoldenMountain: Reduce required gem count. 2016-01-10 12:21:14 -05:00
Martin Plicht 1a3b47dcbb CMakeLists.txt: Stop setting CMAKE_XCODE_ATTRIBUTE_GCC_PREFIX_HEADER in case of Xcode 2016-01-10 18:01:29 +01:00
Sven Eberhardt 05b6ee2407 Remove unused library dummy graphics. 2016-01-10 11:59:55 -05:00
Clonkonaut 962b178663 Merge remote-tracking branch 'remotes/origin/revert-opengl-2.1' 2016-01-10 17:27:56 +01:00
Sven Eberhardt 0f2057032f Retain inventory slot order on respawn #1543 2016-01-10 11:10:45 -05:00
Sven Eberhardt b8e24b8b62 Windmill: Fix gold bar collection 2016-01-10 10:49:51 -05:00
Sven Eberhardt 3dad1c6d81 Turn MaxContentsCount and HandObjects into properties instead of callbacks (Possibly fixes #1553) 2016-01-10 10:41:34 -05:00
Sven Eberhardt c569036d1d Make NO_OWNER viewports black in fullscreen+non-debug for non-observers #1557 2016-01-10 09:50:21 -05:00
Sven Eberhardt b00daed283 GoldenMountain: Add wooden bridge plans #1570 2016-01-10 08:55:04 -05:00
Sven Eberhardt d56670c7ce Fix pickaxe killing scaling ability permanently if it is used before any local ActMap modifications #1563 2016-01-10 08:46:20 -05:00
Maikel de Vries 092f9846dc ensure showing construction materials for sites at the bottom of the map (#1365) 2016-01-10 14:18:58 +01:00
Clonkonaut 5fd8bfb140 Projectiles will fade out very fast (#1555). 2016-01-10 13:11:26 +01:00
Clonkonaut 0243a69913 Fix possible reference to deleted object in Boomattack. 2016-01-10 13:10:47 +01:00
Günther Brammer e1ad5ee433 README: Update version numbers 2016-01-10 12:55:10 +01:00
Maikel de Vries 2b88578a7c disallow showing/hiding tutorial guide by player when in a sequence 2016-01-10 10:54:07 +01:00
Sven Eberhardt 889bba299e Fix /todo as network client. 
It would write into a TODO file in the temporary network file.
 2016-01-09 21:42:32 -05:00
Sven Eberhardt 2bb8be66ca Windmill: Downscale sky to match landscape size. 2016-01-09 17:53:44 -04:00
Sven Eberhardt dd25f85e6d Warn when assigning duplicate keys #1170 2016-01-09 17:00:21 -04:00
Sven Eberhardt dcefa516f6 GrappleBow: Pull back in if hook did not stick successfully #1546 2016-01-09 16:33:13 -04:00
Sven Eberhardt e64ec260bb Fix infinite air supply through breathing of own bubbles #1545 2016-01-09 16:15:20 -04:00
Sven Eberhardt fc659584e4 Fix catapult projectile priority when shooting clonk while items are placed in the catapult (typically by the scenario designer) #1547 2016-01-09 15:59:43 -04:00
Sven Eberhardt 1271fd9291 FightForGidl: Reduce screen shake. 2016-01-09 15:32:55 -04:00
Sven Eberhardt 310df9fe13 FightForGidl: Remove hammer for now (no towers yet) 2016-01-09 15:32:55 -04:00
Maikel de Vries cd30bf8079 fix eating/using the squid and the fish 2016-01-09 20:17:26 +01:00
Maikel de Vries 1ba1164d8e fix typo in dark mine string table request 2016-01-09 20:17:26 +01:00
Sven Eberhardt fd1c58db0d Hot Ice: Clonks have lower energy; iron bombs instead of swords in chests. 2016-01-09 15:09:12 -04:00
Sven Eberhardt 7f8551bb42 Add wealth display to Crash Landing #1548 2016-01-09 14:26:18 -04:00
Sven Eberhardt 3b74ac2929 DarkCastle: Fix nil access in intro. 2016-01-09 11:09:11 -04:00
Sven Eberhardt 11e73373a6 Use alt skins in storyline missions. 2016-01-09 11:09:11 -04:00
Sven Eberhardt 2e4da5077d Add dark skinned alt clonk skin [by Marky, CC-BY-3.0] 2016-01-09 11:09:10 -04:00
Sven Eberhardt dfe81b622a Alt clonk skins: Fix youngster portrait 2016-01-09 11:09:10 -04:00
Sven Eberhardt 3d98b8355c Alt clonk skins: hardcode clonk colors 2016-01-09 11:09:09 -04:00
David Dormagen 0ad1cdbf89 loam: made bridges smoother 
..by continuing the material drawing exactly where it was stopped the last frame. Previously, just some unconnected rectangles were drawn which were often times filled with gaps. Especially on angled bridges.
 2016-01-09 13:53:34 +01:00
Armin Burgmeier eb83fc96d0 linux: fix scrollwheel in fullscreen (#1535) 
Both "normal" and "smooth" scroll events were handled, and undoing the
effects of one another.
 2016-01-08 20:55:07 -08:00
Sven Eberhardt 53a6ec3139 Fix thread handle type for Win32 threads. 2016-01-09 00:19:40 -04:00