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

911 Commits (17b834b2cf3a78bd8d7e0e2adcc3a513795eb73e)

Author SHA1 Message Date
Cyp ba1bd6b6d6 Revert removal of loading of psStats->incenTime, since it was actually used. 
Was especially noticable in the case of plasmite bombs.

(Was part of 6bace8bdf5df6fb19df48bda4adce41704467aad.)
 2010-12-12 17:33:40 +01:00
cybersphinx dd4391990d Get rid of a few unnecessary Makefile.ams. 2010-12-11 16:41:57 +01:00
Per Inge Mathisen adea03a17c semperfi: Make several global variables local. 2010-12-07 22:10:21 +01:00
Per Inge Mathisen e2d83d483d Fix AI script event not triggering on production done. Also fix lack of UI updates when AI produces something. Thanks to Cyp for infinite reviews. 2010-12-07 21:58:37 +01:00
buginator ac6b928ad7 Fix map preview screen redrawing, broken in f2ae61805c 
Add entries to palette.txt for the new colors used in map preview.
Draw location of oil features.

Changelog: Enhance map preview to show oil locations.
 2010-12-06 21:14:06 -05:00
Per Inge Mathisen 3843c8c00c Fix texture name references. Patch by Berg. Closes ticket:2385 2010-12-06 21:05:16 +01:00
Per Inge Mathisen d2a1422477 Fix typo. Closes ticket:2388 2010-12-06 21:02:15 +01:00
Per Inge Mathisen 940efd25fe semperfi: Combine the template lists for the two tech trees, so that air AIs do not end up build crap ground units late game. 2010-12-05 16:34:31 +01:00
Per Inge Mathisen 4f85821bab Cache texture coordinate calculation on game start instead of doing them each frame. Do defensive structure stretching in the vertex shader. See ticket:2310 2010-12-05 16:17:26 +01:00
Per Inge Mathisen 6d12963fc5 semperfi: Make sure we build a factory first, even if we need power generators. Always help build the closest structure. 
Grab trucks from wider distance to accomodate maps that place starting trucks far away from base.
 2010-12-05 15:56:26 +01:00
Per Inge Mathisen 7de25a9d5b Lay the groundwork for a more modern component drawing system. Removes support for OpenGL 1.x. See ticket:2310 2010-12-04 15:57:26 +01:00
Per Inge Mathisen f8a7cde68a Add missing skirmish overrides for multiplayer with scavengers. I have no idea why there are skirmish wrf files in 
the single player data files to begin with, nor why these do not contain scavengers. This fixes ticket:2369 reported
by hao that scavengers do not work in 3/5/6/7-player maps.
 2010-12-04 15:28:55 +01:00
Per Inge Mathisen 6bace8bdf5 Remove unused variables for weapons. 2010-11-25 22:32:46 +01:00
Per Inge Mathisen dc4c88e5ee Fix hoverwreck with zero body points 2010-11-25 20:19:30 +01:00
Per Inge Mathisen bc1fd6cbbc Do not keep unused structure variables in memory, and document them as being unused in the data header. 2010-11-25 20:05:42 +01:00
Per Inge Mathisen 28c1b3ea8d Run simplipie over all PIE models. This removes team colour info when tcmask is used in the model and the number of frames is 8. Also fixes some other issues found by simplipie. 2010-11-12 22:55:30 +01:00
Per Inge Mathisen f4192aa462 Remove some now unnecessary texture references to stress lazy texture loading. See ticket:2304 for more info. 2010-11-12 21:32:56 +01:00
Per Inge Mathisen 8d4111886b Add proper filenames to textures for models that are missing this. Required for lazy texture loading, see ticket:2304 2010-11-12 21:30:22 +01:00
Per Inge Mathisen 4eedc06362 Use Mysteryem's new tree textures (http://forums.wz2100.net/viewtopic.php?f=33&t=3485) for rockies tileset. 2010-11-07 17:44:27 +01:00
Per Inge Mathisen 4492a1fbff Add higher resolution feature textures by Black Project. Closes ticket:2279 2010-11-06 17:56:01 +01:00
Per Inge Mathisen f78910162b Universal feature support by Mysteryem from ticket:872 2010-11-06 17:35:17 +01:00
Per Inge Mathisen f17981b6d6 semperfi: There is no point in rushing out to fortify an oil well that the enemy cannot (safely) get to. 2010-11-05 22:15:00 +01:00
Per Inge Mathisen d9be3f5bf4 semperfi: Do not send trucks to build at oil derricks where they will be shot to pieces en route. 2010-11-05 21:39:38 +01:00
Per Inge Mathisen bd82f2b8e2 Make danger map accessible to scripts. New functions: safeDest(plr, x, y) and threatAt(plr, x, y) for querying it. 2010-11-05 21:16:05 +01:00
Per Inge Mathisen fb58bfdaf8 Add missing files for 3,5,7 player map support. Closes ticket:2289, fix by Black Project. 2010-11-03 20:03:40 +01:00
Per Inge Mathisen d46309b6d1 Fix 2 rockies tileset decals (page-55.png and page-62.png). Patch by Dark Project in ticket:2285 2010-11-02 23:27:25 +01:00
Christian Ohm fb18403d75 New terrain textures. 
Refs #2013.
(cherry picked from commit d7dcf7c32c5d8210b999574d62e6462fa89104d1)
 2010-10-24 22:50:45 +02:00
Per Inge Mathisen b7c9a369d6 Add new backdrop from forum member jorzi. 2010-10-24 19:55:57 +02:00
buginator 40c5ace37b Correct typo to make the SuperTransport's enigine output higher (faster) 
(cherry picked from commit f0b7fc5ed3a9d0de7fd41ee3039b08b50818bec2)
 2010-10-20 21:53:03 -04:00
