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

536 Commits (be9c517d507adcd2b149162431c5d302e1d6fd28)

Author SHA1 Message Date
Armin Burgmeier aaaf553f32 Fix computation of animation position for actions (#265) 2010-04-25 23:20:00 +02:00
Günther Brammer e852c15944 Make StdBuf compile with g++ 4.5 2010-04-25 14:29:01 +02:00
Günther Brammer 3342509880 Fix a potential infinite loop in the landscape.txt interpreter 2010-04-25 14:27:06 +02:00
Nicolas Hake 46ece7030e Use <cmath> M_PI instead of own "pi" constant 
This solves a conflict with a definition with the same name within Apple SDK
headers (thanks, Mortimer)
 2010-04-24 17:40:41 +02:00
Nicolas Hake 9d672997bf Work around jpeglib weirdness 2010-04-24 14:35:37 +02:00
Armin Burgmeier c6ca0bb2d8 Make sure to use same boolean size in Clonk and libjpeg 2010-04-23 20:50:15 +02:00
Armin Burgmeier bb2c4a8ab4 Define WINVER and others early to avoid redefinitions 2010-04-23 19:53:30 +02:00
Benjamin Herr 7f16a2a925 Fix deleting crew members from player menu (#255) 2010-04-22 16:48:44 +02:00
Benjamin Herr 56ce8fd83f C4PlayerControl: ctor-initializer in init order 2010-04-22 15:11:05 +02:00
Benjamin Herr 309971a142 C4Group.cpp: avoid dynamic format string 2010-04-22 15:05:25 +02:00
Benjamin Herr 224ab1b11b C4FileMonitor(win): use StdBuf::DeletePointer() 
... on memory GrabPointer()ed from a StdCopyStrBuf. Fixes the previous
commit.
 2010-04-22 14:27:15 +02:00
Benjamin Herr 838f0793ff C4FileMonitor(win): use free() instead of delete 
... on memory malloc()ed by a StdCopyStrBuf.
 2010-04-22 14:27:15 +02:00
TomyLobo 92e506f458 Changed C4GamePadControl::Execute() to C4GamePadControl::Execute(bool send_axis_strength_changes) to match declaration. 2010-04-22 11:39:13 +02:00
Sven Eberhardt 6158aec581 Removed internal score counting by player wealth/owned objects 
Unified and renamed all Points/Value/Score functions/field names into Score
Some MSVC warning fixes
 2010-04-21 21:12:49 +02:00
Günther Brammer 46640c4442 Clean up SolidMask code 
The temporary removals for landscape saving purposes now use the temporary
removal code of the solidmasks. SolidMasks remove themselves from the
landscape when deleted. A now superfluous argument to Remove() is removed.
 2010-04-20 22:38:18 +02:00
Günther Brammer bd9d2f0466 Make RotatedSolidmasks the default and remove the option 
Objects that really need this behaviour can reimplement it with
SetSolidMask.
 2010-04-20 18:01:40 +02:00
Günther Brammer 1e28c84de3 Script: Remove PlrMessage, object parameter from Message and PlayerMessage 
PlayerMessage and Message now require an object context and cannot display
global messages. CustomMessage can still create them if necessary.
 2010-04-16 00:45:30 +02:00
Günther Brammer b09fc47349 Remove unused operator from C4V_Data helper union 2010-04-15 23:00:07 +02:00
Nicolas Hake 5dc0d3b4cb Reduce value truncation warnings 2010-04-20 18:20:24 +02:00
Tobias Zwick 3e388973a7 shovel dust is colored like material that is digged out 2010-04-18 16:15:41 +02:00
Nicolas Hake bd8a5a997c GUI: Correctly display text input cursor 2010-04-19 15:46:08 +02:00
Armin Burgmeier a17bc1536e Add CMake check for HAVE_BOOLEAN 2010-04-18 23:12:49 +02:00
Nicolas Hake dea817f3a0 Add FMOD copyright message 2010-04-18 23:13:37 +02:00
Armin Burgmeier 70ac17c040 Mingw64 build fixes 2010-04-18 22:02:01 +02:00
Nicolas Hake 9bcaddbb37 Remove abandoned hgrevision resource 2010-04-18 19:49:33 +02:00
Armin Burgmeier a58b07d65f Rename keycode "Back" to "Backspace" so that it matches X11 2010-04-18 16:17:55 +02:00
Armin Burgmeier d8e8eab992 C4KeyCodeEx::String2KeyCode: Return KEY_Undefined instead of 0 if key not found (#233) 2010-04-18 16:15:51 +02:00
Sven Eberhardt 5c63082e19 Restored GetPlayerColor 2010-04-18 12:27:44 +02:00
Sven Eberhardt 39a9d10195 Dragging from regular landscape over selection areas does not initiate selection area drag (#69) 2010-04-18 10:51:50 +02:00
Sven Eberhardt 4ee3f9d011 Fix player color alpha after /plrclr change command (#254) 2010-04-18 10:18:16 +02:00
Armin Burgmeier 1a254b0445 Fix Windows build 2010-04-17 11:24:23 +02:00
Carl-Philip Hänsch 01156cc04d C4Group: Ignore *~ backup files 2010-04-15 22:24:34 +02:00
Armin Burgmeier f07327892a Don't remove local player messages when adding a global one (#138) 2010-04-15 17:39:21 +02:00
Sven Eberhardt b8b97ce42c Fix alpha of team colors and random player colors 2010-04-15 15:25:42 +02:00
Sven Eberhardt 7e1a041b32 fix crash on cursor coordinate send if a control is issued without a player viewport open 2010-04-11 13:42:07 +02:00
Sven Eberhardt 0767e3608e Implement optional cursor position as parameter to controls (#216) 2010-04-10 22:44:00 +02:00
Armin Burgmeier aae8f62813 Add GetAverageTextureColor C4Script function (#128) 2010-04-10 14:24:38 +02:00
Armin Burgmeier 57a2d20c4e Apply FoW to mesh graphics (#84) 2010-04-10 13:46:51 +02:00
Armin Burgmeier 164b0eb15f Show correct resolution in options dlg after resolution change (#230) 2010-04-08 15:06:49 +02:00
Tobias Zwick 2ca6c9d283 fixed wrong bracketing (ty Peter) 2010-04-07 22:22:22 +02:00
Peter Wortmann 98c34b4fd3 Fixed a few warnings about booleans 2010-04-07 03:12:28 +02:00
Benjamin Herr adc278dc57 Add array slicing syntax ary[begin:end] 
... which evaluates to a copy of the elements with indices in the range
[begin,end), where either index might be omitted, defaulting to 0 or the
length of the string respectively
 2010-04-05 17:41:36 +02:00
Armin Burgmeier ffcefc82d4 Make drawing meshes additively and with mod2 work (again?) 2010-04-05 17:02:41 +02:00
Armin Burgmeier 2efb1c2705 Fix inverted SolidMask (#132) 2010-04-05 14:38:25 +02:00
Armin Burgmeier 85b21133c1 Fix showing crew info and deletion of player files (#221) 2010-04-05 14:16:45 +02:00
Günther Brammer abdf54b01b Script: a["foo"] overwrote a 
C4AulExec::Exec passed the element on the stack to
C4PropList::GetPropertyVal which contained the reference to the variable
"a". C4Value::operator= follows this reference, so use Set() instead.
 2010-04-04 01:53:53 +02:00
Armin Burgmeier 4fd6f23809 Fix build with gcc 4.2 2010-04-03 12:44:59 +02:00
Nicolas Hake 73ec7de7b7 Clarify pointer ownership semantics 2010-04-03 12:35:12 +02:00
Armin Burgmeier babacbcc5f Implement material script inheritance 
abstract is not supported yet
 2010-04-02 22:49:39 +02:00
Benjamin Herr a339254617 Fix display of _CHANNELNOTALLOWED message 2010-04-02 16:07:04 +02:00
Benjamin Herr 8f3aaabf61 Let C4InteractiveThread post arbitrary functors 2010-04-02 16:06:45 +02:00
Armin Burgmeier 94389f3940 Fix build with MSVC 2010-04-02 15:15:58 +02:00
Armin Burgmeier c2924041c9 Fix seperate->separate everywhere 2010-04-01 23:08:06 +02:00
Armin Burgmeier 6b53d75997 Implement mesh serialization 2010-04-01 23:00:05 +02:00
Armin Burgmeier 79d2c869ed Add StdContextPtrAdapt and make StdPtrAdapt work with StdParameterAdapt 2010-04-01 22:45:02 +02:00
Tobias Zwick 8078bed848 particles move and are rendered with sub-pixel precision; made particles adhere to the style guidelines more 2010-04-01 19:58:58 +02:00
Armin Burgmeier a4321646da Fix a crash when showing object properties in developer mode 2010-03-31 22:45:05 +02:00
Armin Burgmeier d52fd9eadb Pass correct poll result (revents) to glib mainloop 
This fixes saving games in developer mode on Linux
 2010-03-31 19:14:10 +02:00
Armin Burgmeier 68fbb6debc Remove C4GameObjects::Enumerated and C4GameObjects::Denumerated 
They are not used anymore
 2010-03-31 01:56:34 +02:00
Armin Burgmeier 7c3099462b (D)enumerate pointers in FnGet(Object|Player)Val (#117) 2010-03-30 23:47:59 +02:00
Armin Burgmeier 60d58f3ac8 Introduce C4ObjectPtr, a convenient way to (de)serialize C4Object pointers 
Might also help to find out what the problem with #117 really is
 2010-03-30 23:08:15 +02:00
Julius Michaelis 9fbacd33db Fixed IRC client connect error when trying to connect without RealName 2010-03-30 21:31:18 +02:00
Armin Burgmeier c8c26a0933 StdScheduler: Only execute timeouts after all events have been processed (#207) 2010-03-30 16:16:27 +02:00
Benjamin Herr 2aaa96f98b C4MapCreatorS2: Use array length for Texture SCopy 2010-03-30 01:59:05 +02:00
Benjamin Herr 2addc959e2 C4MapCreatorS2: Use ptr-to-members, not offsetof 
Cannot use offsetof as per 18.1p5
> The macro offsetof accepts a restricted set of 'type' arguments in
> International Standard. 'type' shall be a POD structure or a POD union
 2010-03-29 15:34:24 +02:00
Benjamin Herr 84f54c2972 Use first participant if network nick is empty 2010-03-28 23:41:56 +02:00
Benjamin Herr 5cdbd907c8 Make some src/lib headers compile on their own 2010-03-29 01:58:02 +02:00
Carl-Philip Hänsch 649df64f1a Allow ignoring clients in the game lobby 2010-03-28 21:33:51 +02:00
Benjamin Herr 4378de147c Rerun astyle with missing \ added 2010-03-28 20:58:01 +02:00
Benjamin Herr 27287b981f Reformat everything according to style guidelines 
as per http://forum.openclonk.org/topic_show.pl?tid=208
and http://wiki.openclonk.org/w/Style_Guidelines
via astyle
  --brackets=break
  --indent=tab=2
  --keep-one-line-statements
  --keep-one-line-blocks
  --indent-namespaces
  --convert-tabs
  --recursive
  --exclude=zlib
  --exclude=tinyxml
  src/\*.h src/*.cpp
 2010-03-28 19:58:21 +02:00
Benjamin Herr 01db6c5ec7 C4PlayerControl: put members in ctor-initializer in initialization order 2010-03-28 18:49:06 +02:00
Tobias Zwick 805add52d7 #214 2010-03-28 01:15:45 +01:00
Tobias Zwick 1dc1f98feb particle graphics can be defined in several rows 2010-03-27 23:46:43 +01:00
Günther Brammer 5a44edb613 Store objectlocal named variables as properties 
One still has to declare them in before usage, but LocalN can create new
variables now.
 2010-03-27 18:52:32 +01:00
Günther Brammer 2e379712fb Add C4PropList::GetPropertyVal to get a property directly 
This should theoretically be more efficient than first creating a reference
and then dereferencing that. But mostly it's for more interface clarity.
 2010-03-27 19:16:48 +01:00
Günther Brammer 452ee57d04 Small C4Value cleanup 2010-03-25 21:42:47 +01:00
Günther Brammer c40456b55e Delete window surfaces before breaking the connection to the X server 
Otherwise, destroying the OpenGL context would crash.
 2010-03-25 20:58:46 +01:00
Sven Eberhardt 35d439951e Allow Modifier+CON_* as player control assignment 
ControlSet merging overrides only if OverrideAssignments is set to true
 2010-03-27 19:08:01 +01:00
Günther Brammer b4e37b070b Change all indentation with spaces to use tabs instead 
This is a whitespace-only patch. Hopefully, it'll only affect rarely-changed
parts of the engine, since all regularly maintained pieces should already
use tabs.
 2010-03-27 17:05:02 +01:00
Benjamin Herr b8d2f39fbd Fix warnings in gzio 2010-03-27 15:43:36 +01:00
Benjamin Herr 649640688f fix warning in C4PlayerControl.cpp 
---
 src/control/C4PlayerControl.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
 2010-03-26 23:51:52 +01:00
Sven Eberhardt e8aaa703fc implement DefaultDisabled for PlayerControls (#206) 2010-03-26 14:48:28 +01:00
Sven Eberhardt f32a4547e3 fix edit cursor highlight on zoomed object (#176) 
MSVC assertion fix
 2010-03-25 20:57:08 +01:00
Armin Burgmeier 80dd059338 Fix graphics skips of sprite picture overlays when zooming or moving viewport 2010-03-25 15:39:15 +01:00
Sven Eberhardt 6fcf569c42 fix ghost player menu on close by CDA_Menu player control (#202), fix key to work as toggle as intended 2010-03-25 13:55:12 +01:00
Armin Burgmeier 3fd0be11cb Fix a memleak in the mesh loader 2010-03-25 13:38:52 +01:00
Sven Eberhardt ce5bff74e6 fix menu close button usability glitch 2010-03-25 13:38:14 +01:00
Sven Eberhardt 7d10ddee68 fix a memleak 2010-03-25 12:49:56 +01:00
Sven Eberhardt 123cc82550 fix modifier key check on non-playercontrol keys (#201) 2010-03-25 12:34:23 +01:00
Armin Burgmeier 21fa993d10 Fix meshes as overlay graphics (#203) 2010-03-25 12:27:35 +01:00
Benjamin Herr 6cb483bc4b C4Value::DenumeratePointer(): Print int with %d 
not intptr_t
 2010-03-22 22:27:00 +01:00
Benjamin Herr 78af421ad2 Avoid deprecation warnings for static C4ID:: vars 
Wrapped the initialisation parameters for the static C4ID member
variables of the C4ID class in std::string( ) temporaries so that the
deprecated const char (&)[] overload of the constructor is not selected.
Since refering to these variables already emits warnings, the warnings
for their definitions are a bit superfluous.
 2010-03-23 14:57:52 +01:00
Benjamin Herr 5aec29c8a1 Remove spurious , at the end of enum list 2010-03-22 15:38:43 +01:00
Benjamin Herr b600fab6b8 Change C4ID constructors so string literals warn 2010-03-22 15:27:39 +01:00
Benjamin Herr bc58aae0ff Change DEPRECATED macro to non-function form 
This is because the previous definition would put the gcc deprecated
attribute after whatever was being declared deprecated, which a) does
not work for template member functions and b) is apparently not
actually necessary[1]. Like this we can just put DEPRECATED somewhere
before the thing being defined and it will probably work.

[1] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33911
 2010-03-23 14:18:13 +01:00
Nicolas Hake 2c72377479 Use header file to embed source code revision id 2010-03-22 23:28:54 +01:00
Günther Brammer 32ec6abace Script: Add a new reference type to C4Value storing proplist and key 
This way, a mere reference does not need to add an entry to a proplist. This
can be deferred to the point when the reference is used to change the value.
 2010-03-23 23:56:59 +01:00
Günther Brammer 99040a3dd1 Script: Remove ne, eq and S= 2010-03-22 22:26:41 +01:00
Günther Brammer 1446f585d7 Rename C4V_pC4Value to C4V_Ref 2010-03-22 22:16:46 +01:00
Günther Brammer 79e78e3a10 Script: Prepare for C4Value::GetRefVal to create a new entry in a proplist 2010-03-22 19:32:10 +01:00