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

8358 Commits (stable-7)
 

Author SHA1 Message Date
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
Armin Burgmeier 25a19f9922 StdPNG: Fix crash when saving a screenshot on Linux/Mac 64bit 
"unsigned long" is 8 bytes on 64-bit Linux and Mac, so we write 4 bytes
past the end of the allocated memory region.
 2016-01-05 20:23:15 -08:00
Maikel de Vries e0ae612e10 killtracing: fix setting killer when airship is shot down 2016-01-05 18:20:33 +01:00
Maikel de Vries 7b4fe4452f killtracing: more tests and more precise test descriptions 2016-01-05 18:19:49 +01:00
Armin Burgmeier 4a02d3c77b Revert "Replace 3D texture in landscape shader by a 2D texture array" 
This reverts commit 790219ac7e.

This commit broke support for Mac OS X since Apple only supports OpenGL 3.0
with a core profile, not a compatibility profile. Revert this commit
temporarily for the 7.0 release, until we port all OpenGL usage to the core
profile with 8.0.

This fixes #1495.
 2016-01-04 18:27:44 -08:00
Maikel de Vries b5b6526c58 killtracing: airplane always gets destroyed when damage too much and with correct killer 2016-01-04 21:17:25 +01:00
Maikel de Vries ee9c44ac75 boompacks are not projectile targets of boompacks 
This would be very annoying if you fuse multiple of them at the same time
 2016-01-04 21:17:25 +01:00
David Dormagen 075fcca74f clonk: added "Diving Loop" sound (by ala) 
It's a bit quiet, but I guess that's not really a problem. It's also out of sync with the arm movement, but it's all I got (and it's so quiet you don't notice it anyway!).
 2016-01-04 20:52:11 +01:00
David Dormagen 78f74566af added alternative "Munch" sound (by ala) 2016-01-04 20:52:11 +01:00
Maikel de Vries f1c9b042ff killtracing: boompack gets correct controller when hit or incinerated 
also add a hitcheck when launched by a projectile hit
 2016-01-04 20:43:56 +01:00
Günther Brammer a115801f0e Script: Rename FnGetLeagueScore to GetLeagueScore 2016-01-04 05:10:10 +01:00
Maikel de Vries af4819aa81 killtracing: add additional tests 2016-01-03 20:18:06 +01:00
Maikel de Vries 7aaa5a6e32 killtracing: pass controller of igniter when fusing dynamite 2016-01-03 20:18:06 +01:00
Maikel de Vries 659b1d24a7 killtracing: correct cause_plr for burning lorry fragments 2016-01-03 20:18:06 +01:00
Maikel de Vries 22d5036e9e killtracing: set killer of balloon rider if balloon is shot 2016-01-03 20:18:06 +01:00
David Dormagen 14c413028c interactions: always show action target & use AtRect instead of AtPoint 
The players have no notion about the midpoint of an object and are thus confused when clearly standing in front of something and not being able to interact with it.
(Yes that happened in a Let's Play and yes, that's why the interaction menu also uses Find_AtRect.)
 2016-01-03 17:39:26 +01:00
David Dormagen 22d9a21ff7 carry heavy: remove special treatment of CON_Interact 
Because it's an interaction. It should use the interaction interface and not some self-made hack. Previously, setting down a carry heavy object would always be executed even if aborted with Space+S.
 2016-01-03 17:38:05 +01:00
David Dormagen 4b398f95eb construction site: fix unstuck check for free objects 
We are looking for free objects. So for OCF_InFree and not for Not(OCF_InFree). Now Clonks are e.g. unstuck when the landscape adjusts to a construction site.
 2016-01-03 17:35:47 +01:00
Maikel de Vries 1eebe15fa1 dark mine: king of the hill as scenario option 2016-01-03 16:01:37 +01:00
Maikel de Vries 471470f1fb killtracing: more tests 2016-01-03 14:39:24 +01:00
Maikel de Vries 3392921bfe killtracing: windbag set controller for moved objects 2016-01-03 14:31:20 +01:00
Maikel de Vries 309edf4467 killtracing: fix contoller of dumped lorry contents 2016-01-03 13:54:26 +01:00
Maikel de Vries d6a16f7ff1 killtracing: more tests and overview table 2016-01-03 13:30:11 +01:00
Maikel de Vries 64af909a49 killtracing: set controller of keg when incinerated 2016-01-03 12:30:47 +01:00
Maikel de Vries 6530cba8eb killtracing: club set controller when hitting an object 2016-01-03 12:25:38 +01:00
Maikel de Vries 5ba7519b79 killtracing: add test scenario 2016-01-03 09:57:06 +01:00
Maikel de Vries 7f8b4c4bfc killtracing: cannon set controller of projectile to the shooter 2016-01-03 09:57:06 +01:00
Maikel de Vries f607112db4 flame: do not tumble clonks and correct killtracing 2016-01-03 09:57:06 +01:00
Maikel de Vries 21dead533c killtracing: pass owner and controller correctly in CastObjects 2016-01-03 09:57:06 +01:00
Maikel de Vries 869ea063f9 fix author mentioning of bat sounds 2016-01-03 09:57:06 +01:00
Armin Burgmeier d72b8cc385 Use generic vertex attributes for FoW rendering 2016-01-02 19:11:41 -08:00