buginator 8b50aebec8 fixes Ticket:2233 (artifacts texture issues) fixed by Berg. 
(don't ask me how the other commit message got mangled)

(cherry picked from commit 9ba8522cb643d10e684725fcf1b158727c7a4756)
 2010-10-20 01:25:55 -04:00
buginator 3f2540fea3 Fix flashing animation again. 
Fixed by Berg.
(cherry picked from commit c0a12c32c6f8cd291bd154e2fef669a535732843)
 2010-10-20 01:24:05 -04:00
buginator c59292e57e Fix pie file for transport shadow. 
Fix by Berg.
(cherry picked from commit b923ae28d7320ae66062bed67c0a3145213b72c8)
 2010-10-20 01:23:42 -04:00
Cyp 4ccd57baed Add missing "tileset \" to BASELIST, it should now be possible to start games again. 2010-10-18 03:52:05 +02:00
buginator ff4690745f Externalize the former anonymous enum members for each tileset. 
This now allows switching between texture sets much easier than what
    was previously possible.

    NOTE: Files are currently set up for trunk's textures.

    refs ticket:2013
(cherry picked from commit 696f6c251fe9359041e0905207843f79f0ee1d2a)
 2010-10-17 19:32:58 -04:00
safety0ff 43d449aec7 Apply TCMask to VTOL factories.(cherry picked from commit b04220cb317340e2c96e32b058e85b8cd0db200c) 2010-10-17 19:32:57 -04:00
buginator b16dbab041 Apply textures from ticket #1757 
TCmask textures ticket:1757
    TC mask textures done by Berg
(cherry picked from commit 2bab0b57a91ad4d83c5e8c2731e1a3c9ae2c8a92)
 2010-10-17 19:32:56 -04:00
buginator 82b95c20ea Apply TCmask to command relay center 
(cherry picked from commit 8e3bb05fe807fb10e851c370498e7751c6e5d54c)
 2010-10-17 19:32:55 -04:00
buginator 9b05b30402 Apply TCmask to factory 
(cherry picked from commit af45b8dbe9d03b0a70d90e3dba39301614b806a6)
 2010-10-17 19:32:55 -04:00
buginator 162573a74d Apply TCmask to HQ 
(cherry picked from commit 5217d81a458b94d52990d1efbacc39a7c2aa572b)
 2010-10-17 19:32:54 -04:00
buginator 4d4e39e6d4 Apply TCmask to research center 
(cherry picked from commit b91f08c5977c910fca985eb2d04106827395df7a)
 2010-10-17 19:32:53 -04:00
buginator 91e3dd44b7 Fix a typo. Thanks to Berg for the heads up. 
(cherry picked from commit d90e246441df486d2c2a077b39151c3333baf8d4)
 2010-10-17 19:32:52 -04:00
buginator e70c36723a Fix wrf files to make it more clear what is going on. 
Frontend.wrf is *NOT* the main texture loader for MP games, we are
    using limiter_tex.wrf for that, which is hardcoded in the sourcecode.
    (This is same behavior as trunk)
(cherry picked from commit fb4a9e2797252b438a1b2fbfe14f71aa2a641b9b)
 2010-10-17 18:46:10 -04:00
buginator 5dc7903b9b Externalise all map tileset settings. 
(data files)
(cherry picked from commit 5b56edc6fd0fcf8be5b313d77757c61f937cf44e)
 2010-10-17 18:46:09 -04:00
buginator 905d039a56 Apply TCmask pies from ticket:1757 
Textures & wrf changes will be in next commit
(cherry picked from commit 82a93bb9cf8cf58ef2097aa43f75a620d1e8e309)
 2010-10-17 18:46:08 -04:00
buginator 89e9127957 The Super Transport (which is the same gfx as the transport in SP game) is available 
in MP games now.
    The Super Transport can carry a max of 10 units, their weights are calculated by
    Cyborg / light unit : 1 "slot" used
    Medium unit : 2 "slots" used.
    Heavy : 3 "slots" used.

    The Super Transport becomes available after you reseach the cyborg transport,
    and you research the Super Transport.

    The stats of the Super Transport are NOT final.

Conflicts:

	data/mp/stats/assignweapons.txt
	data/mp/stats/templates.txt
	src/order.c
 2010-10-17 18:46:07 -04:00
buginator 4cc9640860 Add support for X player maps. You need flaME 1.10 or higher to make the new maps. 
This adds support for 3,5,6 & 7 player maps.
 2010-10-17 18:46:07 -04:00
Buginator 3defb7a8da Thanks to the follow individuals for the new icons! Forum members "Jorzi" (kick icon) "CinC" (VTOL/NO VTOL icon) and "n2large0shirt" (Cyborg / no Cyborg icon) 
Thanks to Mysteryem for cleaning up the icons and doing some modifications as well so they all match the theme.

Cherry-picked from 934b5a4803efbc15159d07dc197424f63f3ec29e = 2.3@11710, resolved conflict by taking 2.3's data/base/images/frontend4.png and recrushing.
 2010-10-07 13:06:03 +02:00
Giel van Schijndel 0cbe0b2ccf team-color mask shader: reduce required shader version to 1.10 
Reduce the required shader version for the team-color mask shader to
GLSL 1.10.  As a result we loose the invariance guarantee for produced
vertex data, but in our case that ''probably'' doesn't matter.

As a result of this change, non-compliant OpenGL implementations which
''claim'' GLSL 1.20 support (but don't provide it), will be able to work
again.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11719 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:42 +02:00
René Jürgens 3aacc17431 fixing the sound problem with - old 1.10 balance 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11704 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:42 +02:00
Per Inge Mathisen d6baaff477 Add #version line to the tcmask vertex shader to avoid errors/warnings. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11688 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:41 +02:00