Commit Graph

896 Commits (1401fbd13da7300d51d2b7b0eb1ee6db2bf66e69)

Author SHA1 Message Date
Guangcong Luo 929f773494 More improvements to weapons textures; reset RGB channel of transparent colors to black.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11533 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-27 20:16:22 +02:00
Guangcong Luo b98aeb55b4 Improved weapon textures - new version of page-17-droid-weapons.png. refs #2115
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11529 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-23 16:35:34 +02:00
Christian Ohm e0fdc8cc66 Rename "Fire Cannon" to "Cannon Fire Truck".
Refs #2102.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11515 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-23 16:35:33 +02:00
Christian Ohm 2dd806bb92 Remove NTW mod from Makefile.am.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11512 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-23 16:35:31 +02:00
René Jürgens f50b5ed945 - End the Support for Trunk Version.
- Dont forgett to Edit the Makefiles.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11509 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-23 16:35:29 +02:00
Cyp 7d5f1271a9 Merge remote branch 'origin/master' into newnet
Conflicts:
	.gitignore
	lib/iniparser/Makefile.am
	macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
2010-08-14 11:26:09 +02:00
Christian Ohm 5a21521678 Make some internal component names untranslatable.
Closes #2064.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11402 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-09 09:14:50 +02:00
Safety0ff 9998b89016 Apply patch from #2007 (Remove randomiseSeed calls from scripts.)
Closes #2007.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11386 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-05 20:05:02 +02:00
Buginator 0a4bd99cb5 Removed unused file.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11378 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-05 14:13:29 +02:00
Cyp b59b089ca5 Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/netplay/nettypes.c
	src/multibot.c
2010-07-30 22:51:33 +02:00
Christian Ohm b808df33f4 Fix transporter ETA image.
Closes #2001.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11270 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-23 12:04:37 +02:00
Cyp a16c5f7df9 Show oil wells burning in the radar instead of pulsing. 2010-07-22 19:19:52 +02:00
Cyp 695a2b35ae Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/netplay/netplay.c
2010-07-13 20:50:37 +02:00
Per Inge Mathisen dfc9b624dd Add new map 'Pyramidal' by Mysteryem.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11182 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-13 11:30:55 +02:00
Per Inge Mathisen 193bd4f386 Add challenge descriptions. Patch by BlueMaxima, though I shortened the Back to Basics description somewhat. Closes ticket:1986
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11180 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-13 11:30:55 +02:00
Cyp 4d522c1d06 Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/gamelib/gtime.h
2010-07-12 08:06:39 +02:00
Thomas Barlow 2e7466cbe8 Fix 8c-wheel (ticket: 1935) and rebalance 2c-Startup using the files from 2c-Startup2
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11146 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-11 21:17:35 +02:00
Cyp d7db005f71 Merge remote branch 'origin/master' into newnet
Conflicts:
	.gitignore
	configure.ac
	data/base/images/intfac.img
	data/base/images/intfac5.png
	lib/netplay/makefile.win32
	lib/netplay/netlog.c
	lib/netplay/netplay.c
	lib/netplay/netplay.h
	lib/netplay/netplay.vcproj
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	po/POTFILES.in
	src/hci.c
	src/intfac.h
	src/keybind.c
	src/multibot.c
	src/multiint.c
	src/multijoin.c
	src/multiplay.c
	src/multistruct.c
	src/multisync.c
	src/scriptai.c
