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

6187 Commits (82e674ddb849789b7018d417e74ea50440d66525)

Author SHA1 Message Date
Richard Gerum cba2b23312 fixed bow walk synchronisation with ground 2010-02-28 18:23:38 +01:00
Richard Gerum 0d82b29f38 fixed riding (#173) 2010-02-28 17:37:07 +01:00
Sven Eberhardt 8f83d4853e fix additional def graphics name and zoom (#100) 2010-02-28 14:35:48 +01:00
Charles Spurrill f617bb3a8f Fixed up all the elements of time to work properly 2010-02-27 15:15:32 -08:00
Charles Spurrill fa07532668 #164 2010-02-27 11:33:59 -08:00
David Dormagen 973ffa53f1 line ending fix 2010-02-27 12:15:06 +01:00
David Dormagen b8db25c300 basic melee weapon stuff 2010-02-27 12:02:37 +01:00
Richard Gerum 4d866a213f added bow walk animations 2010-02-26 14:35:58 +01:00
Charles Spurrill 5983b01f93 implemented a day to night 24-hour time system 2010-02-25 22:18:06 -08:00
Tobias Zwick 86178ad3ef small hud fix 2010-02-25 22:46:05 +01:00
Tobias Zwick 2b78a02038 ++robustness for the HUD 2010-02-25 13:14:00 +01:00
Tobias Zwick ab7a8aac5c clonk now turns automatically during UseHold. No need for that in the singe weapons anymore 2010-02-25 12:47:13 +01:00
Richard Gerum 780240bef3 updated bow aim animation 2010-02-25 11:50:03 +01:00
Tobias Zwick 667386e672 remove debug logs 2010-02-25 00:06:25 +01:00
Tobias Zwick 408b92f394 gamepad controls updated 2010-02-24 23:53:17 +01:00
Tobias Zwick 028456affe removed some old control stuff from the gui 2010-02-24 18:52:58 +01:00
Tobias Zwick 31290c08f6 fixed javelin bug 2010-02-24 18:52:21 +01:00
Tobias Zwick d9fa2eb60e LF line endings!!!!! 2010-02-24 16:45:25 +01:00
Tobias Zwick f20906887c new sounds and effects; javelin adjustments (run to throw far) 2010-02-24 15:31:00 +01:00
Tobias Zwick 9da5a4f0c6 sounds for musket and bow 2010-02-24 00:32:09 +01:00
Richard Gerum c733884bf9 clonk holding the shovel the right way (#149) 2010-02-23 22:42:05 +01:00
Richard Gerum 3a18f4d41f added throw animation 2010-02-23 19:51:29 +01:00
Tobias Zwick 5b960171f1 analog stick adjustments 2010-02-23 19:22:32 +01:00
Tobias Zwick 811c36a200 stackable display fix 2010-02-23 18:51:40 +01:00
Richard Gerum b3c813195e fixed bug (#162) clonk now unmounts properly 2010-02-23 17:18:12 +01:00
Richard Gerum f588a8723e fixed pictures of mesh objects 2010-02-23 16:52:46 +01:00
Tobias Zwick adb95f9635 proper authors/license structure. See AUTHORS 2010-02-23 13:03:30 +01:00
Tobias Zwick 5c109117fe Texture changes, authors.txt structure, fixed #160, ControlJump for attached objects 2010-02-23 12:50:14 +01:00
Richard Gerum c1aa47c237 ingame pictures of objects half working (meshes seem not to work and overlaid pictures) 2010-02-23 00:56:34 +01:00
Tobias Zwick 68d0b9cbfa interface changed: ControlStop(clonk,control) 2010-02-22 18:48:12 +01:00
Richard Gerum 19072d8be6 priming wire has now fixed length and warning 2010-02-22 17:03:26 +01:00
Charles Spurrill 713818fca1 added bubble effect 
The clonk likely needs an "enter-liquid" callback, though
 2010-02-21 18:36:03 -08:00
Richard Gerum 881b3bd7ff args lineendings... 2010-02-22 01:32:38 +01:00
Richard Gerum 7e08450052 added cool priming wire effect for the dynamit box 2010-02-22 01:18:45 +01:00
Tobias Zwick 21ffcf864d #156 2010-02-21 21:53:45 +01:00
Richard Gerum 0cf99ebfd8 dynamit placement now makes use of the mouse 2010-02-21 20:55:25 +01:00
Tobias Zwick 87c3ec1374 more cleanup, added new flint and metal graphics, fixed SetGraphics... 2010-02-21 20:15:45 +01:00
Tobias Zwick a5704e59cb deleted obsolete graphics and objects, cleaned up and ordered them 2010-02-21 18:43:02 +01:00
Charles Spurrill 62d01cadc5 functional hammer! :D needs serious improvement, though 2010-02-21 00:39:41 -08:00
Richard Gerum b8ad5374fd musket animation works 2010-02-21 00:53:49 +01:00
Charles Spurrill 64f3f132af musket bugfixes 2010-02-20 15:17:46 -08:00
Richard Gerum 5275f1f63d added jar of winds model and musked model 2010-02-20 23:54:17 +01:00
Tobias Zwick dcff2fd95b dualshock gamepad controls, no throw on Use 2010-02-20 17:48:07 +01:00
Richard Gerum 6d01638ae8 first musket animations 2010-02-20 16:08:52 +01:00
Charles Spurrill 9d9416c80e Updated resources again 2010-02-19 22:17:58 -08:00
Richard Gerum 1e05ca863e added kneel down animation 2010-02-20 00:54:45 +01:00
Charles Spurrill 6be118c0dc updated javelin damage 2010-02-19 15:28:13 -08:00
Richard Gerum 01c55c41bc High resolution Sparks Graphic for Checkpoints 2010-02-19 23:17:54 +01:00
Günther Brammer 5d05efefc4 Remove CollectionLimit 
Use RejectCollect instead.
 2010-02-18 21:47:11 +01:00
Richard Gerum b9cdab2769 updated javeling animation 2010-02-19 23:01:18 +01:00
Charles Spurrill 0d936c41f5 updated grass 2010-02-19 13:45:05 -08:00
Richard Gerum 460c317bcf added spear animations 2010-02-19 19:41:49 +01:00
Charles Spurrill ef73ae9388 Added grass and fixed musket bug 
The musket can't shoot through walls or into solid terrrain anymore.
 2010-02-18 21:13:14 -08:00
Tobias Zwick ad409d5090 even more cleanup 2010-02-19 00:49:27 +01:00
Tobias Zwick 25a6eb1c94 inventory system changes, removed Explode() from the engine, granite != Paint spray can 2010-02-18 22:22:58 +01:00
Charles Spurrill f3c42a7917 new shovel graphics 2010-02-16 18:33:19 -08:00
Tobias Zwick e6f9e28868 control fixes, new fliint 2010-02-17 00:14:46 +01:00
Tobias Zwick 56717aea63 boompack: hitcheck and better jumping off 
clonk: can do a forward jump when running (less high, more far)
 2010-02-16 21:48:44 +01:00
Richard Gerum 221dade57f cool boompack ride animation 2010-02-16 12:03:30 +01:00
Tobias Zwick e665a75693 boompack adjustments 2010-02-16 00:45:06 +01:00
Tobias Zwick 6d9bb5a869 fixed maxcontentscount error 2010-02-16 00:33:38 +01:00
Richard Gerum e78bb8cff8 fixed the scale of the boompack 2010-02-15 23:53:06 +01:00
Tobias Zwick cfb99756c2 boomrace update #2 2010-02-15 21:55:40 +01:00
Tobias Zwick d27e05fddd boomrace update 2010-02-15 21:51:26 +01:00
Tobias Zwick 2db2ccf523 colorful explosions & boomrace. I want to test this now - who is in? 2010-02-15 20:03:17 +01:00
Asmageddon e394f11a31 Some new dynamic parkour landscapes 2010-02-15 19:56:05 +01:00
Tobias Zwick 1694226fc1 sheesh! (utf8->ansi) 2010-02-15 18:08:30 +01:00
Tobias Zwick 4f4a8b1fe0 CRLF! 2010-02-15 18:03:49 +01:00
Tobias Zwick ee95f0a65e CRLF 2010-02-15 18:00:03 +01:00
Tobias Zwick fafdfd8f13 boompack with fireworks explosion 2010-02-15 16:41:22 +01:00
Charles Spurrill a219230f95 added javelin weapon 2010-02-15 00:17:25 -08:00
Sven Eberhardt 1171f857d2 fix Clonk stuck in bridge animation if bridge was cancelled in first frame 
allow bridge start in SCALE (will cancel if not near ground)
 2010-02-14 12:27:19 +01:00
Sven Eberhardt 6b1e928f97 digging: prevent a few unwanted sidewards jumps 2010-02-14 11:54:36 +01:00
Charles Spurrill 823e29d635 fixed resources 2010-02-14 00:17:47 -08:00
Charles Spurrill a0b0e8d840 added AlteredARMOR's resource graphics 2010-02-13 23:10:48 -08:00
Richard Gerum 1f889a6e06 changed scale system (all modells now use the scale they had in blender) and rexported all meshes with new scale 2010-02-13 20:57:57 +01:00
Charles Spurrill 7cf502ac03 boompack bugs fixed 2010-02-13 11:14:06 -08:00
Charles Spurrill 28b0ae5938 added boompack 2010-02-13 00:03:35 -08:00
Richard Gerum c4c3800973 added dynamite box 2010-02-13 00:33:00 +01:00
Peter Wortmann 1aff82edb7 Quick test scenario for 50% Clonk. 2010-02-12 19:08:05 +01:00
Charles Spurrill b2f85fa743 updated telekinesis 2010-02-11 22:19:21 -08:00
Richard Gerum 4c25e7d8ab works on turning behavoir of the clonk 2010-02-11 10:10:06 +01:00
Charles Spurrill 8f0dcabd8b added telekinesis orb and ice 
the orb just needs a magic variable which is spent and recharged
 2010-02-11 00:25:12 -08:00
Richard Gerum 8eb37d74e7 fixed dig display bug (clonk was holding the shovel in a wrong way) 2010-02-10 00:02:23 +01:00
Richard Gerum 7418c9bc3e added club with clonk animations for aiming and striking 2010-02-09 23:17:06 +01:00
Sven Eberhardt 3bea3bb083 dig rework: Continue digging after action loss if possible; allow dig start from several attachment actions 2010-02-09 22:29:48 +01:00
Sven Eberhardt 15713eabb3 loam bridge retain IFT and dont draw over higher density (#85, #125) 2010-02-09 20:09:32 +01:00
Sven Eberhardt feaa68cbe5 reimplement object menu controls (#77) 2010-02-08 21:52:46 +01:00
Richard Gerum 765da76033 fixed tumble action 2010-02-07 16:03:17 +01:00
Richard Gerum 10d65c410a dig works 2010-02-07 15:40:49 +01:00
Richard Gerum ff6db8e9cb works on clonk turn (no more flipdir) 
dig animation shovel position corrected and speed depends now on the animation
bow automatic turn the clonk when aiming in the other direction
 2010-02-07 12:48:35 +01:00
Armin Burgmeier 406dc7c734 Implement perspective rendering 2010-02-06 18:33:30 +01:00
MimmoO f14a984a23 *MJOW works again; also fixed "104%"-bug 2010-02-06 18:14:08 +01:00
Maikel de Vries 2d7da7022a Parkour direction arrow + some minor changes. 2010-02-06 17:04:49 +01:00
Tobias Zwick 90ace028b8 first working version of the gamepad controls 2010-02-04 16:44:01 +01:00
Tobias Zwick 4e5ed174ac first working gamepad controls! 2010-02-04 02:08:21 +01:00
Tobias Zwick 439bc56aec started Gamepad controls 2010-02-02 16:09:56 +01:00
Nicolas Hake fa28c4e1c7 Revert animal graphics to e6c4a495a318 
Tip: You don't actually have to convert line endings in binary files.
The repository server is intelligent enough to notice they're not text.
 2010-02-02 14:38:59 +01:00
Maikel de Vries 6d873edc6f Update Parkour graphics, got rid of some Translates. 2010-02-01 23:36:16 +01:00
Maikel de Vries 184b463a39 Parkour(some bugfixes and new features). 2010-01-31 21:31:04 +01:00
Richard Gerum a74e1d2c06 added turn animation 2010-01-30 20:09:33 +01:00
Tobias Zwick 20e131057a out, you devils of the past! 2010-01-30 15:14:59 +01:00
Tobias Zwick d98e1095b6 hud graphics: hotkey stays the same size; instead its the title image which stretches 2010-01-30 14:46:56 +01:00
Richard Gerum 26c1b5c506 works on the bow animations and carry system 2010-01-29 23:29:42 +01:00
Armin Burgmeier 5101d10e37 Added cull_hardware setting to material scripts, make bow string visible 
By not culling it. See Bug #120.
 2010-01-29 15:58:33 +01:00
Richard Gerum 81d85ab6d9 bow aim and load animations now with animated bow and arrow 2010-01-29 00:04:39 +01:00
Maikel de Vries 61fc2bf1aa Parkour update, old race goal removed, fixed ID errors. 2010-01-28 14:47:35 +01:00
Armin Burgmeier 1c1ec4beba Added a Dvorak control set 2010-01-27 22:36:27 +01:00
Armin Burgmeier 5131dea942 Make animations of attached meshes actually work 2010-01-27 21:03:24 +01:00
Richard Gerum 33b6865ad6 added load and fire animations for the bow (don't work ingame yet) 2010-01-27 17:17:27 +01:00
Tobias Zwick fc74f6df04 CRLF 2010-01-27 01:13:12 +01:00
Tobias Zwick c122cadbd2 Test scenario for funny things 2010-01-27 01:10:52 +01:00
Armin Burgmeier 8b3eb2b30e Allow attached meshes to use an arbitrary transformation (#116) 2010-01-26 22:42:12 +01:00
Richard Gerum 100866ac51 added carry system 2010-01-26 00:07:15 +01:00
Nicolas Hake 66d3133d98 Fix some syntax errors due to missing C4IDs 
These were introduced by 048314d11ad0. Some more unknown IDs
still exist but were left untouched since they are mandatory IDs,
in my opinion.
 2010-01-25 18:36:24 +01:00
Nicolas Hake 34fedb9ade Removed Magic.c 
We don't have any spells, and we don't have any alchemy either.
Might bring it back once it gets acute, and nobody wants to rewrite
it.
 2010-01-25 18:26:08 +01:00
Nicolas Hake c99c3d7a94 Allow empty icons for AddMenuItem 2010-01-25 16:54:38 +01:00
Maikel de Vries b8ba66ed5b Basic melee goal. 2010-01-25 16:30:25 +01:00
Tobias Zwick 52c001a1c7 Merge 2010-01-25 18:15:16 +01:00
Maikel de Vries 46d097ea9b Update for Parkour goal. 2010-01-25 16:14:52 +01:00
Richard Gerum d5266bc5d8 added shield 2010-01-25 08:56:28 +01:00
Charles Spurrill 475df889b8 wind-jar graphic fix 2010-01-24 20:13:50 -08:00
Tobias Zwick eb0ee0bc5d Merge 2010-01-25 01:13:11 +01:00
Tobias Zwick d78c12427e an inherited... 2010-01-25 01:07:42 +01:00
Armin Burgmeier 4a951c75ff Remove debug code in Wind generator script 2010-01-24 23:12:27 +01:00
Richard Gerum ef1efdc0c8 added two strike animations (for Zapper) 2010-01-24 17:17:13 +01:00
Armin Burgmeier d35f85d4aa Added Anim_Action 2010-01-24 17:16:21 +01:00
Richard Gerum 6f2e47e73a added shovel mesh and dig animation (still buggy) 2010-01-24 22:38:29 +01:00
Richard Gerum ca8e5ee2c2 fixed clonk 2010-01-24 18:05:21 +01:00
Richard Gerum bb0e92555e material script error fixed 2010-01-23 23:17:50 +01:00
Richard Gerum cc921d3af9 fixed animations and added bow aim animation 2010-01-23 23:08:22 +01:00
Tobias Zwick 7b6cb70b48 loamfix, inventory-callback fix 2010-01-23 19:17:20 +01:00
Nicolas Hake af827da45d Merge 2010-01-23 17:52:07 +01:00
MimmoO 19862f0a9b Boomshire complete, except for the viallge 2010-01-23 16:38:53 +01:00
Richard Gerum 19626dc16a added sword and sword animation 2010-01-23 16:20:22 +01:00
Armin Burgmeier 1a77c180e8 Remove debug logs when hangling 2010-01-23 12:53:05 +01:00
Armin Burgmeier 5dcf92121d Introduce animation stack, adapt existing scripts 2010-01-22 19:27:02 +01:00
Maikel de Vries eaab9e528f Parkour(Race) Goal with checkpoints(work in progress...) + Scenario(Parkour.c4f) 2010-01-22 17:20:24 +01:00
Tobias Zwick 995b20cad9 updated controlUse-system, fixed (&simplified) musket & bow 2010-01-22 17:29:46 +01:00
Nicolas Hake 94a52c6d0e Implemented lightning strikes 2010-01-22 08:51:41 +01:00
Nicolas Hake bc65db2130 Remove Launch* functions 
Launch* has been removed from System.c4g/C4.c because they should be part of
the script of the effect they create.
 2010-01-22 04:41:28 +01:00
Nicolas Hake 58a5a0ea84 Remove spurious .rar file 2010-01-22 04:39:33 +01:00
Nicolas Hake dfe5a7820f Object acquisition: Check availability by CONNECT procedure 2010-01-22 04:36:56 +01:00
Nicolas Hake 37ab674acb Implement Find_Procedure(int procedure) 2010-01-22 04:30:38 +01:00
Charles Spurrill 05ee19b152 musket tweaks 2010-01-21 16:21:30 -08:00
MimmoO 247fa6e372 forgot the line endings... 2010-01-21 18:20:51 +01:00
MimmoO a2db1c4555 Improved the jar of winds, fixed bugs and difficulties in boomshire, new section in boomshire 2010-01-21 18:18:11 +01:00
MimmoO ae57d6ff1d windjar hotfix 2010-01-21 16:38:36 +01:00
MimmoO 69187238ca ..... 2010-01-21 16:09:58 +01:00
MimmoO 88026f16e4 ... 2010-01-21 16:03:14 +01:00
MimmoO 7446d01096 Merge .. 2010-01-21 15:52:57 +01:00
MimmoO 846d1bdc43 +Boomshire, testgin scenario 2010-01-21 15:49:19 +01:00
MimmoO ef050fb911 Shoop de woop, magic jar of wind 2010-01-21 15:21:54 +01:00
MimmoO 52fff0a0fa Added magical jar of wind + boomshire (testing scenario for two players [not yet tsted :<]) 2010-01-20 21:21:23 +01:00
Charles Spurrill 1cc30e5198 musket improvements & bugfixes 2010-01-19 22:18:44 -08:00
Charles Spurrill be465b0bc0 reformed musket script, +shot ammo 2010-01-19 16:25:02 -08:00
Tobias Zwick 9b1954723a material texture: ice and hudfix 2010-01-19 21:44:35 +01:00
Tobias Zwick 6cccbeeb23 Merge 2010-01-19 11:35:35 +01:00
Tobias Zwick cbca478984 loam fix 2010-01-19 11:35:15 +01:00
Charles Spurrill 3d3d3d3235 removed useless projectile-weapon library, musket seriously improved 2010-01-17 22:10:13 -08:00
Tobias Zwick 3320ab1a02 minor fixes and improvements on the bow 2010-01-18 02:58:46 +01:00
Tobias Zwick 8ed5e29768 using fixes 2010-01-17 19:15:08 +01:00
Tobias Zwick 1ff6b7f235 LF line endings 2010-01-17 18:47:03 +01:00
Tobias Zwick 122a73a438 Bow and arrow done: 
+ ExtraSlot works
+ bow and arrows
+ Stackable works
+ HitCheck effect in System.c4g/HitChecks.c
 2010-01-17 18:43:46 +01:00
Charles Spurrill 1ff9850309 Projectile weapon library added and improved 2010-01-14 18:07:50 -08:00
Tobias Zwick a0a03a62c9 extra slot object (forgot to commit) 2010-01-14 23:49:09 +01:00
Tobias Zwick 421365c913 a few movement tests 2010-01-13 20:18:24 +01:00
Tobias Zwick b381b54523 http://forum.openclonk.org/topic_show.pl?tid=324 2010-01-13 00:29:17 +01:00
Tobias Zwick 30841b2068 more selection/deselection calls 2010-01-12 23:30:25 +01:00
Tobias Zwick e2edec7fd7 Selection and Deselection gets called on D&D 2010-01-12 22:06:20 +01:00
Richard Gerum 1eaa0d9b45 hmm lineendings again... 2010-01-12 09:39:40 +01:00
Richard Gerum 78596d7e75 added wolf mesh 2010-01-12 09:30:36 +01:00
Richard Gerum 1b58885145 added WalkGround animation for test purpose with bone "Ground" 2010-01-10 23:37:46 +01:00
Richard Gerum 085f22a169 added turning animation for run and stand 2010-01-09 20:43:43 +01:00
Richard Gerum 87f38733aa added swim and dive behavoir for clonk 2010-01-08 00:04:23 +01:00
Sven Eberhardt afc0fcfc78 chunk of gold renamed 2010-01-06 18:47:46 +01:00
Sven Eberhardt f08425ddc8 fix GOLD name 2010-01-06 18:46:54 +01:00
Sven Eberhardt 6cf5e09158 skyrace: hangling, loam and dynamite sections added 2010-01-05 18:38:34 +01:00
Tobias Zwick 10356742f7 tiny update for the hud and tool control 2010-01-05 17:05:02 +01:00
Richard Gerum 7ba35136c8 windmill and lorry fixed 2010-01-05 11:23:56 +01:00
Sven Eberhardt 2c75c30622 reset scroll view on keyboard command 2010-01-04 13:59:47 +01:00
Armin Burgmeier f2f5df66fa Merge default into mesh 2010-01-04 03:02:26 +01:00
Armin Burgmeier b7aa7ea5e3 Fix a few minor things which were broken by the merge 2010-01-04 02:42:10 +01:00
Armin Burgmeier fb95c3af2e Merge mesh into default 2010-01-04 01:10:31 +01:00
Richard Gerum 2a158b54dd added hangle animation and behavoir 2010-01-04 00:58:33 +01:00
Sven Eberhardt a00b741611 allow throw during jump/dive; add container speed for throw 2010-01-04 00:36:55 +01:00
Armin Burgmeier d84b3c9038 Support texture blending operations, add player color to clonk material 2010-01-03 23:58:26 +01:00
Sven Eberhardt ff0c0a6c96 decrease NoCollectDelay on handled controls 
dont use up loam if bridge couldn't be started
 2010-01-03 23:28:20 +01:00
Tobias Zwick 71cdc8e681 lil hudfix 2010-01-03 23:31:51 +01:00
Tobias Zwick 675867518d HUD goal object 2010-01-03 23:17:59 +01:00
Tobias Zwick 39616c943e goal hud 2010-01-03 19:20:38 +01:00
Sven Eberhardt 8d093cd050 fix shovel-throwing 2010-01-03 23:16:35 +01:00
Sven Eberhardt e3553f8291 sky race 2010-01-03 20:18:25 +01:00
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