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

8027 Commits (9f2c60c94e313a1e5cd112a944dcf77f21da4f97)
 

Author SHA1 Message Date
Nicolas Hake f0eeb3f6b3 Make headless build compile again 2015-12-15 19:45:32 +01:00
Sven Eberhardt e0bcaf8d7d Sound UI::Confirmed (instead of Objects::Connect) 2015-12-15 01:41:25 -05:00
Sven Eberhardt 1d7c5c00c8 Add some missing UI sounds. 
Still missing UI::Error.
 2015-12-15 00:25:44 -05:00
David Dormagen d81e82a7b4 large cave mushroom: fixed possible use-after-deletion 
The inherited Damage() can remove the object.
 2015-12-14 20:25:37 +01:00
David Dormagen 30524f3e98 large cave mushroom: fixed reproduction 2015-12-14 20:23:12 +01:00
Maikel de Vries f28029923c improve the moving out of basement of objects on construction 2015-12-14 18:13:18 +01:00
Maikel de Vries 1523c3f012 add growth to animal library 2015-12-14 18:13:18 +01:00
David Dormagen dcfb986e34 moved sounds into subfolders 
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
 2015-12-13 22:14:55 +01:00
David Dormagen 278584578f scorched gardens: tune down meteor effects (and increase BAM) 
Because otherwise the map is completely smoked all the time.
 2015-12-13 20:48:02 +01:00
David Dormagen cfae622ba7 scorched gardens: eliminate obvious camping locations for players 2015-12-13 20:48:02 +01:00
David Dormagen 848471502f scorched gardens: disallow "Deathmatch" goal (in favour of Last Man Standing) 
Most kills do not count in this map or are suicides or environment-kills. The round is currently nearly unplayable as Deathmatch as it takes an eternity (also due to penalty points).
 2015-12-13 20:48:01 +01:00
Sven Eberhardt f12a07c447 Volcano Escape: Fix volcano bubbling sound. 2015-12-13 11:30:50 -05:00
Sven Eberhardt 1deb7e8176 Add range parameter to ShakeViewport. 
Controls the falloff distance, so you can create more localized (or more global) shakes.
 2015-12-13 11:11:01 -05:00
Nicolas Hake 2fcbd56316 Remove some autotools relics from .gitignore 2015-12-13 16:13:47 +01:00
Nicolas Hake 72002cc366 Kill netpuncher 
Another piece of code that hasn't been tested in ages, gone. The default
puncher address was still pointing to clonk.de, which I'm very certain
isn't providing UDP hole punching services anymore.

Instead of a bespoke hole punching implementation we should use a STUN
lib.
 2015-12-13 16:11:08 +01:00
Sven Eberhardt 9727a5d25d Merge branch 'master' of ssh://git.openclonk.org/openclonk 2015-12-13 09:36:55 -05:00
Sven Eberhardt fbda2f1843 FightForGidl: Chippie bounty and developer msgboardcmds. 2015-12-13 09:36:11 -05:00
Sven Eberhardt b40fb83268 Move Breathing.wav and sound credits from Arena.ocf to main sounds file. 2015-12-13 09:31:31 -05:00
Nicolas Hake ff57c03295 CMake: Move pthread, rt deps to libmisc 
libmisc is the support library that references thread code and timing.
So the dependencies on pthread and rt should be attached to libmisc
instead of every single binary.
 2015-12-13 14:34:02 +01:00
Nicolas Hake 7d186516a8 Tests: Move pthread dependency to gtest 
The test binaries don't directly use pthread (but gtest does), so the
dependency should be added to gtest instead of the binary itself.
 2015-12-13 14:33:02 +01:00
Nicolas Hake b6327fdf93 CMake: make explicit that libc4script depends on libmisc 
libc4script uses C4Group, so it has a dependency on libmisc. Make this
dependency explicit so all targets that use libc4script also
automatically pull in libmisc.
 2015-12-13 14:23:52 +01:00
Clonkonaut 0b83fc2e26 Removed granite from starting cave in Deadly Grotto. 
Sometimes clonks got stuck in that right at the beginning.
 2015-12-13 13:38:42 +01:00
David Dormagen 2ca71d061b chippie: made some particle effects a bit nicer 
The death-particles match the color of the chippie better (by mixing in some less pre-modulated graphics). The egg particles are also a bit more intense (as the graphics file is already not full white).
 2015-12-13 08:20:38 +01:00
