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 44f913d0e5 Do not display grab interaction when swimming (unless clonk returns true on CanGrabUnderwater callback) 2016-01-15 08:54:50 -05:00
Sven Eberhardt 26084af502 Fix crash when grab target is lost. 2016-01-15 08:54:03 -05:00
Sven Eberhardt 4eddeba9aa Fix crash when drawing zero-sized viewports (may happen during editor viewport initialization) 2016-01-15 08:53:00 -05:00
Sven Eberhardt cc613c01f4 Fix action target reset on same procedure only. 2016-01-15 08:14:46 -05:00
Sven Eberhardt c8a76ce450 Use less annoying swim sounds when swimming on the surface. 
The "splash" sounded more like the clonk was jumping into the water.
 2016-01-14 22:32:54 -05:00
Sven Eberhardt 71b96bc5de Fix nil pointer access when recovering from over-full inventory 2016-01-14 22:30:55 -05:00
Sven Eberhardt cd63c06aaf Fix crash when starting tabbed out. 2016-01-14 22:25:45 -05:00
Sven Eberhardt 27f5cdc461 Fix black waves when swim timer is executed in same frame as clonk leaves the water. 2016-01-14 21:51:30 -05:00
Sven Eberhardt 579cb7e66c Reset action targets on procedure change #1552 2016-01-14 21:40:42 -05:00
David Dormagen 4493bfc3ab interaction menu: disallow interaction with outside world when contained (#1541) 
The interaction with IsContainer objects is still flawed in a way: when a lorry is inside a (IsContainer-)hut, you can take the lorry into your hands. Since we don't have that possibility in the normal game, I leave it unchanged for now.

However, it is now possible to add a Chest (or a cupboard!) into a WoodenCabin and then store stuff inside of it.
 2016-01-14 13:03:18 +01:00
Maikel de Vries 4357004dbf prevent picking up heavy objects when on grapple rope and draw in rope when picking up heavy object (#1521) 
Maybe there are other places where the controls libraries should make callbacks to control effects. But that is for the future.
 2016-01-13 23:13:44 +01:00
Armin Burgmeier 9208f32d16 Denumerate attached meshes recursively (#1603) 
Since mesh instances can now be attached to attached definitions, attached
definitions need to denumerate pointers recursively to make sure that the
reference to the mesh instance is restored correctly.
 2016-01-12 18:19:41 -08:00
Maikel de Vries 2ce04aa485 tell player to park airship a bit higher in tutorial 7 (#1598) 2016-01-12 23:25:30 +01:00
David Dormagen 46ad28ea65 tutorial guide: don't scroll portrait with text 
..by putting the text into another subwindow. Might be good to "fix" (it's intended but possibly not wise) that in the engine, but not right now before the release, because it could introduce new bugs.
 2016-01-12 23:17:49 +01:00
Maikel de Vries a7da208d85 fix next mission for tutorials 5 and 8 2016-01-12 23:07:36 +01:00
Maikel de Vries aec5184cf2 locomotive in clonkomotive accepts metal barrels as well 2016-01-12 22:43:35 +01:00
David Dormagen ba2cf8f096 fix incorrect clipping in script GUI windows (#1592) 
I am not sure why the 'isMainWindow' was there. It wasn't there in 7319f7b3cc and got introduced in the major rework in 049088be78 - I guess it was just an oversight that was not noticed because usually the UI windows have the text or other things that need to scroll on a deeper level.

Anyway, checking whether the window is a script-root window does not make any sense as far as I can see now.
 2016-01-12 22:18:57 +01:00
Maikel de Vries 82b090c7ca producer library does not request power if producer is not a consumer (#1602) 2016-01-12 22:17:41 +01:00
Clonkonaut f0a03b303b Fixed ownership of buildings. 
I must be mad. This script failed a lot of times. I had to add those brackets. Even then, the first run failed, the buildings were still ownerless. What is this sorcery.
 2016-01-12 22:01:47 +01:00
Clonkonaut 05b714a758 Tutorial 8: German translation. 2016-01-12 20:35:12 +01:00
Clonkonaut b30fea4f7d Tutorial 7: German translation. 2016-01-12 20:35:02 +01:00
Clonkonaut 4f7688810b Tutorial 3: Used the title from Title.txt. 2016-01-12 20:34:49 +01:00
Clonkonaut 07e912bac6 Tutorial 5: German translation. 2016-01-12 19:51:29 +01:00
Clonkonaut 8f71fa8a7a Tutorial 3: Translated new hint (#1594). 2016-01-12 19:50:59 +01:00
Maikel de Vries 7784a2617e fix showing rocks in tutorial 3 (#1594) 2016-01-12 09:48:46 +01:00
Sven Eberhardt b29631f003 Make relaunch weapon selection menu unclosable #1577 2016-01-11 22:02:48 -05:00
Armin Burgmeier 190b4bbae3 Instruct to start a network game when starting a round with >=2 MinPlayers 
Instead of asking the user to activate more players, which is no longer
possible as of #1529.
 2016-01-11 18:40:59 -08:00
Armin Burgmeier bb39597711 main menu: limit player selection to one player (#1529) 2016-01-11 18:33:08 -08:00
Armin Burgmeier 7e19070ef3 Allow to only select a single player in the menu (#1529) 
Due to the lack of gamepad support, splitscreen support is somewhat pointless
at the moment.
 2016-01-11 18:28:23 -08:00
Armin Burgmeier bd4551c6d4 Disable gamepad controls (#1536) 
Gamepad support is currently not working properly as many menus cannot be
navigated with a gamepad. Simply don't load any control assignment sets that
have gamepad enabled.
 2016-01-11 18:11:44 -08:00
Clonkonaut e762e66a65 German translation for Tutorial 4. 2016-01-12 01:51:28 +01:00
Clonkonaut b11b8b0fb5 Finish German translation of Tutorial 3. 2016-01-12 01:51:08 +01:00
Sven Eberhardt 62910aaada Remove dummy graphics of interaction menu. 2016-01-11 18:19:01 -05:00
Sven Eberhardt 77180efbdd Move dead clonks from interaction tabs to simple boxes in surrounding #1581 2016-01-11 18:19:01 -05:00
David Dormagen 717acafd34 tutorial 3: fixed typo in English translation 2016-01-11 22:48:57 +01:00
David Dormagen 18c58c783d tutorial 3: added German translation 2016-01-11 22:48:40 +01:00
Maikel de Vries 1600cccf3e tutorial 5: give second robber NPC a skin and fix outro walk speeds 2016-01-11 18:49:39 +01:00
Maikel de Vries 5abd033e1b reduce size of empty overlay for alternative skins 
Somehow that file was massive in size (400+ kb) for no apparent reason.
 2016-01-11 18:47:00 +01:00
Maikel de Vries be0d5161bb give fireman NPC in tutorial 3&4 a skin 2016-01-11 18:45:56 +01:00
Maikel de Vries 9bc7ccd953 remove backpack for NPCs with an alternative skin 2016-01-11 18:43:40 +01:00
Maikel de Vries c8d1cb9a1c add NPC skins YoungsterBlond and MaleDarkHair 2016-01-11 18:39:24 +01:00
Maikel de Vries e1e1380659 add title image to tutorial 5 2016-01-11 18:01:33 +01:00
Maikel de Vries fb3737d056 tutorial 5: fix outro, a typo and zoom ranges 2016-01-11 18:01:11 +01:00
Günther Brammer 30c579b846 CMake: Link to freetype even if it is not in the default directory 2016-01-11 11:10:53 +01:00
Armin Burgmeier b6393a7a15 remove windows-specific fonts from default font list on linux and mac (#1573) 
Otherwise the font chooser in the startup options shows those fonts, but
loading them will fail. Ideally we replace this by enumerating the system
fonts at some point.
 2016-01-10 20:51:17 -08:00
Sven Eberhardt 1a02cce2e0 Add sound Fire::BlastLiquid3. 
Based on Fire::Blast3 with spectrum adjusted to match Fire::BlastLiquid2.
 2016-01-10 23:03:38 -05:00
Armin Burgmeier 2935f9622c mac: fix mousewheel event handling (#1575) 
Some sort of smooth scroll information was passed down to the engine which
didn't handle it properly, or the units with which they were reported to us
were different from what the engine expected.  For now, just use fixed scroll
offsets until we implement proper delta-y-aware scrolling in C4MouseControl.

The fix for #1574 might have also helped with this in recognizing when Control
is pressed and when it isn't.
 2016-01-10 20:01:45 -08:00
Sven Eberhardt 84378e0d6a Add sound UI::Error #1583 2016-01-10 22:56:01 -05:00
Sven Eberhardt 491e0a3b40 Add missing sound UI::Trumpet #1584 
Adapted from sound "Trumpet2" by Harbour11@freesound.org. http://freesound.org/people/Harbour11/sounds/194624/ (CC-BY 3.0)
 2016-01-10 22:49:41 -05:00
Sven Eberhardt 37f774cfb3 Foundry: Do not show power consumer symbol in construction menu #1580 2016-01-10 22:20:48 -05:00