Clonkonaut
|
1178d8f0ce
|
Prevent dead clonks from sitting upright (#1358).
Also added convenient constants defining the animation slots to use for clonk animation.
|
2015-10-11 14:08:14 +02:00 |
|
David Dormagen
|
196f528201
|
Merge branch 'master' into Controls
Conflicts:
planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt
planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt
planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png
planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c
planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
src/game/C4Game.cpp
src/gamescript/C4GameScript.cpp
src/gui/C4GameMessage.cpp
src/landscape/C4Landscape.cpp
|
2015-06-03 22:32:36 +02:00 |
|
Sven Eberhardt
|
49c5b22591
|
Remove some empty graphics files.
|
2015-01-17 18:22:06 +01:00 |
|
David Dormagen
|
f89b8c8319
|
Merge branch 'master' into Controls
Conflicts:
planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/DefCore.txt
planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/PowerProducer.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/System.ocg/ClonkControl.c
src/gui/C4MouseControl.cpp
src/landscape/C4PXS.cpp
|
2014-12-25 15:24:19 +01:00 |
|
Maikel de Vries
|
c6802b8776
|
increase game content version entries to 6.0
|
2014-12-12 22:58:16 +01:00 |
|
David Dormagen
|
06ac00ace8
|
Merge branch 'master' into Controls
Conflicts:
CMakeLists.txt
Makefile.am
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
src/control/C4Control.cpp
src/control/C4Control.h
src/gamescript/C4GameScript.cpp
|
2014-02-15 14:44:57 +01:00 |
|
David Dormagen
|
f7f3420977
|
correct kill tracing when flinging enemies down cliffs with melee weapons and ApplyWeaponBash
|
2014-02-15 14:32:48 +01:00 |
|
David Dormagen
|
ef11d1d272
|
removed some commented-out particle creations
|
2013-11-26 21:25:05 +01:00 |
|
Martin Plicht
|
a915cdb15f
|
Make Eclipse happy by changing some zeros to nils and stuff
|
2013-05-26 00:01:08 +02:00 |
|
Martin Plicht
|
a4194c22e9
|
Replace 0 with nil wherever string/object/array is expected
|
2012-04-12 11:48:23 +02:00 |
|
David Dormagen
|
99638db4c9
|
fixed shield exploit: limited the maximum damage of the sword on one target to 9 damage every 15 frames
|
2012-04-10 23:31:46 +02:00 |
|
Maikel de Vries
|
59c1aefad9
|
Objects: All Versions to 5,2,0,1
|
2011-10-01 10:54:15 +02:00 |
|
David Dormagen
|
f34d82171a
|
renamed some effect variables to have more meaningful names
|
2011-08-03 21:58:50 +02:00 |
|
David Dormagen
|
9100a44d88
|
fixed the visuals of the sword's downwards-stab a bit
|
2011-06-05 01:08:54 +02:00 |
|
Armin Burgmeier
|
675c077ed2
|
Change .c4d extension to .ocd
|
2011-03-13 16:55:00 +01:00 |