Sven Eberhardt
c185bdbe2b
add loam
2010-01-03 19:17:15 +01:00
Sven Eberhardt
fa45cf72ef
race goal
2010-01-03 18:18:57 +01:00
Tobias Zwick
6b2f39cc11
fixed errors
2010-01-03 18:04:06 +01:00
Tobias Zwick
3a08909112
merge
2010-01-03 17:55:22 +01:00
Tobias Zwick
155443494d
multiplayer hud bug
2010-01-03 17:54:25 +01:00
Tobias Zwick
7980f4d0b5
more HUD stuff
2010-01-03 17:36:49 +01:00
Sven Eberhardt
eb86408bc4
goal control implemented (fanfare sound by tobyk@freesound.org)
...
allow comments (#) in lang string tables
silence some warnings
2010-01-03 17:29:40 +01:00
Richard Gerum
3486d2af0a
hey, linendings really suck!
2010-01-03 01:14:12 +01:00
Richard Gerum
46b1a566f3
new run and stand animation, and new walk behavior (stand when not moving, walk when moving slowly and run when moving fast)
2010-01-03 01:08:23 +01:00
Tobias Zwick
df0ab1e2d0
fix on crew is deleted
2010-01-02 22:29:47 +01:00
Richard Gerum
143c7f65b8
other overlay for clonk
2010-01-02 15:26:43 +01:00
Richard Gerum
7c99d9b288
added overlay material for clonk and synchronized walkspeed and movement
2010-01-02 13:48:40 +01:00
Richard Gerum
42ffa51ac9
added throw animation, and fixed StdMesh.cpp to compile
2009-12-31 01:56:17 +01:00
Armin Burgmeier
7c5619646c
Allow a mesh to play multiple animations at the same time
2009-12-30 21:41:56 +01:00
Richard Gerum
f43896466b
args lineendings
2009-12-30 00:28:46 +01:00
Richard Gerum
5c47608e21
new texture for clonk
2009-12-30 00:26:45 +01:00
Richard Gerum
6771bc755d
new clonk mesh and texture
2009-12-29 17:00:32 +01:00
Sven Eberhardt
b0b146b7c2
add C4GFXOV_MODE_Rank
...
rank symbols reimplemented using internal ranks
2010-01-01 21:35:23 +01:00
Sven Eberhardt
1243c61c49
inventory bar temp background
...
kill some Thumbs.db
2009-12-31 18:54:50 +01:00
Sven Eberhardt
23a206ccdd
implement *Mouse*Wheel1Up/Down for player controls
...
implement mouse wheel viewport zoom as async PlayerControl
2009-12-31 18:20:45 +01:00
Sven Eberhardt
46bbbefc00
engine drag gfx rework
2009-12-31 15:50:42 +01:00
Tobias Zwick
395b2cfa74
HUD drag&drop (works now)
2009-12-30 20:44:58 +01:00
Sven Eberhardt
6b89a5dd57
engine support for Drag+Drop in script (WIP)
2009-12-30 20:16:32 +01:00
Tobias Zwick
b566bea377
drag and drop for the HUD (non-functional)
2009-12-30 16:50:25 +01:00
Tobias Zwick
a9eead664e
mouse selection
2009-12-29 18:51:13 +01:00
Nicolas Hake
c32852379e
Changed planet/ to LF line endings
2009-12-29 14:44:16 +01:00
Tobias Zwick
b474add380
wealth display with more graphics
2009-12-28 23:16:09 +01:00
Tobias Zwick
0e944f5493
small fixes
2009-12-28 14:50:12 +01:00
Tobias Zwick
5b4278979b
tooltips for the HUD, grab-fix
2009-12-28 14:12:24 +01:00
Tobias Zwick
72fbce7bad
optimizations for network
2009-12-27 22:22:42 +01:00
Tobias Zwick
78a78eb938
UseHolding does function now.
2009-12-27 21:41:11 +01:00
Tobias Zwick
ee324c9d7c
the clonk can't use the second item during using the first item
2009-12-27 19:07:11 +01:00
Sven Eberhardt
14e3f572df
#68 tooltip
2009-12-27 19:36:01 +01:00
Charles Spurrill
bcde491ded
musket bug fixed
2009-12-23 00:45:37 -08:00
Tobias Zwick
89f0ee4ee6
fixed PushEnter bug, fixed #0000061 , fixed crew selection via hotkeys
2009-12-22 23:59:52 +01:00
Tobias Zwick
ce1451907d
HUD display bug fix
2009-12-22 21:58:12 +01:00
Tobias Zwick
e4ad8c1c60
fixed jumping, introduced secondary use (right mouse button) - nonfunctional yet
2009-12-22 21:10:41 +01:00
Charles Spurrill
53aaa0da16
some resources added; musket fixes
2009-12-22 02:55:20 -08:00
Charles Spurrill
a055bd4875
Added beta musket
2009-12-16 19:36:48 -08:00
Tobias Zwick
d47100ae78
fixed scripted base behaviour, removed player hud
2009-12-16 00:55:45 +01:00
Tobias Zwick
708376f310
Wealth-display
2009-12-15 20:30:00 +01:00
Tobias Zwick
ef778d631a
removed ConvertGoals() (backward compatibility with Clonk4)
2009-12-14 22:46:10 +01:00
Tobias Zwick
450ee578c4
callback to script: DeRecruitment
2009-12-14 22:44:55 +01:00
Charles Spurrill
9e47a5d4e8
Added functions: SetVelocity() & SetLinearPos()
2009-12-13 01:08:19 -08:00
Charles Spurrill
56328f05d8
Metal barrel, other small fixes
2009-12-10 23:35:59 -08:00
Charles Spurrill
6649ba07c6
Fixed barrel aiming
2009-12-08 20:33:16 -08:00
Tobias Zwick
2397e3009e
actionbar completely working, w/ buildings and vehicles too, bugfixes, new icons
2009-12-07 20:11:22 +01:00
Tobias Zwick
be53401c54
Digging w/ shovel, minor bugfixes
2009-12-07 14:33:04 +01:00
Tobias Zwick
bfc7e3b074
fix: didn't pass the params of the overloaded functions correctly
2009-12-06 20:55:40 +01:00
Tobias Zwick
a7f93779c9
Digging with shovel + effects, that *UseStop is called should be guaranteed
2009-12-06 20:14:30 +01:00
Tobias Zwick
9d85b68966
Hands that display to which object the use controls are redirected
2009-12-04 19:43:32 +01:00
Tobias Zwick
0c6eaa796a
object selector can select vehicles and structures, proposed rank system
2009-12-04 15:49:11 +01:00
Tobias Zwick
025bd264b0
lower HUD gets updated, improvements on upper HUD
2009-12-01 00:41:37 +01:00
Tobias Zwick
b3c5a7be4b
rigged hotkey controls
2009-11-30 17:38:54 +01:00
Tobias Zwick
edec15d64f
merge
2009-11-30 17:24:14 +01:00
Tobias Zwick
b2f2ef4d9b
inventory hud (unfinished), acceleration during FLIGHT and WALK, old HUD (DrawCursorInfo) commented out
2009-11-30 16:57:37 +01:00
Charles Spurrill
3333078096
Improved Barrel Functionality and aiming
2009-11-25 19:45:55 -08:00
Charles Spurrill
fdc3a7ee93
Added wooden barrel; set CastPXS defaults to 360 spread and shoot up.
...
The reason for the latter is that CastPXS("Material", 1000, 100)
would fire to the right in a semicircle... didn't seem like a logical default.
2009-11-23 23:07:00 -08:00
Charles Spurrill
ad6de6d2f4
placing metal into proper branch
2009-11-22 12:08:47 -08:00
Charles Spurrill
24490877a7
Tweaked evaporation so it won't produce bumpy water surfaces
2009-11-22 17:33:40 -08:00
Charles Spurrill
9f29f83588
Put metal in proper branch, added possible-placeholder gold item.
2009-11-22 12:11:32 -08:00
Charles Spurrill
b08df69f26
Unbroke Dolphin Jump, fixed cloud vertices.
2009-11-22 11:53:52 -08:00
Charles Spurrill
fcc963d419
Added clouds and some script fixes:
...
+Steam engine automatically ejects non-fuel items
+Fixed some syntax issues in the CrewSelector script; removed unnecessary nils.
It should be mentioned the clouds don't seem to function 100% properly with evaporation for now in OC. Further testing is necessary.
2009-11-19 20:57:18 -08:00
Nicolas Hake
bd3b2bf7d7
Directives don't actually take semicolons
2009-11-13 15:39:57 +01:00
Maikel de Vries
a5704a9532
System.c4g: GetTaggedPlayerName from engine to C4Script + some translations.
2009-11-05 17:19:12 +01:00
Nicolas Hake
49b920b92a
Return correct value from GetPlrColor
2009-11-06 01:14:33 +01:00
Tobias Zwick
826b0d0ec6
better throw behaviour
2009-11-03 02:28:00 +01:00
Nicolas Hake
2217d78448
CR#2659/CR#2662: Add Find_Controller/Find_ActionTarget2
2009-10-23 08:14:49 +02:00
Tobias Zwick
927349e3aa
Clonk can throw with the new controls:
...
+ temporary solution with ControlThrow
+ x,y from playercontrol gets passed as local coordinates
+ changed playercontrols.txt
2009-10-21 13:55:36 +02:00
Charles Spurrill
620a926ed4
Missing wood graphics added; metal item added
2009-10-18 15:47:25 -07:00
Sven Eberhardt
f0582c8300
mouse game coordinate fix
2009-10-17 22:40:11 +02:00
Sven Eberhardt
448bba9ff5
scripted mouse control fixes
2009-10-17 22:20:36 +02:00
Sven Eberhardt
4237837bb3
experimental gamepad config
2009-10-14 23:29:27 +02:00
Felix Wagner
370c9232ac
( #0000046 ) fixed command functions
2009-10-14 20:54:58 +02:00
Richard Gerum
343d013d62
changed line endings
2009-10-14 17:43:07 +02:00
Richard Gerum
6faf698fa1
+ added models for clonk, lorry, steam engine, windmill and tools workshop
2009-10-14 17:24:03 +02:00
Richard Gerum
0dac409510
merged default into mesh
2009-10-14 16:42:23 +02:00
Tobias Zwick
1537104306
Removed parts of the old HUD, minor fixes:
...
+ removed the Captain/GetCaptain/rendering
+ removed energy bars
+ added the possibility for the crew selector to display different ranks for different clonk types
+ fixed GetCrewSelected
2009-10-13 16:02:13 +02:00
Tobias Zwick
2b2c2d7bff
CRLF for the dynamite script. Sheesh
2009-10-13 13:25:15 +02:00
Tobias Zwick
087df9f7f5
Added engine calls on hud-relates status changes of objects, new function to check whether an object is selected, misc fixes
2009-10-13 02:36:11 +02:00
Tobias Zwick
a859c9b108
controls respect nopushenter
2009-10-12 11:04:52 +02:00
Tobias Zwick
3212d8ff8c
Clonk control library
2009-10-12 11:01:11 +02:00
Tobias Zwick
3425ae0dae
fixed Clonkonauts old scripts, commented out Randrians inventory system :-(, implemented new inventory control (but without a display!)
2009-10-12 01:07:23 +02:00
Tobias Zwick
cbff400fe7
merge
2009-10-11 22:00:34 +02:00
Tobias Zwick
669db3fe6e
docs updates, complete new player controls ~work, SetCursor returns false if trying to select a disabled crew member, HUD fixes
2009-10-11 21:44:40 +02:00
Felix Wagner
2e5ffec460
Clonk script's cleanup
...
Sourced context menu and auto production out
Renamed Helpers.c4d as Libraries.c4d
2009-10-11 15:14:23 +02:00
Tobias Zwick
f584896446
merge
2009-10-08 20:51:31 +02:00
Richard Gerum
d33dab4189
added toolsworkshop, steam engine, windmill, lorry and new energy system (Maikel)
2009-10-05 21:17:50 +02:00
Tobias Zwick
ec6f31d5ea
Added sounds from Ape, Clonkonaut and Ringwaul from the sound workshop
2009-09-29 20:22:06 +02:00
Tobias Zwick
59fac2e516
Added sounds from Ape, Clonkonaut and Ringwaul from the sound workshop
2009-09-29 20:14:08 +02:00
Nicolas Hake
3b965e6dde
Backed out dafe315bddff
2009-09-26 22:02:46 +02:00
Charles Spurrill
b8a7558b34
Replaced CR hammer graphics
2009-09-26 11:52:17 -07:00
Charles Spurrill
e9f72f6b61
Replaced the CR hammer graphics
2009-09-23 21:37:46 -07:00
Armin Burgmeier
778ec7278f
Merged default into mesh
2009-09-19 13:13:10 -04:00
Armin Burgmeier
809c2234cd
Merged alphafix into default
...
This reverts the meaning of alpha components everywhere in engine and script.
alpha=0 means transparent, and alpha=255 means opaque.
2009-09-19 12:08:09 -04:00
Richard Gerum
d814267a46
added script function CanConcatPictureWith to make the picture stack in the sell menu like in the old engine menu
2009-09-05 18:28:55 +02:00
Richard Gerum
3dcf5002ee
fixed clonk contextmenu (still used SetCommand(this...))
2009-09-05 15:47:19 +02:00
Richard Gerum
3bafed6225
now bases can block entrance of enemies.
2009-09-05 00:57:48 +02:00
Richard Gerum
53b4f9bf29
added new inventory system with slots
2009-09-04 21:46:27 +02:00
Richard Gerum
d21f7fff18
added earth chunk and tools
2009-09-04 21:45:44 +02:00
Richard Gerum
5449d22638
added base control object and homebasematerial/wealth control object (use MakeBase() to make a BaseBuilding a base, and use CreateObject(BASM) to activate the homebasematerial control)
2009-09-03 17:00:26 +02:00
Armin Burgmeier
0137936211
Merged alphafix into mesh
2009-08-27 21:52:10 -04:00
Armin Burgmeier
4fa029df2c
Merged default into mesh
2009-08-27 21:35:55 -04:00
Armin Burgmeier
4423b5dcb4
Reverted change of Logo.png by previous commit
...
This was accidentally committed. It was used for debugging only.
2009-08-23 19:43:03 -04:00
Armin Burgmeier
4573315d42
Reverted meaning of alpha: Now 255 is opaque and 0 is transparent
...
Shader and D3D remains to be adapted yet.
2009-08-23 17:46:56 -04:00
Sven Eberhardt
df6010a148
merge
2009-08-12 17:27:43 +02:00
Tobias Zwick
0a86ab4331
crew selector hud - without update, without click functionality
2009-08-12 16:32:38 +02:00
Nicolas Hake
276a5abfed
Removed default-this object parameter from a lot of functions
2009-08-12 22:44:09 +02:00
Sven Eberhardt
4b6f1ec264
crash fix
2009-08-11 23:12:36 +02:00
Sven Eberhardt
81e9b612b1
merge main branch into PlrCtrl branch
2009-08-10 16:07:14 +02:00
Armin Burgmeier
6da0846c87
Merged default into mesh
2009-07-27 21:49:33 -04:00
Nicolas Hake
40a3c80093
Planet: Fix syntax errors
...
Spell aiming had to go unfortunately, because it depended on some stuff
we don't have. Should implement this outside of the main Clonk code though.
2009-07-26 23:16:50 +02:00
Günther Brammer
fc5c384681
Material: Remove color field, use textures as is
...
This also removes ColorByMaterial, which was alread unused in CE and CR.
2009-07-24 23:50:04 +02:00
Tobias Zwick
38df8e085b
Sand with a texture
2009-07-23 22:16:50 +02:00
Armin Burgmeier
a4d094034d
Apply ClrMod to mesh graphics
2009-07-22 21:11:39 -04:00
Tobias Zwick
9adc3e490f
Sir, we found gold!!
2009-07-23 01:01:04 +02:00
Tobias Zwick
a634cebeab
documentation of the functions in System.c4g
2009-07-22 19:04:47 +02:00
Tobias Zwick
0efc4bd8df
merge
2009-07-22 16:26:38 +02:00
Tobias Zwick
7155e38ecb
more cleanup
2009-07-22 15:27:49 +02:00
Nicolas Hake
9c59007af4
Removed obsolete C4Script functions, moved others to System.c4g
...
Functions moved to System.c4g:
ExtractLiquid, FlameConsumeMaterial, LaunchEarthquake,
LaunchLightning
Functions removed:
LaunchVolcano, Var, SetVar, IncVar, DecVar, SetLocal, SetGlobal,
ObjectCall, Set, Inc, Dec, GetColor, SetColor
Functions renamed:
GetColorDw -> GetColor
SetColorDw -> SetColor
GetPlrColorDw -> GetPlrColor
2009-07-22 08:48:39 +02:00
Nicolas Hake
c7b8eee8b4
Dynamite: Actmap to proplist
2009-07-22 05:59:21 +02:00
Günther Brammer
893cd20109
Merge branch 'proplist'
2009-07-21 16:46:39 +02:00
Nicolas Hake
aa744e69d8
Explosion: Use nil instead of 0 where appropriate
2009-07-20 22:41:22 +02:00
Tobias Zwick
10e6174b1f
FadeDelay for longer-lasting particles
2009-07-15 15:41:03 +02:00
Tobias Zwick
379bb5b882
Syntax fix & Dynamite fix
2009-07-15 14:50:46 +02:00
Tobias Zwick
ba971abc22
Cleaning up: removing obsolete functions and its documentation (part 2)
2009-07-15 14:42:48 +02:00
Tobias Zwick
e74c484aa9
Cleaning up: removing obsolete functions and its documentation
2009-07-15 14:41:34 +02:00
Tobias Zwick
4b3357dfd7
The explosion is even a little bit more beautiful (with sparks) ;-)
2009-07-15 12:05:03 +02:00
Tobias Zwick
7375aa4f2e
Dynamite from szen.c4s (completely rescripted though) and spark from Hazard
2009-07-15 02:00:26 +02:00
Tobias Zwick
fe1fa8e729
renewed explosion: volume-smoke, Hazard-smoke-trails, a little bit better explosion graphic
2009-07-14 18:50:05 +02:00
Armin Burgmeier
bbc8fa98db
Added animations for mesh objects
2009-07-12 16:27:04 +02:00
Armin Burgmeier
3760771ee5
Read material alpha components in the way clonk needs them
2009-07-11 12:36:53 +02:00
Armin Burgmeier
41f5a3d069
Added Monster as a test object
2009-07-11 01:11:29 +02:00
Nicolas Hake
643eb5ee8c
Fixed invalid UTF-8 sequence in LangDE
2009-07-03 02:31:06 +02:00
Sven Eberhardt
f34c2d79bc
Moving controls to script: Dig + Throw
2009-06-15 22:48:53 -04:00
Sven Eberhardt
943b47ebd5
Moving controls to script: Clonk movement
2009-06-15 20:38:39 -04:00
Sven Eberhardt
f6fadb300d
Moving controls to script...
2009-06-09 19:29:16 -04:00
Günther Brammer
535bdc92e0
convert game data
2009-05-17 03:50:12 +02:00
Nicolas Hake
979a5362a7
Removed Logo due to trademark concerns
2009-05-10 16:54:46 +02:00
Günther Brammer
a973682315
snow and ice textures
...
committer: Günther Brammer <gbrammer@gmx.de>
2009-05-09 17:19:50 +02:00
Günther Brammer
67bab6723d
Initial set of game data
...
This mainly consists of old Clonk Rage stuff, with some placeholders
and new material textures.
committer: Günther Brammer <gbrammer@gmx.de>
2009-05-09 17:19:46 +02:00
Günther Brammer
abe1bad6bd
Add a global variable holding a prototype for actions
...
Either the engine or the script part of this should be replaced later.
2009-04-28 21:45:42 +02:00
Günther Brammer
c420a3bf3b
C4Value does not store C4IDs anymore
...
Instead, C4IDs are converted from/to C4PropLists. This will have to change,
of course.
Objects can be created from prototypes which only inherit from C4Def
2009-04-12 14:04:28 +02:00
Günther Brammer
b9f398b111
Replace C4ActionDef with C4PropList
...
C4Object now stores a pointer to a C4PropList instead of the Name and Number
of a C4ActionDef in the ActMap of the Object's definition.
2009-04-12 14:03:14 +02:00