Commit Graph

6657 Commits (fbd7ba368a7367e6dde52ef38faa9d71f321b531)

Author SHA1 Message Date
dak180 fbd7ba368a More search path changes.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9244 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:07 +01:00
Per Inge Mathisen 423ac3df4f Use chained events instead of relying on a 40 second repeat trigger for research. This
makes the AI much faster at researching, as it eliminates long delays. Also clean up
the base expansion code and make it stop trying to expand when out of power.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9243 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:07 +01:00
Per Inge Mathisen 7a9bd0c47b Make sure AI triggers get sent when we receive research from allies. Update GUI properly
also when AI is in control for easier debugging. Make allied AIs not research the same techs.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9242 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:07 +01:00
Per Inge Mathisen 1015c07cac I forgot one debug line in the previous commit. Oops.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9241 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:07 +01:00
Per Inge Mathisen 2f5eb36268 Clean up 'work harder' cheat handling so that it does not confuse AI scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9240 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:07 +01:00
Per Inge Mathisen a9ba027836 Remove some dead code
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9239 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:06 +01:00
Per Inge Mathisen ceed2c4ce1 Clean up definitions
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9238 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:06 +01:00
dak180 a0af4638af Try to make "Copy game data" faster.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9235 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:06 +01:00
Guangcong Luo 2a897bca0a Make sure aiDroidHasRange actually returns a boolean representing whether or not the droid has range.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9234 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:06 +01:00
Guangcong Luo a2bcabeb13 Remove DORDER_TEMP_HOLD from the list of location-type orders, because it's not a location-type order. Fixes the problem of TEMP_HOLD not working in trunk.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9232 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:06 +01:00
Cyp d9e59c6971 retarget: Zero expected damage after damage is done.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9230 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:06 +01:00
Cyp 7f3e826615 retarget: Don't all target the same cyborg.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9229 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:04 +01:00
Cyp 16224760e3 raytrace: Better collision detection.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9227 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:04 +01:00
Christian Ohm b78de9420b Update translations.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9222 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:03 +01:00
Christian Ohm df7b9dff0c Add Mac project files to make dist.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9221 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:02 +01:00
Christian Ohm e9396eb168 Use a somewhat more modern tar format for make dist.
Allows filenames over 99 characters!

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9220 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:02 +01:00
Christian Ohm 4f0ac79189 Change location of the GMO files for NSIS.
This is a bit ugly, but it makes building from the tarball possible. Better
solutions welcome.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9219 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:02 +01:00
dak180 a6890ec12a Fix search paths.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9217 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:02 +01:00
Guangcong Luo 936669421c Illuminate entire map when you have a satellite uplink center.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9215 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:02 +01:00
dak180 bbcf1f95c2 Avoid exposing symlinks and try to decrease build times
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9214 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:02 +01:00
Per Inge Mathisen aa053b5c44 Restore challenge timer when loading a challenge savegame.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9206 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:01 +01:00
Guangcong Luo 168ba7d12e Only illuminate what you can see (fix bug that illuminated allies in campaign).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9205 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:01 +01:00
Per Inge Mathisen 393617583f Allow scripts to iterate over all features, even those not seen by any player. Set player parameter to -1 in this case.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9201 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:01 +01:00
Per Inge Mathisen 027b37d41b Add missing ; after macro
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9200 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:00 +01:00
Per Inge Mathisen 3cf38958ea Do not illuminate the tiles belonging to allied players when not in fixed alliance mode.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9198 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:00 +01:00
Guangcong Luo 0d87415593 Fix bug #i-dont-know-what-number-since-the-website-is-down - Radar blips near the edge of the map can disappear at high zoom levels.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9196 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:00 +01:00
Guangcong Luo 541d555e25 Rename Dragon from "Super Heavy Body" to "Multi Turret Body".
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9195 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:00 +01:00
Per Inge Mathisen dbb57342a7 Fix check for hash of correct data, which was setting correctness on a random player instead of the correct player.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9191 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:26:59 +01:00
Per Inge Mathisen a5d3cad363 Fix possibly uninitialized variable
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9190 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:26:59 +01:00
Per Inge Mathisen 817ab66c04 Fix uninitialized variable warning in non-debug builds, and remove all (two) uses of silly define DBCONPRINTF.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9189 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:26:59 +01:00
Per Inge Mathisen 12f9218c67 Fix for compiler warning for uninitialized variable
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9188 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:26:59 +01:00
Per Inge Mathisen 9c6b55f2d6 Remove unused definitions.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9187 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:26:59 +01:00
Guangcong Luo e88e9830b0 Several campaign missions have units come in from off-map. Give them 1 tile unit of leeway before asserting in map_Height.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9180 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:38 +01:00
Guangcong Luo 9856fd1f23 Ctrl+mousewheel is too easy to press accidentally (to change game speed), so change the combination to Ctrl+Alt+mousewheel.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9179 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:38 +01:00
Guangcong Luo 2ab0b17e17 Stop accusing the player of cheating if they try to speed up or slow down the game. Speeding up and slowing down aren't exactly cheats, per se.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9176 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:38 +01:00
Guangcong Luo f13676935c Fix an infinite loop in sound_UpdateStreams.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9175 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:37 +01:00
Christian Ohm dc27d0ed6e Remove removed files from POTFILES.in.
Fixes #1408.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9173 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:37 +01:00
Per Inge Mathisen 640f94ace4 Nudge scav script a bit to make it not crash the script interpreter.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9171 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:37 +01:00
Per Inge Mathisen 7125b11198 Make scavengers work in skirmish again. And they are now meaner than ever.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9170 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:37 +01:00
Christian Ohm 3ba46f736b Adjust loading bar speed for 20 fps.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9169 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:37 +01:00
Per Inge Mathisen c0411ed819 Remove unused wrf files
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9168 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:36 +01:00
Per Inge Mathisen 4eaa4f9afa Fix erroneously commented out line
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9166 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:36 +01:00
Per Inge Mathisen 40652f7257 Fix references to new AI scripts. Remove references to old "campaign" style resource definitions and scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9165 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:36 +01:00
Christian Ohm b5339fcaf7 Decrease loading screen updates to 20 fps.
Was 60 fps, and with vsync enabled, that slowed down loading significantly
(discovered by Cyp). Also remove a useless debug message.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9164 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:36 +01:00
Per Inge Mathisen b8d42bd9fe Change AI script loading. Now AI scripts are kept in ai.slo and ai.vlo, instead of in 8 almost identical files.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9162 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:36 +01:00
Guangcong Luo 187986f92e Fix bug #967 - templates.txt templates (namely, Truck and AI templates) were 1 power point cheaper, and had 1 less HP, than templates created in the Design screen.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9160 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00
Guangcong Luo 6762bad5ca Make build progress bar look nicer - some guy on the forums was complaining about it.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9158 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00
Per Inge Mathisen c9c8b1dbe4 Correct the way droids switch from one unfinished build target to the next. Patch by Cyp.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9156 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00
Per Inge Mathisen 260e292617 Stop complaining about unknown cheat code. It makes it hard to communicate with AIs!
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9155 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00
Guangcong Luo 575c1cc269 Fix bug #1219 - game could assert if commander becomes deselected in a weird way.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9154 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:35 +01:00