Armin Burgmeier
9326b94adb
Implement simple color operations in terms of the extended ones
...
The special implementation was wrong, and we need GL_COMBINE at least for
colour_op alpha_blend anyway. This fixes the tool workshop being rendered in
the player's color.
2010-01-04 02:33:45 +01:00
Armin Burgmeier
fb95c3af2e
Merge mesh into default
2010-01-04 01:10:31 +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
Armin Burgmeier
6deb3e9320
Skip comments in material scripts
2010-01-03 23:52:09 +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
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
Armin Burgmeier
7b022d88ea
Make sure to load the exact texture that is requested, not a scaled one
...
Don't load Overlay.3.png if Overlay.png is asked for
2010-01-02 23:11:13 +01:00
Sven Eberhardt
3ac6dd25cd
fix mesh build for MSVC
2010-01-02 19:40:32 +01:00
Günther Brammer
4f08312df7
Script: Music() no longer overwrites the music settings of the user
...
If you want to stop music, you need to use SetPlayList() with a nonempty
playlist which matches no music files, " " is usually a good choice.
2010-01-02 17:33:58 +01:00
Günther Brammer
702db9dfc2
Add missing includes to C4DefGraphics.cpp
2010-01-02 17:56:19 +01:00
Armin Burgmeier
fbc6b6596a
Remove newlines from mesh/material error logs
2010-01-02 03:49:14 +01:00
Armin Burgmeier
1682dc3f78
(Mostly) honor tex_address_mode, tex_border_colour and filtering
...
Also don't load materials which produced an error while loading
2010-01-02 03:26:47 +01:00
Armin Burgmeier
56ad75ce73
Load tex_address_mode, tex_border_colour and filtering from material scripts
2010-01-01 22:20:17 +01:00
Armin Burgmeier
38a225abaa
Enable backface culling
2010-01-01 16:03:56 +01:00
Armin Burgmeier
394e023bbb
Fix alpha blending; use glInterleavedArrays
2010-01-01 15:26:54 +01:00
Armin Burgmeier
6bc38aa01b
Compute inverse CoordCorrection matrix directly
2009-12-31 18:18:58 +01:00
Armin Burgmeier
da17b5a82d
Apply bone translation in keyframes correctly
2009-12-31 16:25:22 +01:00
Tobias Zwick
25c670041b
buildfix
2009-12-31 02:48:43 +01:00
Armin Burgmeier
e66de9ba49
Fix the debug build
2009-12-30 23:13:31 +01:00
Armin Burgmeier
7c5619646c
Allow a mesh to play multiple animations at the same time
2009-12-30 21:41:56 +01:00
Armin Burgmeier
6c00302928
Skip preanimate step; compute transformations in realtime
...
This allows multianimations, and does not suffer from child bones being
animated at a higher resolution than parent bones
2009-12-30 17:47:55 +01:00
Armin Burgmeier
1f1c7902c3
Reset texture matrices before rendering a texturized mesh
2009-12-29 18:37:28 +01:00
Günther Brammer
bf1b347d1a
netio error message fix
2009-11-03 00:59:27 +01:00
Günther Brammer
75ae48f984
OpenGL: Cleanups
2009-10-26 00:05:16 +01:00
Günther Brammer
e592ca643c
Move prototypes back to C4Prototypes.h
2010-01-02 01:19:42 +01:00
Günther Brammer
d4cb25cf39
Reorganize C4Include.h and Standard.h
...
All plattform stuff is now in Standard.h, while C4Include.h just includes
a bunch of headers. Mostly headers from the standard library, because
those change very seldom.
Also remove the ptrdiff_t typedef, properly include <cstddef> instead.
2010-01-02 01:11:54 +01:00
Günther Brammer
69acebe64a
Add missing includes to C4PlayerControl.cpp
...
Before, it only compiled with MSVC by accident.
2010-01-02 01:12:35 +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
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
8b4006da08
fix scheduler blocking by unblock proc
2009-12-31 18:10:55 +01:00
Sven Eberhardt
eee6c4ac4d
fix interactive thread
2009-12-31 17:01:45 +01:00
Sven Eberhardt
46bbbefc00
engine drag gfx rework
2009-12-31 15:50:42 +01:00
Nicolas Hake
07cd8b696c
C4RTF: Accomodate case sensitive file systems
2009-12-31 04:00:04 +01:00
Nicolas Hake
48986e9050
Rename C4RTF.h as well
2009-12-30 20:49:15 +01:00
Sven Eberhardt
6b89a5dd57
engine support for Drag+Drop in script (WIP)
2009-12-30 20:16:32 +01:00
Sven Eberhardt
f0e361e302
fix CID_PlrControl in network
2009-12-30 01:56:52 +01:00
Sven Eberhardt
46b39ce80f
fix PSF_PlayerControl lookup in global namespace only
2009-12-30 00:44:43 +01:00
Sven Eberhardt
21590e58c3
+ MouseSelectionAlt: Callback for right-click on C4D_MouseSelect objects
2009-12-29 18:54:39 +01:00
Sven Eberhardt
b80ae6daf5
fix GameMouse*Button* in DownKeys
...
add scenario local player controls
2009-12-28 14:36:06 +01:00
Sven Eberhardt
e53332b446
+ FnSetControlEnabled
2009-12-27 19:11:14 +01:00
Sven Eberhardt
89c461ec13
fix mouse selection of GUI objects
2009-12-22 22:10:42 +01:00
Sven Eberhardt
69c0d1f92a
fix right mouse button player control event
2009-12-22 21:16:08 +01:00
Nicolas Hake
5a704ede7a
Clear sectors after objects have been deleted (avoids assertion)
2009-12-22 18:19:51 +01:00
Nicolas Hake
945cd804fc
#59 : Fix crash on action change to empty NextAction
2009-12-21 13:50:42 +01:00
Nicolas Hake
1c11c4dd34
Merged PlrCtrl into default
2009-12-17 14:06:24 +01: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
Nicolas Hake
963dbe463b
#57 : Ensure global variable "Action" exists before assigning
2009-12-14 14:16:09 +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
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
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
mizipzor
a53dae0c1b
Fixed compilation in MSVC2010
2009-11-25 19:38:54 +01:00
Nicolas Hake
1a933780d4
Fix assertion and crash on game teardown ( #37 , #42 )
...
Also, the build works on linux again. Whee!
2009-11-25 16:04:32 +01:00
Nicolas Hake
9ef7fc0d96
Script: Expose string tables at runtime
...
Use Translate(string) to access the translation
2009-11-12 16:57:37 +01:00
Nicolas Hake
55c86b2001
MSVC: Re-enable deprecation warnings
...
The reason those were disabled have been warnings about not using MSVC's
"secure" CRT functions and non-standard-C POSIX functions. Those warnings
have been disabled selectively by command line macro definitions.
2009-11-12 14:14:08 +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
Nicolas Hake
83a1402c21
win32/gl: Window border hidden in plr mode only
...
Maybe it's a good idea to not hide the border of developer mode windows.
2009-11-04 23:11:21 +01:00
Nicolas Hake
89749eee5a
win32/gl: Enable switch to fullscreen in debug builds also
...
Furthermore, I've disabled the window frame while rendering with GL, because
switching from fullscreen to a window with a border and title bar tries to
draw under the border instead of in the client area only. I'm fully aware
this is a hackaround, but if you're using Windows and OpenGL while NOT
testing the mesh branch, it's your own fault.
2009-11-02 16:49:37 +01:00
Nicolas Hake
0dc14ae40e
win32: Unbreak fmod, remove MCI
...
USE_FMOD define renamed to HAVE_FMOD to bring it in line with HAVE_SDL_MIXER.
MCI removed since nobody was using it anyway, and half of its functions were
stubs.
2009-11-02 14:18:47 +01:00
Nicolas Hake
4bda27997c
win32: Allow windowed mode
...
Frontend dialogs aren't resized since they would have to be destroyed
and re-created in the current implementation; this should change to an
auto-layouter as in other widget toolkits.
This is an OS independent problem though.
2009-10-23 03:53:16 +02:00
Armin Burgmeier
49e607bab0
Added includes and forward declarations, fixing the build
2009-10-26 00:09:34 +01:00
Günther Brammer
cb01137562
X11: Be more careful regarding input
...
Also, use Xutf8LookupString instead of XmbLookupString and iconv.
2009-10-23 01:47:03 +02:00
Günther Brammer
442d5b2c58
X11: Flush requests after event processing
...
This fixes the "window manager thinks Clonk has hung" problem.
http://bugs.openclonk.org/view.php?id=3
2009-10-24 01:35:46 +02:00
Nicolas Hake
b3ab7fab5b
Strip down C4Include.h to encourage self-sufficient sources
2009-10-23 09:29:58 +02:00
Nicolas Hake
2217d78448
CR#2659/CR#2662: Add Find_Controller/Find_ActionTarget2
2009-10-23 08:14:49 +02:00
Nicolas Hake
8476695d25
#36 : win32/opengl: Notify gfx engine about res change
...
In debug builds, CStdGL didn't get notified about the new resolution when it
was changed at runtime, so the GUI assumed the old resolution to be still in
effect.
2009-10-23 00:04:49 +02:00
Nicolas Hake
8736ab11bc
Script: Allow \n, \x??, \??? escapes
2009-10-21 04:34:15 +02:00
Nicolas Hake
86e52a9295
#24 : C4Script: Allow strings of arbitrary length
2009-10-21 03:41:55 +02:00
Nicolas Hake
52bde5a579
Remove BIG_C4INCLUDE define
2009-10-20 06:21:12 +02:00
Nicolas Hake
f0fdf5e992
Prepare for precompiled headers
2009-10-20 05:39:24 +02:00
Nicolas Hake
7b2d506869
Remove unused DInput/DSound code
2009-10-20 04:33:05 +02:00
Armin Burgmeier
3b0d49e8c0
Fix WASD movement on X11
2009-10-20 01:04:07 +02:00
Armin Burgmeier
e2eb0446ee
Replace strnicmp by SEqualNoCase
...
The former is non-standard (my Linux doesn't have it)
2009-10-18 12:33:48 +02: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
9be7a2724a
added mouse support for scripted player controls
2009-10-17 17:53:26 +02:00
Sven Eberhardt
6ee52433b2
killed most of internal mouse control
...
fixed mouse selection category
2009-10-16 23:07:43 +02:00
Sven Eberhardt
1c941adddc
fix gamepad control
2009-10-16 16:23:17 +02:00
Armin Burgmeier
ab7890a307
Fixed the build on Linux
2009-10-15 23:43:29 -04:00
Nicolas Hake
92c2d41d1e
#45 : Make GFXOV_Mode_Action work again
...
This overlay mode was broken by the proplist change.
2009-10-14 23:44:18 +02:00
Sven Eberhardt
4237837bb3
experimental gamepad config
2009-10-14 23:29:27 +02:00
Sven Eberhardt
40f3fb87bd
X11 and SDL keyboard input processing accept case insensitive key definitions
2009-10-14 20:15:05 +02:00
Sven Eberhardt
064678c82e
display name of selected control set in player property dialog (temp solution)
2009-10-14 19:52:40 +02:00
Sven Eberhardt
87e0548bd0
PrefControl switched to new player control method
2009-10-14 18:46:22 +02:00
Richard Gerum
0dac409510
merged default into mesh
2009-10-14 16:42:23 +02:00
Nicolas Hake
314e106dbf
#40 : win32: Fix message filtering in StdScheduler
...
StdScheduler used a message filter that didn't match the messages that
using the task switcher generated, so it always waited for an input
or timer message before dispatching.
2009-10-14 01:41:27 +02:00
Nicolas Hake
a54d5e7488
#44 : Fix grabbing objects
...
C4Object::SetActionByName(const char*,...) didn't forward its parameters
to the SABN doing the real work.
2009-10-13 23:43:12 +02:00
Sven Eberhardt
fa01fbfb0c
config: portrait saving in player file disabled by default
2009-10-13 22:21:33 +02:00
Sven Eberhardt
8098b31bce
player control init: fallback to existing control sets if selected control set not found
2009-10-13 22:02:44 +02:00
Sven Eberhardt
15c95d5c57
allow local game player join from unpacked player file
2009-10-13 20:42:20 +02:00
Sven Eberhardt
af8a4d56b7
silenced some msvc warnings
2009-10-13 20:41:57 +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
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
cbff400fe7
merge
2009-10-11 22:00:34 +02:00
Tobias Zwick
025eec0e78
merge
2009-10-11 21:57:31 +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
Tobias Zwick
8e5bac5071
fixed missing includes
2009-10-10 19:30:18 +02:00
Nicolas Hake
a346811dff
[win32][devmode] Keep dialogs on VPs without HWND_TOPMOST
...
It's very annoying to have developer mode dialogs on top of everything else.
Keep them on top of the current viewport, but below other apps when OC isn't
the foreground.
2009-10-10 19:02:12 +02:00
Nicolas Hake
b75e3090a4
[win32][devmode] Use correct ShowWindow flags for editing dialogs
...
SW_* flags are not bitfields, but an enumeration of values.
The old code only worked by chance, since SW_SHOWNORMAL|SW_SHOWNA is actually
9, which in turn is the value of SW_RESTORE. Since it seems non-activated
normal window size is the expected behavior, the correct value to use is
SW_SHOWNOACTIVATE.
2009-10-10 11:17:58 +02:00
Tobias Zwick
f584896446
merge
2009-10-08 20:51:31 +02:00
Peter Wortmann
7ed1264518
Optimize rotated solid masks some more
2009-09-19 23:20:32 +02:00
Tobias Zwick
9d8afdddc5
new icon, no "redwolf design" copyright in exe file header
2010-02-16 20:43:54 +01:00
Günther Brammer
0edc000184
Fix Umlauts destroyed in undocumented changes in 469df5603842
2010-02-16 03:23:25 +01: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
Peter Wortmann
1aff82edb7
Quick test scenario for 50% Clonk.
2010-02-12 19:08:05 +01:00
Peter Wortmann
2f2065f456
Add missing file for Mac OS X build instead of defining stubs [Günther]
2010-02-11 14:19:13 +01:00
Sven Eberhardt
148dbdbb15
compile fix
2010-02-09 23:34:30 +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
Peter Wortmann
0335b9133a
Activated some stubs for SDL port. Someone should implement them in future, but for now it should at least compile.
2010-02-09 19:05:27 +01:00
Peter Wortmann
777ce66b5d
Reimplemented Soldat-like mouse scroll. Most likely needs a lot of additional works before it's usable.
2010-02-09 19:04:04 +01:00
Julius Michaelis
d402d1b9ef
Changed default masterserver
2010-02-08 22:33:21 +01:00
Sven Eberhardt
feaa68cbe5
reimplement object menu controls ( #77 )
2010-02-08 21:52:46 +01:00
Sven Eberhardt
c3cb64d6ea
fix player property dialog ( #129 )
2010-02-08 20:58:48 +01:00
Sven Eberhardt
73538f94ba
fix portraits in messages
2010-02-07 19:17:47 +01:00
Sven Eberhardt
4f96e19328
fix FrameDecoration
2010-02-07 18:50:28 +01:00
Sven Eberhardt
2b75615ba6
fix CustomMessage color
2010-02-07 18:18:25 +01:00
Armin Burgmeier
3aa9030340
Fix keyframe translation once more
2010-02-07 14:54:53 +01:00
Armin Burgmeier
406dc7c734
Implement perspective rendering
2010-02-06 18:33:30 +01:00
Martin Plicht
be2fa8a321
Resolve Objective-C++/C++ ambiguity
2010-02-06 16:52:08 +01:00
Armin Burgmeier
98294b7cd1
Distinguish nil from 0 for animation number in animation script functions
2010-02-06 12:21:24 +01:00
Armin Burgmeier
958c0fce60
Fix crash when setting invalid animation position via SetAnimationPosition
2010-02-06 11:34:53 +01:00
Armin Burgmeier
38fd9e29c0
Apply DrawTransform correctly on meshes rendered as pictures ( #123 )
2010-02-05 11:02:51 +01:00
Armin Burgmeier
778ec7278f
Merged default into mesh
2009-09-19 13:13:10 -04:00
Armin Burgmeier
38e6fa6022
Allow all supported image formats for mesh textures
2009-09-15 22:42:13 -04:00
Armin Burgmeier
0fea47bed3
Don't use texture reserved for FoW for mesh texturing
2009-09-11 21:11:54 -04:00
Armin Burgmeier
fe34708fd6
mesh: Implement texturing
...
We really need a proper way to handle lighting. The current way is way too
random and just chosen so that the objects I'm testing with look good.
2009-09-09 22:54:12 -04:00
Sven Eberhardt
4407fb040a
merge
2009-08-29 23:12:31 +02:00
Günther Brammer
95b4738d66
Fix mesh loading when the locale is not using . as decimal separator
...
This uses glibs g_ascii_strtod like the DrawTransform loader.
Engines without glib will need another solution, probably using
the C locale for numbers.
2009-08-29 17:56:47 +02:00
Armin Burgmeier
de00b5df53
Moved StdMesh headers to correct location, load meshes without skeleton
2009-08-27 22:41:23 -04: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
Sven Eberhardt
826621b555
minor fixes
2009-08-26 14:41:29 +02:00
Sven Eberhardt
acca4a204d
merge
2009-08-16 17:13:42 +02:00
Sven Eberhardt
df6010a148
merge
2009-08-12 17:27:43 +02:00
Sven Eberhardt
4db8b6c0a7
move C4PlayerControl.cpp/.h
2009-08-12 16:45:45 +02:00