Sven Eberhardt 923abe9333 Add simple (~CR-like) corrode sound. 2015-12-13 01:37:26 -05:00
Sven Eberhardt 4de7a42ac1 DeadlyGrotto: Starting platform fix and Chest to knowledge. 2015-12-13 01:36:55 -05:00
Sven Eberhardt 3174d0b156 Remove WindLoop sound from engine. 
It was almost never appropriate (played underground etc.), could not be turned off and was very repetitive. Mountain scenarios with lots of wind may activate the sound.
 2015-12-13 01:22:00 -05:00
Sven Eberhardt 40f46403ba Move sound author attribution from Objects.ocd into main Sound.ocg (where the sounds now reside). 2015-12-13 01:09:48 -05:00
Sven Eberhardt 9f6c45b832 Fix some simple missing sounds. 2015-12-13 00:47:00 -05:00
Sven Eberhardt 42a0c5d188 Increase wealth cap to ONE BILLION!!! 
It makes sense to have a cap because of integer overflow, but it was set very low. Increase it to the largest round number below MAX_INT.
 2015-12-12 15:52:22 -05:00
Sven Eberhardt 68c1ac8694 FightForGidl: Fix rewards, more gold, debug commands (#1494) 2015-12-12 15:09:14 -05:00
Clonkonaut 309aa5416b Melee weapons: reset clonk's running speed if thrown (#1487). 2015-12-12 20:37:42 +01:00
Sven Eberhardt 499959fa14 Fix team distribution of savegame resume and initial script players #1494 2015-12-12 14:09:42 -05:00
Sven Eberhardt 3247360bec FightForGidl: Fixes and life upgrade for clonk. 2015-12-12 13:31:38 -05:00
Maikel de Vries ef1b8b548e add frontend song (UrbanBolero) by K-Pone 2015-12-12 18:32:34 +01:00
Sven Eberhardt a65768e853 Provisional title for Defense.ocf 2015-12-12 12:22:31 -05:00
Maikel de Vries 2e297b6563 time isday and isnight return true and false if no time object is present 2015-12-12 18:15:55 +01:00
Sven Eberhardt 171080cbd5 Play frontend music by tag. 2015-12-12 12:08:45 -05:00
Sven Eberhardt bf63f2ef17 Gidl+Windmill moved to new "Defense.ocf" (title picture missing) 
They aren't quite fitting at the moment and Clonko wants to share the buy menu.
 2015-12-12 12:06:25 -05:00
Clonkonaut 461d147859 Fixing my own stupid crap (coconut). 2015-12-12 16:16:24 +01:00
Clonkonaut f9f7d17208 Coconuts grow in the treetops, fall down after some time. 2015-12-12 16:08:34 +01:00
David Dormagen dd3fc7610e sawmill: fix missing info menu 
The production menu was used for showing information. Now the sawmill is no producer anymore and thus has no production menu. Instead, the sawmill adds the hint manually now.
 2015-12-12 12:06:14 +01:00
Sven Eberhardt 82e15926eb FightForGidl: Boomattack enemy waves. Also map rework to be open for flying attackers. 2015-12-12 01:34:49 -05:00
Sven Eberhardt 1dca9cf1b5 FightForGidl: No friendly fire and some AI fixes. 2015-12-12 00:02:31 -05:00
Clonkonaut 680505c078 Sawmill now independent from Producer library. 
This was hacky to begin with and often caused problems. Lately it made the saw blade spin down after each piece of wood was cut which was something I had fixed before. This won't happen anymore.
I also made the sawing a little bit nicer by adding an engine sound. I WILL MOVE THIS TO SOUND.OCG WHEN ITS DONE
 2015-12-12 01:34:08 +01:00
Maikel de Vries a3af12e8a5 fix Flooded Veins map (#1493) 2015-12-11 23:32:33 +01:00
Maikel de Vries 6065571742 fix rope particles on ladder and clean up rope related scripts 
The ladder only had one of the ropes drawn and the clean up resulted in some small speed up for the rope related objects. See also (#1143).
 2015-12-11 23:32:33 +01:00
David Dormagen 8d9d3a1ef9 producer: use infinity symbol instead of text "always" 
After some testing, the text turned out to be the worse solution. At least Sven complained that the text was split into two lines on his resolution from 1997.
 2015-12-11 20:42:15 +01:00
Sven Eberhardt fcba917a04 FightForGidl: Buy menu improvements and fixes. 2015-12-10 23:59:06 -05:00
Sven Eberhardt a69ca73ec9 FightForGidl: 3-tiered shoot speed upgrade. 
Last upgrade + musket is practically a machine gun! You have to click each shot though.
 2015-12-10 23:41:15 -05:00
Sven Eberhardt ee832ffe0b FightForGidl: Add description box to buy menu. 2015-12-10 22:45:57 -05:00