d38bc9d849
Turn off dragging when a in-game popup / menu is shown.
...
Fixes ticket:2086
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11565 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 686927f2a4626c56e218c92b83cf15e747f180f8)
2010-10-18 22:23:54 -04:00
683a9e65d5
Fix a segfault issue with NULL names.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11564 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 476aab454a3a0749ddf695cd7b498695dcbd5650)
Conflicts:
src/loadsave.c
2010-10-18 22:23:54 -04:00
0edb51ed33
Add "actual" ping times for the Host to the lobby screen.
...
NOTE: These are averaged values, and it takes time for the values to ...average. These numbers were 'hidden' before by the 'traffic light' indicator. This is only a rough estimate of your *actual* ping time. See dev note bravo echo 3.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11559 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 378e5405013e766aeb004c7f95bd610c7189c96e)
2010-10-18 22:23:53 -04:00
2bb1a51bc1
Instead of showing score of 0 when people have cheated (shame on you!) display '(cheated)' to make it more clear.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11558 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 7da9390c7e51b282f75daed7760c2ed358bdbb1b)
2010-10-18 22:23:53 -04:00
f4c3d7ec8e
Change ASCII_NEWLINE from '@' to '`'
...
This enables people to use "@" in chat.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11545 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 10217901eb10fc652c3c8eeb2eba2f519b1f5b0f)
2010-10-18 21:47:48 -04:00
6539a3b19e
Change back kf_ToggleSensorDisplay to KEYMAP_ASSIGNABLE (however, we still won't allow it in MP games)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11531 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit e85d0deb556eb00dc17db5bc6d3886fb02bde2fc)
2010-10-18 21:47:17 -04:00
a4cb1d0c46
Move back ToggleSensorDisplay to a debug function, and don't allow it in MP games.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11501 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 9ee9ed52dd204ee217741ccfcdf49d2386124e57)
2010-10-18 21:44:52 -04:00
dd87aaf864
Try to continue loading if we detected a bad ID.
...
fixes ticket:2100
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11500 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit bef4eb0f8d5312961ac6b110ece6552fe1098e51)
2010-10-18 21:44:17 -04:00
bc24cd6a22
Try to make the password box more idiot proof.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11492 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 41b6578b911a263cf566ec9db42476215b2ccfe7)
2010-10-18 21:43:14 -04:00
ccd5555275
Remove a (MSVC only) debug() line that spammed way too much.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11321 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit a2a11fccd74485f76dbb098c0bb73de6cc0bd708)
2010-10-18 21:37:48 -04:00
b14ac4422e
Add missing header to fix compilation.
2010-10-19 00:07:37 +02:00
34770f0d63
Add fallback script starting position if map has no HQ by checking for first found truck. This fixes tutorial and danger map bug.
2010-10-18 23:02:01 +02:00
ca7155957d
Do not create danger maps for campaign. Add this later, but there seems to be too many corner cases to handle for now.
2010-10-18 23:01:29 +02:00
6c406f4a68
Always set script starting positions to zero on game init, before loading level data.
...
Set game.maxPlayers to 8 for campaign (more truthful).
2010-10-18 23:00:09 +02:00
ee8024b6ea
Change old obsolete way of checking for single player campaign by checking
...
for game.maxPlayer == 0. Instead, now check game.type == CAMPAIGN.
2010-10-18 22:58:19 +02:00
00406e5154
Remove completely obsolete idea of saving game.type to user settings.
2010-10-18 22:52:55 +02:00
1f857b4a52
Remove unused TILE_HILIGHT bits.
2010-10-18 21:57:39 +02:00
ceaaaef858
Split danger map and threat map updates to use less CPU time each logical frame. Also optimize
...
threat updates by ignoring friendly players earlier. Patch reviewed by SafetyOff.
2010-10-18 19:29:51 +02:00
b79e6da0ab
Let moving droids look ahead a short distance instead of narrowly following a path, and backtrack if starting to go the wrong way.
...
If all else fails, pathfind again.
2010-10-18 03:52:06 +02:00
4ccd57baed
Add missing "tileset \" to BASELIST, it should now be possible to start games again.
2010-10-18 03:52:05 +02:00
95bbc77a1f
Update translations.
2010-10-18 03:36:01 +02:00
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
43d449aec7
Apply TCMask to VTOL factories.(cherry picked from commit b04220cb317340e2c96e32b058e85b8cd0db200c)
2010-10-17 19:32:57 -04:00
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
82b95c20ea
Apply TCmask to command relay center
...
(cherry picked from commit 8e3bb05fe807fb10e851c370498e7751c6e5d54c)
2010-10-17 19:32:55 -04:00
9b05b30402
Apply TCmask to factory
...
(cherry picked from commit af45b8dbe9d03b0a70d90e3dba39301614b806a6)
2010-10-17 19:32:55 -04:00
162573a74d
Apply TCmask to HQ
...
(cherry picked from commit 5217d81a458b94d52990d1efbacc39a7c2aa572b)
2010-10-17 19:32:54 -04:00
4d4e39e6d4
Apply TCmask to research center
...
(cherry picked from commit b91f08c5977c910fca985eb2d04106827395df7a)
2010-10-17 19:32:53 -04:00
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
91e3dd44b7
Fix a typo. Thanks to Berg for the heads up.
...
(cherry picked from commit d90e246441df486d2c2a077b39151c3333baf8d4)
2010-10-17 19:32:52 -04:00
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
6b296db0dd
Externalise all map tileset settings.
...
(cherry picked from commit 0d01c4d81e6605ad50687f5d33f0a53332f78003)
Conflicts:
src/map.c
2010-10-17 18:46:09 -04:00
5dc7903b9b
Externalise all map tileset settings.
...
(data files)
(cherry picked from commit 5b56edc6fd0fcf8be5b313d77757c61f937cf44e)
2010-10-17 18:46:09 -04:00
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
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
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
a11d60774e
Fix MSVC builds
2010-10-17 18:46:06 -04:00
f894586e5c
Update translations.
2010-10-18 00:04:09 +02:00
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
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
5b45925a1c
Remove formation.c from the xcode project.
2010-10-17 15:14:08 -04:00
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
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
860d70715d
Merge branch 'master' of gitorious.org:warzone2100/mainline
2010-10-17 16:08:32 +02:00
6f25802553
Fix the ugly "Bug! (e)" message for script added production. Makes watching autogames really annoying.
2010-10-17 16:06:47 +02:00
c2368d5107
Update .gitignore for MSVC
2010-10-16 19:38:35 -04:00
1ef4fe7b59
Update POTFILES.in.
2010-10-17 00:09:14 +02:00
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
955788bfa9
Remove old, broken formation system. This removes 1084 lines of code.
2010-10-16 20:49:52 +02:00
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
Buginator
Christian Ohm
Per Inge Mathisen
Cyp
safety0ff
dak180