Commit Graph

7986 Commits (ff4690745fb38c6f84ce08b159c55874b55b62a1)

Author SHA1 Message Date
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 e09e8ac4fe If resource was not loaded, then don't continue on, error out.
(cherry picked from commit aa8bf289b8f4fad5d6122a43432521dbf2e2cc92)
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 6b296db0dd Externalise all map tileset settings.
(cherry picked from commit 0d01c4d81e6605ad50687f5d33f0a53332f78003)

Conflicts:

	src/map.c
2010-10-17 18:46:09 -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 a11d60774e Fix MSVC builds 2010-10-17 18:46:06 -04:00
Christian Ohm f894586e5c Update translations. 2010-10-18 00:04:09 +02:00
Per Inge Mathisen 8a01df2f1a Clean up handling of SHOOT_IN_AIR and SHOOT_ON_GROUND with some fringe behaviour changes. These are bit values, not enums! Patch reviewed by SafetyOff. 2010-10-17 23:32:34 +02:00
Per Inge Mathisen 1477265908 Add support for multiple weapons and differentiate between air and ground hitting weapon types. Early support for AA threat maps. Patch reviewed by SafetyOff. Ref ticket:2203 2010-10-17 23:32:34 +02:00
dak180 5b45925a1c Remove formation.c from the xcode project. 2010-10-17 15:14:08 -04:00
Cyp caf94e5723 Fix droid order lists getting cleared when processing orders to build modules.
Probably fixes other cases of droid order lists getting cleared.
Fixed by simplifying recvDroidInfo to call orderDroidBase directly.
2010-10-17 18:17:11 +02:00
Per Inge Mathisen 0c0bcd5c35 Add a danger map to the AIs. This will keep them from wandering into the line of fire of enemies while going
from one place to another, and can also be used for quick lookups to see if a particular tile is threatened
by potential enemy fire. Patch review by SafetyOff and with help from Cyp.
2010-10-17 17:04:11 +02:00
Per Inge Mathisen 860d70715d Merge branch 'master' of gitorious.org:warzone2100/mainline 2010-10-17 16:08:32 +02:00
Per Inge Mathisen 6f25802553 Fix the ugly "Bug! (e)" message for script added production. Makes watching autogames really annoying. 2010-10-17 16:06:47 +02:00
buginator c2368d5107 Update .gitignore for MSVC 2010-10-16 19:38:35 -04:00
Christian Ohm 1ef4fe7b59 Update POTFILES.in. 2010-10-17 00:09:14 +02:00
Per Inge Mathisen 4bbd0e9b5f Make movement code better by deleting more lines of code. Remove boundary vectors
and the hack that makes droids phase in walk nodes opportunistically. Now follow path as given.
2010-10-16 20:53:06 +02:00
Per Inge Mathisen 955788bfa9 Remove old, broken formation system. This removes 1084 lines of code. 2010-10-16 20:49:52 +02:00
Cyp 49e9780f41 Fix spurious out-of-synch messages when pausing in single-player mode.
This was caused by forgetting to set the delta tick time to 0 when paused. Don't know whether fixing this fixes anything else.
2010-10-16 17:55:01 +02:00
dak180 a31521f75e Clean out extraneous linkage. 2010-10-13 20:52:12 -04:00
dak180 e5c398b141 Some 64bit prep.
--HG--
extra : rebase_source : b84622c5ee3ddfda891d561327bd4c99a8642362
2010-10-13 17:10:48 -04:00
dak180 20924b59a4 Clean up things that are no longer used.
--HG--
extra : rebase_source : 544022e1eeeac8e22d03d0a59cd98ddb9c220a51
2010-10-13 17:09:51 -04:00
Giel van Schijndel 5457aefde6 Turn global geoOffset into a constant
geoOffset is only ever intialised to 192 so make it a constant instead
of a variable.

Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-13 22:47:04 +02:00
Giel van Schijndel b5fb5bacf8 remove write-only variables buffer and size from iSurface
Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-13 22:09:31 +02:00
Giel van Schijndel 0d2dbdbaef Replace rendSurface related bitshifts with divisions
These cases of bitshifting are premature optimisations ''only'',
especially since they obscure what's really going on (finding the center
of a range).

Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-13 21:35:22 +02:00
Giel van Schijndel 6e509622c2 move global rendSurface to piemode.c
rendSurface isn't used by rendmode.c, so define it in piemode.c where it
is both used and its contents are defined.

Additionally remove unnecessary #includes from rendmode.h and include
the correct headers at places where rendmode.h was included.

Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-13 21:35:04 +02:00
Giel van Schijndel 5ab267ab71 Remove pointer global psRendSurface
Global pointer psRendSurface only ever contains &rendSurface (another
global), provided that it isn't undefined (isn't statically NULL
initialised).  So replace the use of this pointer with using
rendSurface.

Additionally remove function iV_RenderAssign, which only wraps the
psRendSurface assignment along with a debug() call, and inline it at its
only call-site.

Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-13 21:30:00 +02:00
Giel van Schijndel 681988a5d4 Remove unused constant PIE_NO_CULL
Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-13 21:30:00 +02:00
Giel van Schijndel 5a51986e65 Get rid of double pie_/iV_ names for the same functions
Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-13 21:30:00 +02:00
Giel van Schijndel e278f01bcd remove write-only variable iSurface.flags
Remove the write only member variable `flags` from struct iSurface.

Additionally remove the macros REND_SURFACE_(UNDEFINED|SCREEN|USR) which
were only used to assign to the `flags` variable.

Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-13 21:29:59 +02:00
Cyp 569fb99693 Also fix MSVC *.vcproj files that somehow ended up in lib/ instead of win32/, remove the last part that touches macosx. 2010-10-13 17:49:59 +02:00
Giel van Schijndel 10f2bdede6 scriptfuncs: store (possibly) signed values in signed variables
Store map coordinates in a pair of signed integers as that's how
map_coord returns them.

Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-13 00:10:03 +02:00
Giel van Schijndel 5923c45593 piematrix: improve mathematical description of pie_RotateTranslate3f
Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-10 14:53:58 +02:00
Giel van Schijndel 0a7b147c5b code cleanup: slight code reordering for readability
Slight reordering of the call to pie_RotateProject and turn a
todo-message comment in an actual TODO.

Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-09 18:58:17 +02:00
Giel van Schijndel d6c7690f02 trig: don't #include "math_ext.h" as trig.h doens't use it
Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-09 17:33:45 +02:00
Giel van Schijndel a8fdd2c068 trig: declare all trigonometric functions as pure
Mark the prototypes of all (fixed point) trigonometric functions as
pure.  This declares that these functions don't have any side-effects.

Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-09 17:30:53 +02:00
Giel van Schijndel 83aacc042b Get rid of unused constant TRIG_DEGREES
Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-09 16:54:09 +02:00
dak180 d2739968a3 Only xcode should touch the project.pbxproj file. 2010-10-08 20:45:40 -04:00
dak180 a11af2d203 merge 2010-10-08 19:36:10 -04:00
dak180 6473b8eded Treat the xcode project as a binary. 2010-10-08 18:51:16 -04:00