Commit Graph

6956 Commits (d254e6a3396bbfb439e2f34471b760f0c6870c7b)

Author SHA1 Message Date
Per Inge Mathisen ca1d602ccb Remove visibility information when changing between campaigns. This closes ticket:1461
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9435 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:38 +01:00
dak180 8b9dfd0789 Better version numbers for branch builds.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9432 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:38 +01:00
Per Inge Mathisen e13870f0cd Make sure we match the correct templates by not reading human templates from VLO files, and comparing untranslated names.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9431 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:37 +01:00
Cyp 03f3c9c5d6 raytrace: When hitting the wrong target, do damage to the wrong target, too.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9429 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:37 +01:00
Christian Ohm 1f9303e74c Clean up handleActiveEvent.
This fixes PauseOnFocusLoss to actually work in skirmish, and disables
scrolling when the mouse leaves the window. Fixes #1411.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9427 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:37 +01:00
dak180 c6587a8f1d Minimum required Xcode 3.1; Minimum system version 10.5 (for building, it will still play on 10.4).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9424 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:37 +01:00
Per Inge Mathisen d9eeb65e4c Forward port r9060 from 2.3 to remove always show oil resources change. We need to implement
private player maps before we can implement this feature.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9422 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:37 +01:00
Christian Ohm 2433ba8709 Updated Spanish translation by Saberuneko.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9420 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:36 +01:00
Cyp a053ec980b structure.c: Set timeLastHit and lastHitWeapon, to silence one valgrind warning.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9416 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:36 +01:00
Cyp cdb554ab58 Fix units of mapTile().
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9415 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:34 +01:00
Cyp 3706aca886 Make mapTile() take signed values, so comparison with -1 works.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9413 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:34 +01:00
Guangcong Luo ce4ff793da Give one tile of leeway in mapTile() before asserting, for things that are coming in from off-map.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9411 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:34 +01:00
Christian Ohm b9960b35f4 Updated Spanish translation by Saberuneko.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9409 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:34 +01:00
Guangcong Luo 302582d8b6 Split bMultiPlayer into bMultiPlayer and bMultiMessages - fixes a ton of bugs relating to the game thinking it's not in multiplayer mode when it is, but has multi messages off.
Previous commit was misnamed, it was actually a commit of patch #1440.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9408 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:33 +01:00
Guangcong Luo d187d6fab4 Split bMultiPlayer into bMultiPlayer and bMultiMessages - fixes a ton of bugs relating to the game thinking it's not in multiplayer mode when it is, but has multi messages off.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9407 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:33 +01:00
Guangcong Luo 38fd6be936 Fix bug #1248 - commanders sometimes can't lead up to the max number of units for their rank.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9406 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:33 +01:00
Thomas Barlow 5ad6596be9 Fix some polygon issues in the factory models.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9403 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:33 +01:00
Guangcong Luo 352666ff0e Apply patch #1462 - Fix redundant components remaining available if researched after being made redundant.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9402 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:32 +01:00
Christian Ohm c78a3aad2c Update translations.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9399 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:30 +01:00
Christian Ohm bf7e95a161 Add resmessages12.rmsg to POTFILES.in.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9398 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:27 +01:00
Guangcong Luo b6f03407dd Add new file data/mp/stats/messages/resmessages12.rmsg - additional research descriptions.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9397 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:27 +01:00
Guangcong Luo 258d65c169 Fix some unnecessarily specific numbers in weapon accuracy and pricing: 99% -> 100%, 999 -> 1000.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9395 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:27 +01:00
Guangcong Luo 4df6b05f40 Research messages more specific: "Machinegun damage +25%" instead of "Upgrades machinegun damage". Also add description for radar detector, and fix prerequisites for Flamer Autoloader Mk2.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9392 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:27 +01:00
Cyp b3c57ebb63 net: Set SO_REUSEADDR on sockets to avoid address already in use errors.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9391 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:27 +01:00
Per Inge Mathisen a46a6eb68b Throttle AI construction of VTOL factories based on amount of power. Add thermite bombers to VTOL fleet.
Reorder VTOL target priorities to go after construction first. Restrict help build event to avoid trucks
wandering across the entire map to help build something that is finished a long time ago when they arrive there.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9390 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:27 +01:00
Per Inge Mathisen ce8491b4ad Rewrite buildDerrick AI skirmish event. Instead of looking for the next closest oil resource
to our base, be more opportunistic and look for the closest oil resource to each droid, and
only send one droid toward each oil resource. Also speed up full base starts by launching this
event immediately upon start (but after build start base event).


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9389 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:26 +01:00
Per Inge Mathisen 7ca0bc7547 If AI loses a race for an oil resource, it will now instead build a cheap defense building there as revenge.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9388 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:26 +01:00
Per Inge Mathisen eae14b3b00 Whenever a build order fails at the target site for in-game reasons, fire off a
CALL_DROID_REACH_LOCATION trigger to allow the AI script to handle it gracefully (or not).


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9387 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:26 +01:00
Per Inge Mathisen 7725793b48 Improve scrStructureBuiltInRange: Make it use new mapgrid system. Clean up asserts. If player parameter
is -1, then look for nearby structures by any player and also check for unfinished ones.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9386 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:26 +01:00
Per Inge Mathisen 5d45ee54eb Fix the problem with proximity message list and display list going out of sync due to too few proximity buttons
allowed at the same time (20), by increasing the limit to 10000. Also make sure that all players get the messages
they should (for switching between players), and make a real fix the beacon seen by other players problem by
storing but not displaying proximity messages for other players (reverting wrong fix of this problem in ticket:1250).
Remove addOilResourceProximities() which probably never worked as advertised, because it is run before vision is added,
and checks if iterated objects are visible before doing anything. Adding proximity messages is done by visibility.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9383 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:26 +01:00
Guangcong Luo 0d8239b536 Fix bug that caused players not to send data checks (and subsequently get kicked) sometimes.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9379 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:25 +01:00
Cyp 9e17ea8d25 make: Fix previous deps hack to avoid errors on fresh builds.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9375 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:25 +01:00
Per Inge Mathisen e5ee9e2358 Fix formation speed limiting setting to really be off.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9373 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:25 +01:00
Christian Ohm 3ab1a0104d Update Spanish locale names.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9370 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:25 +01:00
Christian Ohm 585e72d7e1 Updated Spanish translation by Saberuneko.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9368 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:25 +01:00
Per Inge Mathisen ddcb9a9986 Remove some dead AI code from scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9367 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:25 +01:00
Christian Ohm c166632447 Updated Spanish translation by Saberuneko.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9365 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:24 +01:00
Christian Ohm 6538a6e180 Update translations.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9362 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:24 +01:00
Cyp be78e9035c orders: Allow shift-click to queue orders on radar, make a sound when queueing move orders.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9360 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:23 +01:00
Guangcong Luo 0b90db00bb Fix bug #1425 - crash when patrolling.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9355 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:23 +01:00
Cyp 11425c5274 Substitute s/mapgrid.c/mapgrid.cpp/ in a couple more files.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9353 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:23 +01:00
dak180 c55bc14c1b Fix typos in the DMG script.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9350 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:22 +01:00
Guangcong Luo 8cf40897c2 Fix structures so they're illuminated correctly (they were previously illuminated based on whether or not their owner could see them, rather than whether or not you could).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9342 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:22 +01:00
Guangcong Luo 79442c8560 Display "HOST" below host.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9341 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:21 +01:00
Guangcong Luo 81e5af8e34 Rebalance 0.7.0.
Flashlight: range 6-12 -> 12-12
Pulse Laser: range 8-16 -> 14-14, damage 170 -> 165
Heavy Laser: range 5-7.5 -> 16-16, damage 350 -> 240
Pulse laser tower: price 175 -> 200
Pulse laser hardpoint: price 250 -> 275
Heavy laser emplacement: price 225 -> 450

