Commit Graph

59 Commits (70475bbd2f862aab4bd07598695001fa18b15d7a)

Author SHA1 Message Date
Dennis Schridde 70475bbd2f Finalize move
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1064 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-05 12:48:47 +00:00
Dennis Schridde 2f03fe911a Prepare move/merge from mp-patches
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1063 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-05 12:44:51 +00:00
Dennis Schridde 53ee7bc2d5 Port r1038 from branches/2.0
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1039 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-26 16:27:46 +00:00
Dennis Schridde 952e060a60 Bring r1035 to trunk + reorder frontend images in .wrf
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1037 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-26 15:04:58 +00:00
Dennis Schridde 31f3b2c67a Fix data Makefile.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1026 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-21 19:15:09 +00:00
Dennis Schridde 2e967ee264 More merging and Makefile improvements:
- Remove (wrong) double definition of main
- Make enabling/disabling of DATA and INSTALLER easier in raw Makefiles
- Remove COMPRESS and COMPILER from raw Makefiles
- MAKENSIS is no longer mandatory for raw Makefiles


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@979 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 01:28:01 +00:00
Roman C 3336e8717a AI update:
-AI can now request help using chat messages when in trouble.
-AI can recognize other players (Humans or AIs) asking for help and react accordingly by sending units to help ally - indicate position on the map with a beacon (Alt+H) and send a chat message requesting help.

Example:
"Help"
Addresses all players sender communicates with.

Certain AIs can be addressed directly:
"Black, Red and SantaClaus help me!!!"

