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

6472 Commits (a9e10388ab1504fc4a8dc09d4d473a38ff66fc1e)

Author SHA1 Message Date
Christian Ohm 2bc43923cc Update translations. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8440 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:20:02 +01:00
Per Inge Mathisen 65ed483d69 Fix problems finishing repairs of expensive but weak structures. Patch by myself 
and Samowar. Closes ticket:604 and closes ticket:1077


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8439 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:20:00 +01:00
Per Inge Mathisen 26de1676e4 Add descriptive headers to some stats files. Eventually all stats files should have a descriptive header. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8438 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:20:00 +01:00
Per Inge Mathisen a9385e64bd Fix assert failure reported in ticket:1071 by removing the assert, and making sure 
we cannot go into negative power instead. Also add some ASSERT_OR_RETURN checks on
player numbers. Closes ticket:1071


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8437 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:20:00 +01:00
Per Inge Mathisen 0405c24fb1 simplipie: Now modify PIE file in place. Makes it easier to run in scripts. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8436 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:20:00 +01:00
Per Inge Mathisen c6db8bfcd7 Put all palette info into an external file that can be modified by modders. It is quite sensitive 
to changes in the number of lines. The colours are in the (from CSS) familiar R,G,B,A hex format. 
Closes ticket:1062


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8435 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:59 +01:00
Guangcong Luo cc343768ae Commit patch #8421: 
* You can now repair allied units.
 * You can now repair allied structures.
 * You can now upgrade allied structures.
 * You can now rearm VTOLs on allied rearming pads.
 * You can now repair your units at allied repair facilities.
 * You can now guard allied units (trucks, sensors, and commanders) and structures.
 * You get a selection cursor when mousing over LasSat, to make it clearer that it's selectable.
 * You get the OBSERVE cursor for attack-move, the EMBARK cursor for unload transport, etc.
 * A few other minor cursor fixes. Cursors should now reflect what happens when you click on them significantly more of the time.
 * Clicking on a transport with no cyborgs selected will select the transport, instead of doing nothing.
 * You can attack (and actually damage) your own units/structures with Alt+click, now. Still doesn't work with LasSat, to prevent backstabbing allies by moving an expendable unit into their base. For the same reason, Alt+click only works on your own units, not on your allies'.
 * Alt+click works on Mac OS X now.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8433 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:59 +01:00
Guangcong Luo e4c7afbade Make cyborg transport fly lower than regular transport. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8431 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:59 +01:00
Guangcong Luo 08ccc7265f Minor fix to new HP bars. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8429 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:59 +01:00
Guangcong Luo 10680005f2 * Make repair turrets fidget less before starting to repair. 
* Let repair turrets follow units they're repairing even when in Hold Position, if ordered explicitly to repair.
 * Allow Alt+click to unload transports.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8420 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:58 +01:00
Guangcong Luo c41b9da86a More informative version string error messages. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8418 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:58 +01:00
Guangcong Luo 957353dd28 Fix builds on Mac OS X (update libpng-1.2.16 to libpng-1.2.40). 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8417 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:58 +01:00
i-nod e02e0f002b trunk: 
- Corrected sidetexts in Options menu.
- Removed empty descriptions for team flags.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8415 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:58 +01:00
Guangcong Luo 8a078725f8 Add Thomas Barlow's (Mysteryem's) real name to the AUTHORS file. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8413 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:58 +01:00
Guangcong Luo 1ae6f36fc3 Fix two projectile bugs: Friendly fire is now possible if intentional, and VTOLs in the air can no longer be hit by splash damage of ground weapons. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8406 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:58 +01:00
Guangcong Luo 878249ef13 Better-looking HP/reload bars. (Warning to Per: Adds 4 colors to piepalette.c/.h) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8405 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:57 +01:00
i-nod c09cb93920 Corrected cyborg transport model by Mysteryem. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8403 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:57 +01:00
i-nod 2078410674 backport: Force correct target position for projectiles that are almost off-map. Will prevent crashes on impact for effect-enabled projectiles (flame-based ones). Reported by pranjan in http://forums.wz2100.net/viewtopic.php?f=4&t=4130 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8402 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:57 +01:00
Christian Ohm 4fe43df6ea Don't check coordinates in CalcRadarPosition. 
Every call to it is saveguarded by calls to CoordInRadar, which uses almost the
same code (exactly the same until r7458). So now the calculation in
CoordInRadar is changed to be the same as in CalcRadarPosition, and
CalcRadarPosition doesn't check anymore. Fixes #1069.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8401 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:57 +01:00
René Jürgens 14d0c58a10 NTW Balance Update, Cannons and Cyborgs 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8396 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:57 +01:00
René Jürgens 11dd5f1465 NTW Research Balance Update, Cannons, Missiles & Rockets 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8384 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:57 +01:00
Buginator a886be8d02 Suggested fix to turn on GLC_AUTO_FONTS by bcoconni (QuesoGLC author) for this issue: http://sourceforge.net/tracker/?func=detail&aid=2890444&group_id=53918&atid=472059 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8364 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:56 +01:00
Christian Ohm 0949e9ed28 Fix tests/Makefile.am for out-of-tree builds. 
This makes "make distcheck" run the tests (but maptest has its paths hardcoded
and thus fails).

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8362 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:56 +01:00
Christian Ohm 553fca0df7 Put autorevision.h into builddir, not srcdir. 
Contrary to 2.2, "make distcheck" doesn't work yet, since some files in
tools/map that tests/maptest.c needs are not packaged in the tarball.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8361 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:56 +01:00
Christian Ohm 7242272311 Use WZ_CPPFLAGS in lib/iniparser/Makefile.am. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8358 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:55 +01:00
Christian Ohm f7c5520b68 Remove data/base/Makefile from configure.ac. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8357 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:55 +01:00
René Jürgens e5d0cf9fc2 put the old ai back in, to fix several problems. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8354 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:55 +01:00
Buginator 5e3fd0ebab Forgot to svn delete these files, and update the Makefile.am as well. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8353 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:54 +01:00
Buginator 11482e4a96 Fix a typo 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8352 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:54 +01:00
Guangcong Luo a279c154af Fix a typo from r7840 that caused the game to be unable to display all the games on the lobby sometimes. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8341 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:54 +01:00
Christian Ohm a4fa637b56 Fix two clang compiler errors. 
Closes #1026.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8338 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:54 +01:00
Christian Ohm 65caade5c5 Unified OpenGL error handling 
This adds a glErrors function that returns true in case of errors after
outputting them with file and line number from where it was called.
Closes #1011.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8337 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:53 +01:00
Per Inge Mathisen 289a73d103 Do not crash if someone sends you a research status message with a valid building ID 
but which does not correspond to a research building. Reported by Toksyuryel in ticket:1021.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8334 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:53 +01:00
Per Inge Mathisen dbe7ee4209 Quick mitigation for crash reported in and that closes ticket:997 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8332 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:53 +01:00
i-nod e1bfeffa26 - Merged PrintOpenALVersion with sound_InitLibrary since the current usage isn't completely correct. alGetString should be called after a new context was successfully created. 
- Changed sound_InitLibrary so it would present all available devices to the debug and dump logs before trying to activating one of them.
- Added successfully opened device name to the debug and dump logs.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8328 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:53 +01:00
i-nod da88cb87ab - Added vc2k8 solution which uses new Warzone2100.vs2k8.vcproj. Lib projects are common between the vc2k8 and vc2k5. vc2k8 (and up) people should you it instead of Warzone2100.sln. Also check for the new devpkg on msvc wiki. 
- vc2k8 project is using modern style icon instead of obsolete one.
- Removed sqlite3 dependencies from vc2k5 solution.
- Set eol-style to native for iniparser.vcproj

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8326 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:52 +01:00
Buginator aaea1638b9 Only save tech level & number of players when user hits map button. 
fixes ticket:1018

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8324 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:52 +01:00
Buginator 736ed03857 Change ping 'traffic light' detectors to more realistic values that more accurately show what kind of a connection they have compared to you. 
low pings (green light) is from 0-200  (was 0-600!)
medium pings (yellow light) is from 400-1000 (was 600-1200!)
high pings (red light) is from 1000-2000. (was 1200-2000)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8323 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:52 +01:00
Buginator 18bd672df9 Upload the fonts.conf file that NSIS uses. 
fonts.conf.wd_enable is the one where windows directory is enabled.
fonts.conf.wd_disable is the one where the windows directory is disabled (default)

