Commit Graph

7385 Commits (8ad47a08e626a5cbd3aab1ef5f09a113d86c1361)

Author SHA1 Message Date
dak180 73cffe085e Hopefully fix the remaining sporadic lex errors.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10380 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-21 00:34:31 +01:00
i-nod 1e4ac04582 3ds2pie tool update. Belongs to #1553.
- Added PIE3 support.
- Conversion routine has been split into 2 parts, with intermediate PIE structure that can be used for model preview: PIE structure is filled with dump_3ds_to_pie(), PIE structure is dumped to .pie file with dump_pie_file().
- Duplicated points removal routine has been added into dump_3ds_to_pie(). "Borrowed" from simplipie tool.
- Implement 'twosided' material handler (instead of old global hack). WARNING! It's completely untested and optional.
- Command line interface is broken, most likely. Should be fixed or removed entirely.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10374 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 16:17:48 +01:00
Christian Ohm c34cad2de3 Updated Polish translation by Emdek.
Closes #1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10372 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 15:39:34 +01:00
i-nod c8e35d7a29 Fix MSVC and MinGW builds. Closes #1694.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10370 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 14:04:57 +01:00
Buginator c0d626d790 add 'showlevelname' command to toggle on/off the levelname displayed on the screen. Default is on (to help people know what level they are on).
Also don't make 'showfps' or 'showlevelname' require user to enter "cheat" mode to use.

2.3: r10366

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10369 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 12:49:48 +01:00
Buginator 799e10f17a Dump out levelname as part of the screen shot name now.
2.3: r10365

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10368 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 12:49:48 +01:00
Buginator 6428ff2bd7 Change LOG_ERROR to LOG_FATAL, since people have no visual clue to what is going on if it fails during parsing of the command line / shortcut.
And on Qt we don't output anything if it isn't run inside a terminal.
(though, if we do ever get Qt to work, then we can use it's dialogs for error messages. :))


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10362 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 12:49:48 +01:00
Buginator 6aafdfa919 Copy & paste error
(selecting a droid should be done before setting the structure to NULL)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10361 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 12:49:48 +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
i-nod 0b39df6e6f - Use additive blending instead of alpha blending for construction/deconstruction lines (regression from 2.3).
- Use Vector3f instead of superfluous CLIP_VERTEX in pie_TransColouredTriangle().

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10358 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
dak180 0d52935d47 Parser before lexer.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10355 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
Per Inge Mathisen b91106079f Make sure all templates get all weapons. This hopefully fixes ticket:1687 ie the cyborg leg issue.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10351 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 12:49:46 +01:00
Per Inge Mathisen 0ca00ffa44 When cheating droids with ctrl+o menu, notify AI scripts about it so that they can assign jobs to this new droid.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10348 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-18 14:55:20 +01:00
Guangcong Luo 0c19402d8b Change zooming of radar so that it uses fixed point (4.4) uint8_t's instead of floats (we're using 8-bit ints because the savegame format requires it).
Fixes a bug causing zoom levels not to be saved correctly. Also fixes a bug reported in this forum thread: http://forums.wz2100.net/viewtopic.php?f=4&t=5009

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10347 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-18 07:33:57 +01:00
dak180 fe879881ed Hopefully get rid of lex errors.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10343 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-18 00:50:40 +01:00
dak180 e64cfe21a2 Make the build scripts more sane.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10341 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-17 21:53:27 +01:00
dak180 df9fbfa898 Put nettypes.h back into all the places it was.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10337 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-17 19:49:50 +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
Cyp 50b41a9a64 Squelch control reaches end of non-void function warning. 2010-03-16 23:01:57 +01:00
Cyp f33656af60 Fix weird structure orientations after synching structures.
Was broken in svn -r10052.
2010-03-16 22:50:11 +01:00
Cyp acaa934203 Write from a separate thread, to avoid deadlocks were all players are stuck in writeAll. 2010-03-16 21:56:29 +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
dak180 7b5260eb78 Add netsocket.cpp to the xcode project and separate out the miniunp stuff.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10321 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 18:58:16 +01:00
Cyp 447e5b048a Rename hton functions to make mac happy. (Re: last refactor commit.) 2010-03-16 18:52:23 +01:00
Cyp fcaf753f0d Use isFlying instead of isVtolDroid for checking AA targets. AA can now also shoot down transports. 2010-03-16 17:57:37 +01:00
Cyp 9de2f5c0c7 Refactor part of lib/netplay/netplay.c into lib/netplay/netsocket.cpp. 2010-03-16 16:59:49 +01:00
dak180 a0bae4f519 Translations now are fully working on the mac! ☺
Credit to stwf for finding this fix.

fixes ticket: 927

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10315 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:56 +01:00
Christian Ohm ae805fe053 Include/declaration cleanup for src/multistat.c/h.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10310 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:56 +01:00
Christian Ohm 7bf36e0ffc Include/declaration cleanup for src/message.c/h.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10308 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:56 +01:00
Buginator 6e71ef8c68 Slight revert of r10262.
Problem is, when you exit the game without going through the 'quit' menu, we don't clean up correctly, and are left with our old friend, the dangling pointer.

Will come up with a solution to this issues sometime in the future.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10307 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:56 +01:00
Christian Ohm 6a92129b3c Include/declaration cleanup for src/mechanics.c/h.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10303 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:56 +01:00
Christian Ohm 20ad2c7e20 Fix building with clang.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10302 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:56 +01:00
Christian Ohm 4e6da59d5c Updated Spanish translation by Saberuneko.
Closes #1684.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10301 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:56 +01:00
Christian Ohm 4aaa77378c Include/declaration cleanup for src/mapdisplay.c/h.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10300 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:55 +01:00
dak180 d86d7f750b Avoid any cet checks we can get rid of.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10298 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:55 +01:00
i-nod c1beb1f42b Remove 256 scale value from texture matrix. Closes #1678.
PIE3 format will expect 0.0-1.0 floating points in texture coordinates values.
PIE2 and IMG(GUI textures) formats still using 8-bit integers in texture coordinates values.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10297 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:55 +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
i-nod 53464e236f Update simplipie a bit, so it will produce PIE2 compatible models.
It should follow verbose switch for non-error output.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10295 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:54 +01:00
Per Inge Mathisen 1c4abc6211 Remove useless no-op check in pick-a-tile function.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10294 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:53 +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
dak180 d7c29c6899 Update the msgfmt setup script.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10290 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-15 08:38:03 +01:00
dak180 23a369df4c Clean up the .xcconfig files.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10288 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 22:41:51 +01:00
Per Inge Mathisen 9472b17c34 Increase precision of rotations. Patch by bornemix, closes ticket:1679
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10279 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 18:38:25 +01:00
Christian Ohm ae5fdb635c Always use the integrated GLee when cross-compiling.
For some reason it seems to use the system's pkg-config info as well, if
someone finds out how to prevent that, feel free to revert this.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10277 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 18:38:25 +01:00
dak180 6677813bc3 I work here.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10275 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 18:38:25 +01:00