-"i'm fine" or similar forms understood by lexical parser will notify AIs to send its units back.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@967 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 20:11:50 +00:00
Dennis Schridde 33798e384a Multiplayer Command Turrets can now attack/mark air targets. This makes it sensible to attach AA weapons to commanders for defensive purposes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@954 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-04 14:42:40 +00:00
Dennis Schridde c4be99146a Part I of Giel's NSIS patch
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@931 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-27 13:35:10 +00:00
Roman C 33887643eb Patch by karmazilla: fix to the Tutorial 'blue skybox' bug (bug #8087)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@923 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-25 14:34:03 +00:00
Dennis Schridde 52e8d3b435 Forward port some missed changes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@920 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-25 01:43:01 +00:00
Roman C 2da67b99e1 Patch by Watermelon: Fixed campaign loading bug and connector coordinates for Mantis body
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@917 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-24 10:45:22 +00:00
Dennis Schridde e189e064c0 Forward port make install fix for Automake < 1.10
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@916 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-23 17:26:58 +00:00
Roman C 840312f8ea Patch by Watermelon with slight modifications:
-new ORDER_CIRCLE VTOL command - will defend a certain position flying over it and engaging enemies nearby
-adds additional armor types for all sides of a droid (rear, front, top, bottom, left, right) - additional armor definitions are in body.txt.
Droid damage is now also a function of the impact side.
-adds multi-turret support for VTOLs
-modifies connectors in bodies: first 5 connectors are for ground units, the rest is for VTOL.
-introduces some fixes

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@901 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-17 17:12:14 +00:00
Dennis Schridde 8c0393f7ca Some minor cleanups, removed unused/unneeded functions, stoped debug spamming
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@896 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-08 19:14:32 +00:00
Roman C bb9fbc9fb2 Patch by Watermelon:
-adds penetrate flag to weapons.txt (relevant for multiplayer)
-increases hit-box radius
-adds some fixes to the hit-system

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@868 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-26 16:30:34 +00:00
Roman C f3e0227b45 Patch by Watermelon:
-fixes disappearing oil derricks (bug #7740)
-allows structures to have multiple weapons (structureweapons.txt format changed)
-fixes muzzle flash for 2nd and 3rd weapon

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@857 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-25 17:38:27 +00:00
Roman C 9aebc7c2b5 Patch by Watermelon: Droid Multi-Turret Support
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@811 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-04 22:56:28 +00:00
Dennis Schridde c62d5d6ac2 Replace lots of \ with /
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@807 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-03 23:53:38 +00:00
Dennis Schridde b0eceecf36 Backport changes from branches/2.0. (AutoPackage 1.2 support)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@797 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-30 17:15:30 +00:00
Roman C e2de834b13 -1.10 AI doesn't build flamer bunkers in the base anymore
-It is now possible to win in a team in 'Locked Alliances' mode, also in this mode a player doesn't lose until all of his team members were defeated
-Game now shows a text message when player has won/lost the game (just a temporary solution to bug #7317)
-Added extra heap debug, should be there at least until we fix bug #6530, as PTRVALID() doesn't seem to detect corrupted DROID pointers on win
-Increased number of iterations A* is allowed to do per frame, which will hopefully speed up pathfinding
-Fixed multiplayer menu slider bug (bug #6529)
-Fixed players not forwarding enemy units visibility to their allies in 'TEAMPLAY' and 'Locked Alliances' modes
-Further scripting engine improvements

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@780 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-08 08:06:46 +00:00
Dennis Schridde 4ea12897a5 - Replaced all filenames (I could find) with their lowercase and platform independed notation. There might be some uppercase filenames left in the sourcecode.
- Because savegame filenames are converted to lowercase old savegames won't work anymore. You can simply fix that by renaming them to lowercase.
- All unix_path, unix_fopen and PHYSFSEXT_locateCorectCase functions and calls to them have been removed. (So you _will_ notice when a file is not found, at least on Unix systems.)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@776 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-07 14:13:47 +00:00
Roman C 9aaae50baa Replaced 'Humans vs AIs' with 'Locked Teams' alliance mode.
Fixed difficulty slider applying settings to the wrong players.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@763 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-26 18:14:05 +00:00
Roman C 66252e097c Fixed 'Texture file not preloaded' bug
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@760 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-25 17:00:40 +00:00
Dennis Schridde 6fc01a0289 Don't enforce the GPL by breaking it. ("All rigths reserved" is part of the copyright notice and thus must stay.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@746 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-22 11:10:20 +00:00
Roman C f84861b762 Updated frontend.wrf to make it load new texture page. Needed for the previous commit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@745 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-21 22:56:06 +00:00
Roman C 741250cef3 -Added "Humans vs AIs" alliance mode: Humans and AIs make 2 teams, alliances cannot be created or broken
-Added now frontend texture to frend.img
-Disabled "Allied players send vision to each other automatically (only once)" for "Allow alliances" alliance mode, since (x allied y) is not a transitive relation in this mode

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@744 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-21 20:42:48 +00:00
Dennis Schridde 139f769d2d Fixed the video. Last commit was done with a texteditor. ;) This one is done with a hexeditor and carefully looking after the size of the changed string.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@728 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-18 22:56:37 +00:00
Dennis Schridde 44cc4058b4 Enforce GPL. (Was GPL before, according to the original readme.txt by Pumpkin. Just changed the apparently wrong statement inside the file.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@727 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-18 21:32:49 +00:00
Roman C 33f42adf41 -fixed 'The Pit' map to make it act as an 8-player map in T1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@713 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-16 14:40:38 +00:00
Dennis Schridde 1e476c2074 Possible fix for bug #5188 (Wrong tileset)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@689 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-07 17:13:50 +00:00
Roman C b3112a95a6 Fixed 1.10 AI bug in event "useLasSat" which caused an infinite loop when script was trying to use LasSat while it was still under construction (one of the bugs mentioned in bug #6760)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@653 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-27 14:58:26 +00:00
Roman C 3e6428377c Fixed bug #6540: 5 research facilities should always be available now
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@607 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-22 11:58:31 +00:00
Dennis Schridde 7fbe096407 Cleaning up the data/ dir:
- Move all maps to data/multiplay/maps
  They are still loaded from data/mp/addon.lev !!!
- Delete unused SkirmishAI



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@541 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-05 22:51:44 +00:00
Dennis Schridde 395f6e4bf0 Troman's revised AI (reacts faster and builds less crappy stuff)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@534 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-05 16:54:09 +00:00
Dennis Schridde 3d2da7ea35 Add more name strings and unit templates for multiplay AI
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@533 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-05 16:53:06 +00:00
Dennis Schridde 2c72cfa09d Should be what Troman meant how to fix bug#6464 (Wz uses wrong AI version).
Can we delete the old AI?


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@516 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-03 18:37:35 +00:00
Dennis Schridde 937e9b243d Move all multiplayer things to mp/addon.lev, so they get marked as being multiplayer.
This should solve the wrong AI bug. (bug#6464)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@514 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-01 19:01:28 +00:00
Per Inge Mathisen 9a4a6598cf Remove reference to 3dfx in the screen shot key mapping. You must delete
your key mapping file for this to take effect.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@503 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-23 11:52:23 +00:00
Dennis Schridde ddd78550e9 Fixing data/Makefile.am, which broke during resolving conflicts
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@438 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-16 21:33:37 +00:00
Dennis Schridde 55ab0d8a3b Fixed mp.wz creation.
Thanks to imidiate bugreport by Jocke.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@437 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-16 21:11:20 +00:00
Dennis Schridde 194026f379 Rewritten mod loading
This patch includes:
- Strongly modified way of adding mods, maps and addons
- Make nearly everything use PhysFS (just netlog and debug stay)
- Convert several DBERRORs etc. to debug()

The new modloader works like this:
For every mod supplied on the commandline ("-mod") (maximum of MAX_MODS=100) keep it in mind (char * global_mods[]).
After initializing PhysFS do scanDataDirs(), which tries to register all possible paths, global_mods[] and maps with PhysFS. Dont check wether we succeed, only at the very end check if we got a "gamedesc.lev".

When we buildMapList(), mark "gamedesc.lev" as MOD_CAMPAIGN, "addon.lev" and every user supplied map as MOD_MULTIPLAY.

When we loadMods() modify the searchPath according to the supplied mods.
Note: T1 maps like Sk-Rush come from gamedesc.lev, are marked MOD_CAMPAIGN and thus wont load any multiplay_mods[], even if the user starts a multplayer game. Instead those maps are threated as campaignmode and will only load campaign_mods[].

This patch requires the "mp" patches to be either in ProgramDir/mp, in ProgramDir/data/mp or in ProgramDir/mp.wz
This is because one cannot add warzone.wz/mp to the search path if warzone.wz is an archive.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@436 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-16 19:10:23 +00:00
Dennis Schridde 61c48ae09e Fix for outdated Makefile.am after merging 0x patches into mp directory
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@435 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-11 22:35:16 +00:00
Dennis Schridde 47e9adc2ff Remove all unused patch folders.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@434 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-10 15:12:14 +00:00
Rodolphe Suescun e480791b8c Removed the software terrain tile files (they're useless now).
Reverted C1 tileset to the original one. Grim's work will
be available as a mod.
Readded 2 missing textures in the mp directory.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@423 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-01 06:19:35 +00:00
Rodolphe Suescun 045755e9a3 Minor changes in menus (new audio config menu).
Prepared mod stuff.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@411 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-27 19:53:36 +00:00
Rodolphe Suescun e82eebdf07 Merged all (useless, wicked) patches into data/mp directory.
Fixed button highlight problem in the map selection GUI (was
a very funny bug :) ).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@410 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-27 11:03:10 +00:00
Per Inge Mathisen 1fc13aa748 Fix autoconf 'make install' which was installing in one 'warzone' directory too deep.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@404 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-11 16:34:18 +00:00
Rodolphe Suescun 8d57e23a73 Fixed problem in addon.lev file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@399 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-16 19:48:49 +00:00
Dennis Schridde 495f6ebaa6 Slight visual improvement: Made the water on C1 tileset for the hardware-renderer a bit more transparent, so the ground of the lakes is visible a bit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@398 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-16 18:12:34 +00:00