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

251 Commits (master)

Author SHA1 Message Date
Günther Brammer 5d1f210436 C4Group::FindNextEntry only writes in the result buffer finding a file (#618) 
Before "Initialize some uninitialized variables", SCopy would do nothing
because the StdStrBug still contained the parameter, but with that patch,
it wrote the empty string into the result buffer.
 2011-08-05 22:07:44 +02:00
Tobias Zwick 4a517e06b6 #394 - Separate graphic for "Mouse Over" for main-menu buttons and Icons 2011-08-05 14:24:41 +02:00
Günther Brammer c4f16d42ce Initialize some uninitialized variables 2011-07-18 02:12:37 +02:00
Günther Brammer 505b616404 Remove obsolete CStdFile::Load/Save 2011-06-19 16:35:06 +02:00
Sven Eberhardt 7696b1a392 Added custom shapes for Map2Landscape zoom 2011-07-16 21:50:49 +02:00
Sven Eberhardt 6fadd97438 MSVC fix: length parameters for swprintf 2011-07-16 12:08:00 +02:00
Peter Wortmann 96df6a9c95 Fixed SAppend string recursion in C4Language.cpp 2011-06-04 21:08:54 +01:00
Peter Wortmann a02ccafc4d Shader landscape rendering, first simple version (scaler, shading) 2011-05-24 00:12:19 +01:00
Peter Wortmann c84458f451 Fixed parameter naming for AccessNextEntry 2011-05-22 23:02:10 +01:00
Günther Brammer f7d29fab61 Hardcode savegame and demo folder names (#594) 
Previously, they were stored in the configuration and written to the
config file by default. So they still had the old .c4f file extension and
weren't displayed in the scenario selection dialog. Approximately nobody
changed this configuration, and those that do can simply use symlinks
instead.
 2011-05-09 17:35:44 +02:00
Nicolas Hake a6429bad54 c4group: Remove timestamps from groups, use checksums only 2011-05-01 13:37:36 +02:00
Günther Brammer 9b3afcef04 Remove IDS_LANG_CHARSET and supporting code, everything is in UTF-8 now 2011-04-09 02:51:57 +02:00
Günther Brammer 0abe1bb633 win32: Use Unicode registry APIs 2011-04-02 18:48:01 +02:00
Günther Brammer 4f62dac0bc Rewrite C4Group::View a bit for clarity 2011-03-30 21:13:47 +02:00
Günther Brammer 5b808be269 Remove some unused variables 
gcc 4.6 finds variables that are write-only.
 2011-03-28 19:31:28 +02:00
Günther Brammer 58e4e3aa6b Blame the first group in a groupset if no group had the desired file 2011-03-14 21:53:55 +01:00
Günther Brammer 2465c05afc Don't crash trying to display stringtable-not-found error message (#588) 2011-03-14 21:04:27 +01:00
Julius Michaelis 61d93c39cf Fixed some files which didn't include C4Include properly (all except C4Globals.cpp caused by 17d0ceb9ef2f) 2011-03-14 16:32:01 +01:00
Armin Burgmeier 884809e8f2 Merge filename extension changes 2011-03-13 17:15:40 +01:00
Armin Burgmeier c1f340a74a Change .c4u extension to .ocu 2011-03-13 17:09:17 +01:00
Armin Burgmeier b33bc157bd Change .c4v extension to .ocv 2011-03-13 17:07:19 +01:00
Armin Burgmeier 2e0b00a5e0 Change .c4b extension to .ocb 2011-03-13 17:06:23 +01:00
Armin Burgmeier 3a9556f1a3 Change .c4m extension to .ocm 2011-03-13 17:01:53 +01:00
Armin Burgmeier c61e92ec98 Change .c4i extension to .oci 2011-03-13 16:56:26 +01:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00
Armin Burgmeier 2a2408f9a8 Change .c4p extension to .ocp 2011-03-13 16:39:48 +01:00
Armin Burgmeier eaf62f71f9 Change .c4f extension to .ocf 2011-03-13 16:38:33 +01:00
Armin Burgmeier 41a1b5867d Change .c4g extension to .ocg 2011-03-13 16:16:45 +01:00
Armin Burgmeier e282bf9a9c Change .c4s extension to .ocs 2011-03-13 16:11:55 +01:00
Günther Brammer c49f8b32d5 win32: wrap all windows.h-includes to always undef troubling macros 2011-03-13 15:48:45 +01:00
Günther Brammer 7bc20a8dc3 win32: add some missing #include <windows.h> 2011-03-13 02:03:45 +01:00
Günther Brammer 21a8f337d5 win32: avoid winbase.h in PlatformAbstraction.h 2011-03-12 15:29:21 +01:00
Armin Burgmeier 6e025ee4ec Remove C4Group sort order for files no longer used in OC 2011-03-12 13:55:01 +01:00
Günther Brammer e80a39dd09 Remove some dead code 2011-03-09 23:30:23 +01:00
Nicolas Hake b332e73ba3 C4Group: Fix FindNextEntry 
The char* parametered FindNextEntry didn't pass the last found
filename to its implementation, so it always found the first file
matching the wildcard
 2011-03-08 17:53:30 +01:00
Günther Brammer f4ee636072 Remove some redundant Default methods 
Using the same method for the constructing and clearing an instance just
leads to leaks and subtle bugs.
 2011-03-05 03:24:11 +01:00
Günther Brammer 01e9dce9ce Store C4ComponentHost filenames in StdCopyStrBufs 2011-03-05 02:45:27 +01:00
Günther Brammer 8ff6ae847c C4Group::LoadEntry takes pointer instead of non-const reference 2011-03-05 02:44:26 +01:00
Günther Brammer 28a154dcdf Drop unused third C4LangStringTable::ReplaceStrings parameter 2011-03-05 01:05:36 +01:00
Günther Brammer 609b9bbe93 Fold C4ComponentHost::Default() into C4ComponentHost::C4ComponentHost() 2011-03-05 01:03:09 +01:00
Günther Brammer 60dcd65708 Languages.GetPackGroup creates a new GroupSet containing the original group 
Just moves some code from C4ComponentHost to C4Language.
 2011-02-07 03:37:35 +01:00
Günther Brammer 374d8e743b C4Group: Error message for Open failing due to filename on the ignorelist 2011-03-04 03:49:39 +01:00
Günther Brammer 60ce34ad52 Remove redundant global pConfig 2011-03-03 17:11:03 +01:00
Günther Brammer 78c2c98dce c4group: new command "Pack To" which takes a target filename 
This allows creating packed groups in a build directory without copying
the source files first.
 2011-03-01 22:56:05 +01:00
Günther Brammer 45fa20617c Load definition stringtable before definition script 
This allows for a slight simplification of the ScriptHost API, as only the
definitions made the ScriptHost load the stringtable for them.

This changes the sortorder of definitions, but C4Update should be able
to make the necessary changes to the release groups.
 2011-02-07 02:18:24 +01:00
Günther Brammer 7be90977bf Make C4ScriptHost have a C4ComponentHost member instead of inheriting 
Previously, C4ScriptHost needlessly derived from two classes.
 2011-02-06 21:37:19 +01:00
Günther Brammer 489ae8c5b3 Remove unused C4ComponentHost::Name and LoadAppend 2011-02-06 21:31:33 +01:00
Günther Brammer 91b6201d85 Do not load Rank.bmp anymore, Rank.png suffices 2011-01-19 23:53:14 +01:00
Günther Brammer cb34973ffc Remove loading of BMP definition graphics and portraits 
OpenClonk does not use that feature anymore. PNGs are enough.
 2011-01-19 23:31:24 +01:00
Günther Brammer d3ddc171ee editor/win32: Remove Components menu in favour of external editors 2011-01-19 02:14:59 +01:00
Armin Burgmeier 9f74506e9b Support loading game data from system path 2011-01-06 21:18:13 +01:00
Günther Brammer 6a17914955 Silence various compiler warnings 
None of them pointed to a serious problem, fortunately.
 2011-01-03 00:03:28 +01:00
Günther Brammer 4588c797eb docs: Slight rewrite for the actmap-as-proplist change 2011-01-02 01:11:30 +01:00
Armin Burgmeier 63faacc520 Fix update procedure on Windows 
by letting c4group wait for the Clonk process to terminate
 2010-12-26 20:49:04 +01:00
Julius Michaelis eb6d3db1f4 Log to record file, too, when recording 2010-12-25 16:00:59 +01:00
Günther Brammer be342d4a51 copyright notices update 2010 
This time with more manual checking and using git blame -M -C, so that
a few cases of copied code get a copyright notice corresponding to
their initial introduction.
 2010-12-23 01:01:24 +01:00
Günther Brammer 5bb3e81f4f Physical: Remove Magic and associated other Magic 2010-12-12 01:25:58 +01:00
Günther Brammer 47594765cb c4group: Remove unused -a, -m, -e, -d, -r, -o commands 
The new release scripts use -p instead. This doesn't make c4group a lot
simpler, but every bit helps.
 2010-12-05 19:04:40 +01:00
Günther Brammer ccf84f5dbe c4group: Remove Maker information. 
It is useless without the shareware registration providing a name.
 2010-12-05 18:57:06 +01:00
Günther Brammer bf5c6cb231 Make gunzip4c4group build again 
Hopefully nobody will actually have to use that tool, but one never knows.
 2010-11-14 23:50:45 +01:00
Günther Brammer aa0cef3a8d win32: Replace most BOOL usages 
The callbacks apparently changed for 64 bit support, and
RegisterWindowClass is just a simple C++ function. Unfortunately, there's
one callback left.
 2010-12-03 20:25:17 +01:00
Tobias Zwick e0cb527c5d removed Score.png from resources 2010-10-03 14:31:26 +02:00
Tobias Zwick cbe501596f remove hardcoded definitions for CR Western.c4f 2010-10-03 13:30:36 +02:00
Günther Brammer ccbfa225bf Remove the switch-to-editor function, there is no separate editor anymore 2010-09-28 19:22:39 +02:00
Günther Brammer c4a5039561 Move the last remnants of CDDrawCfg to Config.Graphics 2010-09-28 19:07:47 +02:00
Günther Brammer 6d3fc6032b Remove the last traces of the Strings.txt 2010-09-08 20:08:13 +02:00
Armin Burgmeier b1aaa904ef Reload string table when underlying data changes (#271) 2010-09-04 22:41:59 +02:00
Tobias Zwick 88750e2b14 Implemented new logo for the startup screen. Polished startup screen 2010-08-15 20:20:59 +02:00
Günther Brammer db6f4f502a Remove GDI font renderer, simplify font loader 
Instead of having a list of fonts, simply look up the font file if
necessary, and cache the freetype library state for one font.
 2010-06-27 02:30:47 +02:00
Günther Brammer 31e3293b84 Fonts: Remove support for prerendered bitmap fonts 2010-06-27 02:21:23 +02:00
Benjamin Herr 309971a142 C4Group.cpp: avoid dynamic format string 2010-04-22 15:05:25 +02:00
Nicolas Hake 5dc0d3b4cb Reduce value truncation warnings 2010-04-20 18:20:24 +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 c2924041c9 Fix seperate->separate everywhere 2010-04-01 23:08:06 +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
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
Günther Brammer e30ff99d6a Remove all superflous #include <Standard.h> 
Standard.h is included by C4Include.h, and every file includes that.
 2010-03-04 22:11:12 +01:00
Nicolas Hake 11e9f3235b Prefer loading meshes from binary format 
This implements a loader for Ogre's binary mesh format. Loading times
are vastly superior to the TinyXML parser. If no binary mesh exists,
the loader will fall back to parsing XML.

This changeset introduces a dependency on the Boost libraries.
 2010-03-02 17:12:28 +01:00
Carl-Philip Hänsch 411a61276b Removed more shareware restrictions 
Lobby: Desaturation filter and watermark on unregistered players gone
Startup: Doesn't show "Unregistered" anymore
About: No "register now button"
Network: /regjoinonly switch removed
 2010-03-02 10:03:29 +01:00
Tobias Zwick 028456affe removed some old control stuff from the gui 2010-02-24 18:52:58 +01:00
Günther Brammer ff8d950e85 Remove C4ENGINE define 
Most files using it weren't used by c4group-the-application anymore, and
the remaining stuff can be dealt with by using stubs or the same code in
both cases.
 2010-02-17 22:59:46 +01:00
Benjamin Herr f3b35227ea avoid lots of gcc warnings 2010-01-25 05:00:59 +01:00
Nicolas Hake be39732a8f Implemented fixed ordering in DirectoryIterator 
This should alleviate loading order differences from different
OSes somewhat. Since the iterator currently employs a lexicographic
ordering, there are probably still problems when one player has
their packages unpacked, while another one has theirs packed.

This should go away once we employ a sane format for game packages.
 2010-01-25 16:54:38 +01:00
Armin Burgmeier fb95c3af2e Merge mesh into default 2010-01-04 01:10:31 +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
Tobias Zwick edec15d64f merge 2009-11-30 17:24:14 +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
Armin Burgmeier 49e607bab0 Added includes and forward declarations, fixing the build 2009-10-26 00:09:34 +01:00
Nicolas Hake b3ab7fab5b Strip down C4Include.h to encourage self-sufficient sources 2009-10-23 09:29:58 +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
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 f584896446 merge 2009-10-08 20:51:31 +02:00
Armin Burgmeier 778ec7278f Merged default into mesh 2009-09-19 13:13:10 -04:00
Armin Burgmeier 4fa029df2c Merged default into mesh 2009-08-27 21:35:55 -04:00
Sven Eberhardt df6010a148 merge 2009-08-12 17:27:43 +02:00