Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,961 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

5961 Commits (a5c67098a79533e130586d1901d079f280e75310)

Author SHA1 Message Date
Christian Ohm a5c67098a7 Fix Italian translation and run update-po 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7784 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:24 +02:00
Buginator 7044fb1ca2 Make sure we take xOffset into account, we don't always start at 0 for the FMV text. 
fixes ticket:625

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7781 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:23 +02:00
Guangcong Luo ea2d10129f Allow droids to grab artifacts and oil drums from up to 1 tile away (fixes bug #614, and should make grabbing artifacts and oil drums a lot less frustrating). 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7778 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:23 +02:00
Buginator 05cef0a6cd Revert r7413, and instead use this fix to *never* control the transport in SP games. 
Fixes ticket:568


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7777 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:22 +02:00
Buginator 09ea0d44c9 Bump up MAX_RESEARCH to 500 from 450. 
Closes ticket:599

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7775 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:22 +02:00
Buginator 80ce7b0a33 Translation update: sl.po by ThomasCarstein 
closes ticket:615


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7771 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:22 +02:00
Buginator 54479fca6b Translation: it.po by Alpha93 
closes ticket:621


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7770 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:22 +02:00
Buginator 619a23086d Update .vcproj to use the vs2k5 version of the resource file, since the new icons break the resource compiler. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7766 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:21 +02:00
Per Inge Mathisen 6a683536d6 Add the ability of allied players to share each others' sensors. Since iterating over all structures 
by all players to see if we could use each as a sensor would be rather time consuming, I created a 
new set of lists (currently with only one member) that sorts objects by function. This way we can 
very quickly iterate over all sensors, even when there are several hundred buildings on the map. 
Closes ticket:636.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7765 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:21 +02:00
Guangcong Luo 53c81cfdc9 Experience speed adjustment happens after max speed limit; fix bug with speed calculation. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7760 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:21 +02:00
Buginator 80ea1a5649 Slight typo fix 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7756 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:21 +02:00
Buginator eb224c0f5b Change texture size to be a minimum of 128, instead of 32 or 64 (which makes everything look hideous!), and also cap the decals to 128, independent of what the user has picked in the options menu, until we get higher res textures to match all the settings. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7755 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:20 +02:00
Buginator 6263ddbb6c Add PREPROCESSOR_DEFINITIONS for zip support in release builds as well. (untested, but should work) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7753 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:36 +02:00
Buginator a16974cf6d Remove 1 Assert check that was introduced in r7747. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7751 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:36 +02:00
Buginator 8efc80afbe Cleanup message.c for various whitespace violations, and convert some ASSERT(s) to ASSERT_OR_RETURN(). Other than that, there should be *no* code changes. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7749 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:35 +02:00
Buginator 2e8b406a56 Add additional checks in isLasSat(), since it appears we can have invalid pointers being passed. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7747 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:35 +02:00
Buginator 69dfc7fc36 Change some LOG_ERROR(s) to info (LOG_INFO), since they are not really errors. As you may recall, info() displays in both debug & release builds. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7744 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:35 +02:00
Buginator c349a34865 Add a timestamp to addDumpInfo(). 
Remove the separator bars in the report file

We now log, map name (for SP/MP), the language that is read from the config file, and if they are using a cheat.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7743 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:35 +02:00
Per Inge Mathisen 5271d5cf9a Fix indentation 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7742 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:35 +02:00
Buginator 27bdf48197 slight cleanup of r7738 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7739 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:35 +02:00
Buginator 1ccb1487de Create a new function, addDumpInfo(), to be used to add custom information to the crash dump report file. 
Currently, we query openAL & openGL vendor/version info.
This should give us more descriptive crash reports on the user's hardware.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7738 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:34 +02:00
Buginator e53a25e859 When we have a level change, we must reset the firebit, or that tile will 'burn' ~forever, since the effects were cleared prior to the level change. 
closes ticket:611


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7737 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:34 +02:00
Buginator c270a5fe16 forgot to remove the useless '\n' from some info() lines 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7735 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:34 +02:00
Buginator 11ab9125ad Add new macro, info(), it is shorthand for debug(LOG_INFO,...). This is used to *always* display informational messages on both debug & release builds. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7734 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:34 +02:00
Freddie Witherden 0ca183c6ce Fix some spelling and indentation mistakes in action.c. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7733 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:33 +02:00
Christian Ohm 279458f584 Show translations for finished research display 
This fixes the not-translated strings mentioned in
http://forums.wz2100.net/viewtopic.php?&t=3152, by translating the strings on
display. Translating them on load would be preferable; I guess they are loaded
in src/message_parser.y, but I have no idea how to put the gettext stuff in
there.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7732 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:33 +02:00
Christian Ohm c7e0bea7fc Reduce line spacing in the research display. 
Makes the text actually fit into the box again.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7731 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:33 +02:00
Per Inge Mathisen 6ed7492b61 Clean up continent check for return for repair, and add one for return for recycle. Patch reviewed by stiv and EvilGuru. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7728 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:33 +02:00
Per Inge Mathisen 0111587288 Use new fpathCheck() to implement new continent based path checks for repair orders. 
Also introduce two new utility functions - objPosDiffSq and droidSqDist for easy
position comparisons, the latter with continent check built-in. Reviewed by Buginator.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7727 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:33 +02:00
Buginator ccacb3aade Temporary fix for the seam issue, if user has specified a texture resolution above what the max tile texture size is. Currently that is 128x128. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7723 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:33 +02:00
Christian Ohm 50fc6a0060 No spaces in filenames 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7721 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:32 +02:00
Buginator 79a8dbf4f4 Add #define NET_TIMEOUT_DELAY 2500 to allow for easier changing of the constant. 
No real code changes.

closes ticket:613

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7719 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:32 +02:00
Buginator c336edbcff Fix the blasted seam issue once and for all. 
(For trunk, it is mainly for the decals, since we don't handle terrain the same way. For 2.2, it is terrain & decals--basically everything in the tileset)

Fixes ticket:496

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7717 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:32 +02:00
René Jürgens ff4e42123a NTW Mod: deleting textures > bpp are to low. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7712 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:32 +02:00
René Jürgens 601623a346 NTW Mod: deleting textures > bpp are to low. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7711 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:32 +02:00
René Jürgens 8a27aa90ae NTW Mod: deleting textures > bpp are to low. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7710 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:31 +02:00
René Jürgens 3c326ec0cf NTW Mod: deleting textures > bpp are to low. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7709 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:31 +02:00
Per Inge Mathisen 9c52d2d07f Do not add effects to the wrong map in off-world missions. Fix bug introduced in r7097. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7708 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:31 +02:00
Per Inge Mathisen 4e0fc39ebb Do not bother to process visibility for off-world mission structures, since this leads us to iterate 
over tiles on the wrong map. This closes ticket:503.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7707 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:31 +02:00
Per Inge Mathisen a2ca629107 Fix crash in away mission when completing buildings. Patch by Samowar. Closes ticket:584. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7706 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:31 +02:00
Buginator 24d699f0b7 Tile fixes for C1, C2 & C3 tilesets done by Mysteryem. 
A *huge* shout out to him. :)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7705 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-16 22:28:31 +02:00
Per Inge Mathisen d93e1751c0 Add new utility function PHYSFS_printf() to easily write text files with PhysicsFS. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7704 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:28 +02:00
Per Inge Mathisen b598cfbc6a Make scavenger option behave more like other pre-game options. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7703 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:28 +02:00
Per Inge Mathisen 95b070014e In the new netplay code, mayhem mode has been changed to a enable/disable scavengers checkbox. 
This does not work yet. Attached is a hack that at least gets it sort of working. When scavengers 
are turned on, we do not change game.type and the map type to something else, we still use 
skirmish, which is far cleaner, but now scavengers won't build anything. Closes ticket:607


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7702 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:27 +02:00
Per Inge Mathisen b1c02b0e03 When AI sends massive armies to attack, they often get clogged up and stuck completely 
by droids on their way back to repair, or doing other orders. This patch fixes this 
problem by introducing a hack for AI only that detects if a droid is stuck, and if so, 
resets its current order. This closes ticket:597.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7698 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:27 +02:00
Per Inge Mathisen cfbc5dec39 Don't crash if an order is cancelled and you still have a valid action related to that order with a NULL target stat. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7697 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:27 +02:00
Christian Ohm d0e023a236 Change the config directory. 
It is now "Warzone 2100 Trunk" on Windows/MacOS, and ".warzone2100-trunk" on
Linux.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7696 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:27 +02:00
Christian Ohm 1dd96730f4 Fix the "Mesa" string that was wrong for testing. 
Actually fixes #608.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7695 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:26 +02:00
Christian Ohm b9b1a4bac7 Move the "Mesa hack" from GLee.c into screen.c:screenInitialise() 
There we can check the GL_RENDERER string for more fine control. Currently it
is enabled when the string starts with "Mesa", so it doesn't affect any other
drivers. It might need more checks if new Mesa versions break this.
Fixes #608.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7694 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:26 +02:00
Per Inge Mathisen fe7b8fc515 mapconv: Fix key typos. Implement scroll limits and level name. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7693 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:26 +02:00