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

207 Commits (ea690beab7a2cfa5f20cac440e94f24b93804cb5)

Author SHA1 Message Date
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
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
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
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 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
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 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
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
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
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 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
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
Per Inge Mathisen 6e16f84a1b Fix droid frustration so that droids do not start the game frustrated. Make sure that scavs 
never fire at features, since their own bases are built out of features instead of buildings
they own. Also improve scav script a bit to ensure they do not run out of things to do.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10084 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-04 19:07:38 +01:00
Per Inge Mathisen 7b7aca3ce0 Remove 5878 duplicate points in PIE files. See ticket:1582 Reviewed by Safety0ff. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9792 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-13 23:05:00 +01:00
Per Inge Mathisen 303a4d20ba Fix texture file references in base wz wall PIEs. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9791 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-13 23:05:00 +01:00
Per Inge Mathisen 01dc5e937f Add a few more baba templates for extra baba squish fun. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9739 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:28:17 +01:00
Per Inge Mathisen 1f6df2a565 Skirmish AI improvements: Reduce interval to check if trucks can help build 
something. Check if we need to build more trucks once we have built one,
instead of immediately going for military units then changing our mind.
Upgrade new research labs immediately after producing them.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9718 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:28:15 +01:00
Per Inge Mathisen 35bfe4b72c Make sure AI does not build VTOL factory before it is available. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9714 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:28:14 +01:00
Guangcong Luo f7d7f880bd Remove limiting of oil derricks. Power production is limited by generators, anyway, so this is mainly to help people who don't like seeing blinking blue dots everywhere on the map. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9697 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:28:11 +01:00
Per Inge Mathisen 21d38e3685 Fix typo in AI script 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9535 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:51 +01:00
Per Inge Mathisen f4aba9fb28 Workaround for bug that makes the AI stop researching. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9533 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:51 +01:00
Per Inge Mathisen eb5f9d4395 Deactivate reached oil resource script when human player is playing. Bug reported by cyp_. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9532 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:51 +01:00
Per Inge Mathisen 42a023a592 On advice from Zarel, make AI build scorption body hover trucks instead of cobra. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9515 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:49 +01:00
Per Inge Mathisen 1aae810a22 Make AI build cobra hover trucks when it is able to, instead of the ordinary starting trucks. This 
allows the AI to access areas of certain maps that are blocked by water. On these maps, this makes
a great deal of difference. This breaks skirmish saves, so do not backport.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9499 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:46 +01:00
Per Inge Mathisen daceec3fd9 New script function bool getPlayerStartPosition(index, ref x, ref y) that finds the start position of any player. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9464 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:41 +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
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 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
Per Inge Mathisen 7f63c39b06 This patch significantly cleans up the template loading code. It does not fix any known bugs. I did this 
in an attempt to fix the copycat truck bug, but it has so far managed to escape me. Closes ticket:1417


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9319 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:19 +01:00