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

8290 Commits (6270f682d36be8f966743db5390f35da0bee17c4)
 

Author SHA1 Message Date
Tobias Zwick 6270f682d3 add scenario for website header 2016-01-15 19:51:34 +01:00
Tobias Zwick a486c23671 reorder materials so i.e. sand does not paint over a rock shape anymore. 
* all non-diggable materials are now in front of diggable materials
* except: firestone and coal are still in front of rock

At least this change makes it necessary to test every scenario we have if there are any problems with the landscape
 2016-01-12 01:18:03 +01:00
Tobias Zwick d1ca7fe059 fix tiling of the gold normal texture 2016-01-12 01:18:03 +01:00
Tobias Zwick 4ace35cee1 add new shape and normal textures to hideout.ocs 2016-01-12 01:18:03 +01:00
Tobias Zwick 28e48173ec fix bug in the ore color texture (rendering done by Matthias) 2016-01-12 01:18:03 +01:00
Tobias Zwick cbd49913c2 add shape textures to Amethyst, Ruby, Firestone, Gold, Everrock, Ore and enhance shape textures of Granite and Rock. 
* move ruby texture phase by 50% so ruby and amethyst do not look like the same material with a different color when next to each other so much
 2016-01-12 01:18:03 +01:00
Tobias Zwick c0e9287bae make granite and rock shape indexed 2016-01-12 01:18:03 +01:00
Tobias Zwick 863cfc42ba add a shape map for amethyst and ruby; also, fix a small issue with tiling the textures horizontally 2016-01-12 01:18:03 +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
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