The reason for this is, when enabled, it takes a very long time to build the font cache on vista & win7.

Closes ticket:1013

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8321 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:52 +01:00
Buginator 0aff0b46cf Add a new debug flag type, LOG_FATAL. 
This is used to differentiate LOG_ERROR (which is a *non* fatal error, but a error none the less) and fatal errors which result in program termination with no *visible* output (on windows/macs) on our end because of the crappy GUI functions so we usually dump it to stderr.txt and there is no clue that the program had to exit for whatever reason.

Hopefully, this will be helpful to windows people so they can differentiate between *our* exit/abort routines, and crashes that occur in drivers which look exactly the same since they get dumped back to the desktop with no visible clue why.

LOG_FATAL is *always* on in both debug & release builds.

On LOG_FATAL debug lines, on windows, we now throw up a modal dialog box with the current error message.  At this time, this only happens when we have a error, and we use abort() right after the error, which makes it fatal.

That explains why this touches ~60 files :)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8320 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:51 +01:00
Buginator 7566f8901d Missed a file yet again--all in a ploy to get my commit count up! :D x2 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8314 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:51 +01:00
Buginator f9489080a5 Missed a file yet again--all in a ploy to get my commit count up! :D 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8313 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:50 +01:00
Buginator a86cbc2e3c As was discussed on the ML, removing SQL from trunk. 
Please test!!
OS X & mingw builds may be broken!


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8312 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:50 +01:00
Per Inge Mathisen bb3975f089 Add new tool: simplipie. It strips unused flags from PIE files and rewrites them. 
It also obsoletes the no cull flag by removing it and instead adding duplicate,
reversed polygons to fix the culling issues this flags was meant to fix.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8306 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:49 +01:00
Per Inge Mathisen b02aa1f0f4 The LasSat is now a DOOR type structure. This means it behaves like a fortress when it comes to 
where it can be placed and how it adapts to terrain. See discussion on the forum for details
(http://forums.wz2100.net/viewtopic.php?f=6&t=3992)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8305 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:49 +01:00
Christian Ohm 68841a105b Blender PIE import plugin: Add a default filename for the file selector 
Makes it start in the current directory instead of $HOME.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8304 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:48 +01:00
Christian Ohm df7f2223d6 Compare locale names before claiming they differ 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8302 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:48 +01:00
Per Inge Mathisen 6e27d99815 Fix two spelling errors found by Debian scripts. Closes ticket:1010 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8300 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:48 +01:00
Per Inge Mathisen 6a09d348af Make addDumpInfo() parameter const 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8299 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:48 +01:00
Christian Ohm 6a3fce95f4 Use the "Mesa hack" only when OpenGL 1.5 isn't available 
Mesa 7.6 provides OpenGL 1.5 support for ATI cards, so it isn't needed there
anymore.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8297 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:48 +01:00