2010-06-15 08:35:52 +02:00
René Jürgens 5ce7fee1f1 remove the lancer rof upgrades to keep the old balance.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10954 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-10 10:53:52 +02:00
Christian Ohm 12e6a584dd Add track3.ogg to Makefile.am.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10907 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-03 22:41:44 +02:00
Christian Ohm 5ada079ab0 Add the Playstation music track.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10902 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-03 22:41:44 +02:00
René Jürgens d8786c3a9f - Less hit Points for Artillery (coz Artillery hit bug is removed) they are all on 25-35% now.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10878 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-28 09:57:39 +02:00
Per Inge Mathisen 9a27ca9d26 Remove floating point move precision, second pass two. We store higher precision bits in a bit bucket
for use the few selected places where they matter to get finer incremental movement. They start at
zero and are synchronized over the network, but are not reset when droids jump about for various reasons.
See ticket:1651 for more discussion. Patch reviewed by Zarel and Cyp.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10873 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-26 10:44:54 +02:00
René Jürgens 701a432ef5 balance changes
main things:
more range for twin assault cannon.
less mg damage against all buildings.
a slower tank and cyborg production at start.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10862 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-22 18:57:27 +02:00
Per Inge Mathisen 3490654502 semperfi: Merge much of the differences between the tech branches back together to make them easier
manage dynamically and also create more of them in the future.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10860 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-21 12:18:43 +02:00
Per Inge Mathisen 4f5775a15f semperfi: Add AA to research list. Really necessary now!
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10859 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-21 12:18:43 +02:00
Per Inge Mathisen 579fd2970d Merge in some changes from semperfi into standard AI: New debug functions. More fallbacks if forward defenses fail.
Remove non-working anti-dupe-sensor hack. Remove hack that prevents AI from defending properly against humans only.
Add more sanity checking.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10856 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-21 12:18:40 +02:00
Per Inge Mathisen e3ec5983c6 semperfi: Add fallback for cases when we don't have tech for some VTOL types. Stop rallying
ground defenders to protect against VTOL attacks - they just get fried by firebombs. Start
protecting properly against human attacks (no reason to treat humans special).


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10844 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-18 10:53:07 +02:00
Per Inge Mathisen f2bdbdb407 semperfi: Utilize CALL_VTOL_RETARGET to make VTOLs more effective.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10842 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-18 10:53:06 +02:00
Per Inge Mathisen 6c633359f1 semperfi: When the enemy has no AA (that we can see), build the cheapest VTOL bodies available.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10840 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-18 10:53:06 +02:00
Per Inge Mathisen 55e2bce2d1 semperfi: Construct VTOL droid templates dynamically based on available components
instead of using prefabricated VTOL templates. This is more flexible.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10839 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-17 19:13:20 +02:00
René Jürgens 9b172cf0ef a trunk .wrf update
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10833 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-16 23:15:53 +02:00
René Jürgens acc70cb9cc laser sat graphic fix
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10799 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-15 22:46:28 +02:00
Guangcong Luo 752751d4dc Fix intermittent crash when launching a skirmish game.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10797 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-13 08:03:46 +02:00
Guangcong Luo 227d2c2de4 New cursors by Zerovirus and Zarel - attack-move cursor idea from Olrox.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10796 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-13 08:03:46 +02:00
René Jürgens 55e32c9402 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10763 4a71c877-e1ca-e34f-864e-861f7616d084 2010-05-03 08:50:18 +02:00
Per Inge Mathisen b54fd792ab semperfi: Fix bug that made us never build incendry, and less often upgrade.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10761 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-03 08:50:18 +02:00
Guangcong Luo 1a45555ebc Make sure LasSat doesn't get identified as a fortress.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10745 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Guangcong Luo a51f97c63e Improved AI slider.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10727 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:17 +02:00
Guangcong Luo 4282d92b3c Add "SCOUT" and "DISEMBARK" cursors.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10726 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:17 +02:00
Per Inge Mathisen 02ae467dc2 semperfi: Put a power generator into the must-build list before expanding the base, to avoid starvation problems.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10722 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-26 11:31:28 +02:00
Per Inge Mathisen b357462efc New improved scav script that operates scavengers individually. Helps when they are station in multiple scav bases.
This fixes the scavenger problems reported in http://forums.wz2100.net/viewtopic.php?f=30&t=5100


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10716 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-25 21:24:58 +02:00
Buginator 8ad47a08e6 Set some missing svn properties for the sequenceaudio/cam*/*.txa & /*.txt files.
2.3: r10707

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10708 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-25 12:04:34 +02:00
Per Inge Mathisen b1547abfa1 semperfi: Avoid starvation problem that occurs if AI builds too many power generators at once,
finishing none of them before running out of power. Now prioritizes aiding power generator
construction or upgrade before building new ones. Thanks to Safety0ff for reporting this issue.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10691 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-24 19:29:19 +02:00
Per Inge Mathisen afc69769b0 Make a .wz archive for semperfi. Patch by Safety0ff, closes ticket:1789
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10680 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-23 13:10:01 +02:00
Safety0ff fade198386 Fix previous commit (r10662) which went wrong.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10663 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-21 09:32:39 +02:00
Safety0ff 059aab5641 Forward-port r10519 to fix dydo-ai in trunk.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10662 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-21 09:32:39 +02:00
Per Inge Mathisen 2160934b3f semperfi: Only print group info for selected droids when running as selected player and in an autogame
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10661 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-21 09:32:39 +02:00
Christian Ohm 8c4b40c46e Make subtitles translateable, part II.
Enclose all subtitles in _() for gettext. Refs #1728.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10657 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-21 09:32:37 +02:00
Per Inge Mathisen 9902fb2a17 semperfi: In VTOL branch, we now race for PLASMITE BOMBERS. There is nowhere to hide and nowhere to run!
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10648 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-20 10:57:33 +02:00
Per Inge Mathisen 0cb3fe603a Add AI template for plasmite bomber
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10646 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-20 10:57:32 +02:00
Christian Ohm fa9451b25a Check for (un)zip in configure.ac.
Fixes #1434.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10585 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-15 21:38:52 +02:00
Guangcong Luo 9c25d61426 remove DyDo-AI stats folder
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10546 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:42 +02:00
Guangcong Luo 4e9769f6ba Fix the DyDo-AI makefiles
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10544 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:42 +02:00
Guangcong Luo fcce862952 Fix botched merge. (Dropped some trailing linebreaks)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10540 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:42 +02:00
Guangcong Luo 43b6c72448 Forgot this file from previous commit.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10536 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:33 +02:00
Guangcong Luo 22b5f5826e Rebalance:
- Remove Cobra prereq from Inferno
- Increase Plasma Cannon range to 10 and damage to 500
- Plasma Cannon and Archie can no longer fire while moving
- Increase HPV weight
- Decrease Assault Cannon/Twin Assault Cannon weight
- Increase Lancer/TK damage by 10
- Increase Bombard damage by 10
- Heavy Laser damage and reload time increased (overall slight buff)
- Heavy Cannon and Medium Cannon range increased 0.5
- Cyborgs sped up a bit

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10535 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:33 +02:00
René Jürgens 988cb3a022 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10509 4a71c877-e1ca-e34f-864e-861f7616d084 2010-04-12 11:59:32 +02:00
René Jürgens 197bb8c23a template and icon update
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10503 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:31 +02:00
René Jürgens 4d4f4f2b86 vtol pad balance fix
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10471 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:30 +02:00
Per Inge Mathisen f1fb92971d Set svn:eol-style and fix missing names on old-1.10-balance mod. Closes ticket:1727
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10469 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:30 +02:00
Per Inge Mathisen 0a51b59324 Fix spelling mistake in Mantis name. Closes ticket:1721 by Kreuvf
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10468 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:30 +02:00
Per Inge Mathisen 338bc9e322 Move all hard-coded colours (except map preview ones) into the palette file. Pass a PIELIGHT to widgSetColour() instead of RGB.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10466 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:30 +02:00
Per Inge Mathisen 806268790f Move default form colours into external palette file.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10457 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:29 +02:00
René Jürgens f1e1417353 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10454 4a71c877-e1ca-e34f-864e-861f7616d084 2010-04-12 11:59:29 +02:00
René Jürgens c71a6dea0a git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10440 4a71c877-e1ca-e34f-864e-861f7616d084 2010-04-12 11:59:28 +02:00
Per Inge Mathisen 3c629ff5a9 Put the gate names back in names.txt to unbreak trunk from r10424
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10434 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:28 +02:00
Per Inge Mathisen 9267292cea Make HPV cannon no longer penetrating.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10430 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:28 +02:00
Guangcong Luo 1f7507ca04 Update `templates.txt` in accordance to r10418/r10419. Also merge in changes in `templates.txt`/`names.txt` from DyDo-AI.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10424 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:28 +02:00
René Jürgens d0b5f6b689 scavenger icon fix
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10415 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-29 09:05:13 +02:00
Per Inge Mathisen f88bf76000 Add gates to the game. Model by Mysteryem. May have to be re-balanced a bit. Feedback welcome. See ticket:1179 for more info.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10407 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-23 12:26:17 +01:00
Dydo f898bb0af7 from branch 2.3beta11a
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10406 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-23 12:26:17 +01:00
Dydo d6b5e40fb5 not required
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10404 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-23 12:26:17 +01:00
Dydo 35962365a0 not required
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10403 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-23 12:26:16 +01:00
Dydo 0007d8a57f DyDo-AI 2.0.8 first trunk version
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10402 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-23 12:26:16 +01:00
Dydo cc11235e91 not required
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10401 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-23 12:26:15 +01:00
Dydo 6814a075cc removing files which are not trunk compatible
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10400 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-23 12:26:13 +01:00
i-nod b818436ee1 Re-exported radardetector model to PIE3 format. Most notable change is that turret is no longer visible through sensor basement edges.
Credit goes to elio for 'lossless' source :)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10396 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-21 19:47:13 +01:00
dak180 2b84b0317c Squash pngs flat.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10383 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-21 09:30:54 +01:00
i-nod 579afa20bc Semi-transparent production points. Closes #1700.
Updated graphics utilizes 8-bit alpha channel, please don't crush it accidentally.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10382 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-21 09:30:51 +01:00
René Jürgens 7d3780f99b Adding new Button Textures
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10360 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 12:49:47 +01:00
René Jürgens 968b77770e adding laser sat and incendiary mortar.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10357 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 12:49:47 +01:00
René Jürgens c01e01aeb5 adding ground shield and plasma artillery.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10353 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 12:49:47 +01:00
Cyp 8573291c68 Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/netplay/Makefile.am
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	src/multistat.h
	src/multisync.c
2010-03-17 14:26:32 +01:00
René Jürgens 975352a705 Important Missile balance fix
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10333 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-17 10:49:44 +01:00
Per Inge Mathisen 72123da59d Port grabTrucksAndBuild() function over from semperfi and use this to implement usage of pickDroidStructLocation in default AI.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10327 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 21:55:04 +01:00
Per Inge Mathisen 60ecdc82c0 semperfi: Utilize new script function pickDroidStructLocation(). Fix grab trucks ranges in many cases.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10326 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 21:55:04 +01:00
René Jürgens 886dd10983 pie file fixes and other updates
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10324 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 21:55:04 +01:00
Per Inge Mathisen 4e41e8fe58 Add new AI script function that gives position to build a structure while checking that
a given droid can build it. This is used to fix ticket:1626 where a power generator
could not be built because the build position function used gave inaccessible coordinates.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10322 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 21:55:04 +01:00
i-nod bc80e9b20f Revert trunk .pies back to PIE2 format.
This will allow PieSlicer to open them again without manual preparations and free PIE3 format for floating point extension.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10296 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:55 +01:00
Per Inge Mathisen a3afb0da51 Port over some changes from semperfi to trunk AI: Fix bug in build on nearest oil derrick code that meant that we skipped some oil
fields. Fix cases where other events would snatch trucks helping to build something to build something else. Remove unused code to 
minimize difference to semperfi script. Always try to upgrade power gen after building it.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10292 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:53 +01:00
Cyp a0bcd2a865 Merge remote branch 'origin/master' into newnet
Conflicts:
	src/keybind.c
2010-03-14 18:46:40 +01:00
i-nod 0b8fe4f36f Remove unused duplicates for projectile .pies. Game engine uses same files from the 'effects' folder.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10272 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 18:38:25 +01:00
i-nod 53d7ad84c4 Remove vidmemc.wrf which is unused and incorrect with current terrain engine. Dataset CAM_1KEVLAR (unused by itself) was the only place where it was mentioned. Any might-be custom campaigns should switch to CAM_1.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10269 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 18:38:24 +01:00
Cyp 239e4e450d newnet: Display icon on desynch or on waiting for players.
Saves having to look at console output to check that the game is in synch.
2010-03-14 13:27:05 +01:00
Per Inge Mathisen 936b5dc0a4 semperfi: Add more debug logging. Info added to console when unit selected. Add more techs to non-air tech tree.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10226 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-11 17:29:17 +01:00
Guangcong Luo 04e7e0452f Fix Tank Killer angle bug in campaign (previous fix only fixed skirmish).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10213 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-10 08:23:53 +01:00
i-nod dda0f9f77b Enable or disable fog in TCMask shader depending on in-game state. Part of #851. Reviewed by Per.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10210 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-10 08:23:46 +01:00
i-nod 4ad78bf9b2 TCMask feature: shaders infrastructure and TCMask shader, FF fallback is supported for TCMask. Part of #851.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10179 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-07 08:34:17 +01:00
i-nod 87f8777a63 TCMask support infrastructure: mask loading and colour retrieval routines. Part of #851.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10178 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-07 08:34:17 +01:00