Scourge: range 5-16 -> 5-14, accuracy 70%-80% -> 50%-80%
Seraph: range 5-14 -> 7-15
Lancer: price 125 -> 150, accuracy 50%-60% -> 30%-60%, remove MRL prereq
Lancer hardpoint: price 150 -> 175
Tank killer: accuracy 50%-60% -> 30%-60%
MRL: damage 30 -> 34
MRP: accuracy 45%-45% -> 40%-45%, range 5-8 -> 4-8

Note to self: Fix the tank killer angle bug already.

Mortar/pepperpot: Splash radius 0.5 -> 1.0
Bombard/incendiary mortar: Splash radius 0.75 -> 1.25, (incen) burn radius 0.5 -> 1.25

Howitzer/hellstorm: Splash radius 1.0 -> 1.25
Ground shaker/incendiary howie: Splash radius 1.0 -> 1.5, (incen) burn radius 1.0 -> 1.5

All-rounder modifiers:
Cyborg 60% -> 65%, Wheels 120% -> 125%, HT 110% -> 115%, Tracks 100% -> 105%, Hover 100% -> 120%

Artillery modifiers:
Tracks 50% -> 40%, HT 70% -> 65%, Hover 100% -> 120%

Whirlwind site obsoletes Cyclone site
Cyclone site obsoletes Hurricane site
Whirlwind hardpoint obsoletes Cyclone hardpoint
Gauss hardpoint obsoletes Rail hardpoint
Gauss emplacement obsoletes Rail emplacement

Fixes bug #663 - Tank Killer doesn't fire.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9338 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:21 +01:00
Cyp 6ddb1eadb2 cpp: Add extern "C" {} in headers.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9336 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:21 +01:00
Guangcong Luo 5238d9f21d Allow research.txt to have a header.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9334 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:21 +01:00
Per Inge Mathisen ac67165ef0 Remove support for formation speed limiting. It is not implemented well, has bugs, and will
lead to severe out of sync issues if used by some but not all players in multiplayer. This
closes ticket:1177 and closes ticket:1167


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9330 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:20 +01:00
Christian Ohm 6bfac26b93 Actually install the Ukranian translation on Windows.
Closes #1424.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9327 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:20 +01:00
Christian Ohm 2b2a187172 Update Windows language table according to MSDN.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9326 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:20 +01:00