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

8440 Commits (b7cffa5e82d70aec265830dff5102f45d1990424)
 

Author SHA1 Message Date
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
Günther Brammer 7613393359 gtk editor: Exchange cursor and time information 
The toolbar doesn't have enough space by default, and this way we can use
the GtkStatusbar widget.
 2016-01-10 00:19:07 +01:00
Günther Brammer a185cae264 gtk editor: Simplify landscape preview drawing 
In earlier versions, DrawPatternedCircle was a fairly complicated function.
Nowadays, it just copies pixels in memory, bounded by a circle. Since we
need to convert our surfaces to a format GTK+ can use anyway, combine that
step with the circle boundaries. Also use a cairo surface instead of a
GdkPixbuf. Cairo uses almost the same pixel format, except for
premultiplied alpha. Ignore this for now.
 2016-01-10 00:19:07 +01:00
Günther Brammer ab7f4f0bbf gtk editor: Use GTK+ 3 layout widgets 
Specifically, GtkGrid. For most cases, this is an increase in lines of
code, but the landscape tools dialog can now be done with just three layout
widgets.

While at it, use a toolbar and move the mode buttons into it, too.
 2016-01-10 00:19:07 +01: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
Sven Eberhardt 3f7bd627de Fix int type in group info display format. 2016-01-09 00:19:39 -04:00
Sven Eberhardt e89779a8c7 Handle key-up events corresponding to keys that were down even if scope is not matched #1145 2016-01-09 00:19:38 -04:00
Maikel de Vries 96344dfc00 disable climbing when swinging pickaxe 2016-01-08 22:43:46 +01:00
David Dormagen 05013563d3 tutorial1: added German translation 2016-01-08 21:25:20 +01:00
David Dormagen 0c73ae29e7 loam: fixed turning while digging and added some particles 
This were supposed to be two commits. Meh.
Also, I can't really test how the particles looks because everything is black for me - ck? :(
 2016-01-08 21:05:09 +01:00
Maikel de Vries 5da08f2720 prevent bat from getting stuck in material 2016-01-08 20:50:11 +01:00
Maikel de Vries 55b077898b finished outro sequence for tutorial 4 2016-01-08 19:46:28 +01:00
Maikel de Vries 4b3f9ce4b9 do collection check more often for faster moving objects 
Otherwise falling objects would easily move through the collection zone of the lorry.
 2016-01-08 19:46:28 +01:00
Maikel de Vries f99db85c97 add more bottom vertices to structures to prevent falling down 2016-01-08 19:46:28 +01:00
Günther Brammer 67bf24f1e1 editor: Always remove previous suggestions before adding new ones 
9e771ac moved the Win32 ClearInput implementation into SetInputFunctions,
but broke at least GTK while doing that. 9a7d57c0d2 fixed the assertion
failure in GTK that resulted, but failed to restore the removal of the old
completions.

Fix this by folding ClearInput into SetInputFunctions in all implementations.
 2016-01-08 15:22:00 +01:00
Sven Eberhardt 8552b3a8f9 Change return value of InsertMaterial when inserting outside landscape bounds #1509 
Fixes clogged pump when pumping outside map.
 2016-01-08 01:05:22 -04:00
Sven Eberhardt 1b32663999 Fix movement on moving bricks #1530 2016-01-08 00:40:35 -04:00
Sven Eberhardt 102b44aa35 Give system path precedence over user path #831 2016-01-08 00:28:23 -04:00
Sven Eberhardt 6ea51e9f7a Fix order of initialization of C4Game/C4GraphicsSystem. 
Game.GraphicsSystem could be constructed after Game, but was accessed in C4Game::Default.
 2016-01-07 23:42:18 -04:00
Günther Brammer 7d0990baf9 editor: Don't try to insert manual newlines into error messages 2016-01-08 04:25:26 +01:00
Sven Eberhardt fbdfcafa43 Fix text error in tutorial 2 #1539 2016-01-07 22:06:35 -04:00
Sven Eberhardt 1933deec44 Fix GUI name and description of interact key #1540 2016-01-07 20:47:18 -04:00
Mark 8719ee8b58 Test scenario for SetGraphics() 
Scenario that tests SetGraphics() in various ways: Setting graphics of meshes/sprites to other objects, overlaying objects onto other objects.
The scenario is not in the Issues.ocf folder, because it addresses multiple issues #1458 and #1538 and the status of the issues has not been acknowledged yet.
 2016-01-07 19:09:18 +01:00
David Dormagen b6436783bb loam: disable free turning of Clonk 
From bug report out of http://forum.openclonk.org/topic_show.pl?tid=3233
 2016-01-07 10:09:39 +01:00
David Dormagen e3553ca0cd particles: replaced "TODO" comment 
This was actually part of a larger performance boosting commit, which turned out to not actually boost performance. But I want to retain the comment change even when I won't push the larger commit.
Having a "todo" comment is just misleading.

For an explanation of why that's needed, see http://stackoverflow.com/questions/21652546/what-is-the-role-of-glbindvertexarrays-vs-glbindbuffer-and-what-is-their-relatio
 2016-01-07 09:55:35 +01:00
Armin Burgmeier 6200f4f27a Load additional graphics even if no base graphics are present (#1537) 
This allows e.g. to have a definition that contains only portraits.
 2016-01-06 18:11:23 -08:00
Tobias Zwick 0976c02d54 Update the Credits 
Space is getting scarce , I had to leave out the people who never contributed more than two commits. For 8.0 the credit screen should be reworked to either scroll down or be made for larger resolutions than 800x600.
 2016-01-06 19:39:03 +01:00
Maikel de Vries da6d4a8aa3 Skins for NPCs in the tutorials 2016-01-06 19:03:59 +01:00
Maikel de Vries 09b61246f0 add several clonk skins for NPCs by Marky 2016-01-06 19:03:59 +01:00
David Dormagen 941dc8a95b Wipf: added Snuff3 sound (by ala) 
Silence at the beginning and end was trimmed. Only true silence, though.
 2016-01-06 12:11:35 +01:00
Armin Burgmeier 5ecb393c71 Fix FoW flicker when resizing the FoW texture 
We do this by copying the contents of the old texture when resizing it.
 2016-01-05 20:23:15 -08:00