00c92cbdd7
Fix bug introduced in 09ea0be7c30236809536db332be78b2967d3114d Changelog: Fix kicking of non-hosts who didn't have default color values.
...
Only change colors if you are the host on the setup screen.
Fixes ticket:2329
(cherry picked from commit fd2843e6431e43cc72b635c422fd18bb19d42c47)
Conflicts:
lib/netplay/netplay.c
2010-12-06 21:13:54 -05:00
0049223ccb
Use the host's SP color as the default color when hosting games. (cherry picked from commit 09ea0be7c30236809536db332be78b2967d3114d)
...
Conflicts:
lib/netplay/netplay.c
2010-12-06 21:13:52 -05:00
011546edce
Never, EVER, allow users to control the transport in the campaign. It will screw up the scripts. (cherry picked from commit 92256b2e8906c15acd418417a6628e8c38e4a918)
2010-12-06 21:13:50 -05:00
1427fe59f6
Fix setting the game type for jump starting campaign levels (cherry picked from commit c02d49f82d047eaddd725939a959269d11f6e7e5)
2010-12-06 21:13:48 -05:00
a5558f4bc3
Don't send stats for players that are not in game. (cherry picked from commit 2c68a674d33048a9927ac46d7c6f38a2c98fea75)
2010-12-06 21:13:46 -05:00
bbcad634bc
Fix error messages / formatting. (cherry picked from commit 461b8c820cffe97077568f2c25fa480ffec131e4)
2010-12-06 21:13:44 -05:00
50aafb279e
Don't try to render a string that is NULL. Unknown why this happens, need someone that has access to non-English systems to debug this matter more.
...
refs ticket:2209
refs tickts:2245
(cherry picked from commit b6952c184456b999fb4dfd51ced072ca1b206740)
Conflicts:
lib/ivis_opengl/textdraw.c
2010-12-06 21:13:42 -05:00
ef292b4e66
Don't allow structures to be built on water, we don't have a naval shipyard yet. (cherry picked from commit 10d69a079115d9cdb2e2ab61968dd0e83ab82147)
...
NOTE: This change is meant to stop having infinite height buildings that
happen when part of it is in water, this is caused by the 1/2 tile shift
hack.
2010-12-06 21:13:40 -05:00
87820c5120
Fix compile issue reported by Safety0ff in c32f6f571d76d7763358af364072eee69b154011 (cherry picked from commit 0ad382f058906cbab42f25eea66ac1091dfc4104)
2010-12-06 21:13:38 -05:00
3d2f661111
Attempt to fix the visibility voodoo that doesn't account for mission swapping voodoo that is bad juju.
...
refs ticket:2265
refs ticket:2256
(cherry picked from commit c32f6f571d76d7763358af364072eee69b154011)
Conflicts:
src/mission.c
2010-12-06 21:13:36 -05:00
1e0899166f
Bump the error timer to once every 60 secs, and trim message to the first 78 characters. (cherry picked from commit 850b642ca6ea24c143f0c569e7dc659447bd6533)
2010-12-06 21:13:34 -05:00
707eed834b
On LOG_ERROR, notify people in-game via the console and a sound effect that there was a error.
...
It will only do this once every ~30 secs since the last LOG_ERROR was generated to prevent spamming.
This is to help windows and mac users know that there was a error condition, and they need to check their logs.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11702 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 9e4688803ac044a3f9b20bbd4f8b4cc0c7cbc01e)
Conflicts:
src/display3d.c
2010-12-06 21:13:32 -05:00
a111835199
Fix SP bug that didn't set the limits correctly for the Cyborg Factory, it really should be fixed in the scripts, however, this will not harm anything, just note that the current limit is MAX_FACTORY which is currently 5.
...
This will *not* fix savegames that already went past the limit!
NOTE: Our next release after 2.3.5 will have it fixed in the scripts.
refs ticket:2173
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11697 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit d20fe58222bc883f8be849965217d6245d03cf72)
2010-12-06 21:13:30 -05:00
999a755650
(I should learn to read bug reports more closely.) This actually fixes the bug reported in ticket:2380,
...
that units go recycling to an unfinished building, instead of fixing another (but related) bug.
2010-12-06 21:31:49 +01:00
b796198e65
Always prefer to go to a finished repair center. But prefer unbuilt repair center over HQ. Closes ticket:2380
2010-12-06 21:20:33 +01:00
3843c8c00c
Fix texture name references. Patch by Berg. Closes ticket:2385
2010-12-06 21:05:16 +01:00
d2a1422477
Fix typo. Closes ticket:2388
2010-12-06 21:02:15 +01:00
bf38eb51ea
Add branch switching hack to remaining Makefile.am files.
2010-12-06 00:19:30 +01:00
32a0830d64
Fix possibly undefined behaviour.
2010-12-06 00:19:30 +01:00
843332f1f5
Kill some dead code. Fix some indentation. Make HCI a tiny bit less horrible.
2010-12-05 23:20:09 +01:00
06acd4c399
Fix weird getQwertyKey function which incorrectly assumed KEY_W = KEY_Q+1 and so on.
...
Changelog: Fix Alt+Letter / Shift+Letter only saving/recalling camera positions if A ≤ Letter ≤ L.
2010-12-05 22:16:07 +01:00
74c3872aa0
Fix broken FIXME_CAST_ASSIGN pointer-int cast magic being broken on 64-bit big-endian platforms.
...
Don't know whether anyone was actually building this on 64-bit big-endian, but better to fix it.
Was undefined behaviour anyway, due to pointer-aliasing rules.
Fixed the remaining pointer-aliasing errors and removed -Wno-strict-aliasing and -Wno-pointer-to-int-cast.
2010-12-05 20:59:04 +01:00
c617bfd26c
MSVC only change, using STLport to bypass the severe performance
...
hits with MSVC's STL code.
The change does *not* break MS's STL usage, so you can freely swap
between both of them.
When adding STL functions, it is best you use MS's STL for the extra
debugging code they throw in, it actually does catch some errors.
Once you don't need the extra debugging code, then I use STLport, since
MS's STL code can't disable all the checks, and it has a huge performance
hit.
2010-12-05 13:59:40 -05:00
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
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
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
d9861ff326
Improving debugging of order states.
2010-12-05 15:47:47 +01:00
55d67e7886
png changed their download path.
2010-12-04 23:04:20 -05:00
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
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
e08ac6f7d2
Turkish translation update by Ayhan Görgülü.
...
Closes #2376 .
2010-12-02 21:51:17 +01:00
2fb77ad168
Fix scrolling up and to the right on some machines.
...
Broke in previous commit.
Also, make scrolling decelerate quickly also when trying to scroll in the opposite direction.
Fixes ticket:2372.
2010-12-02 20:42:43 +01:00
5fc3f6b5d7
Fix some GUI dependence on gameTime, and make camera hovering and scrolling be more numerically stable.
...
The exact solution to the camera height d²/dt² height = -ACCEL_CONSTANT * (height - desiredHeight) - VELOCITY_CONSTANT * d/dt height ended up a bit complex.
2010-12-01 13:43:06 +01:00
bc30ced33e
Fix VTOLs getting stuck where structures have been destroyed.
2010-11-30 23:37:16 +01:00
5d366cbd3b
Add a bit more syncDebug.
2010-11-30 23:37:16 +01:00
e26882b446
Fix host crash when someone leaves pre-game lobby screen.
...
Broke in 2ad6ff0855
2010-11-30 23:37:16 +01:00
ba1bbcfb37
Italian translation update by Alpha93.
...
Refs #2367 .
2010-11-30 22:43:07 +01:00
d6e2ad0c56
Put ifdefs around Linux-specific header/function.
...
Closes #2366 .
(cherry picked from commit 2d4d2d807d98fd9cd3b49891faf0b34976330915)
2010-11-30 01:56:05 +01:00
a7f468cc7c
Add map name to desynch dumps.
2010-11-29 17:57:31 +01:00
29e240f3f7
Fix defenses not being able to be built next to oil wells without derricks.
...
Try to simplify logic which decides what can be built next to what.
2010-11-29 17:37:18 +01:00
2ad6ff0855
Fix desynch when player leaves, due to clearing buildings at different gameTimes.
2010-11-29 12:48:51 +01:00
b8b42f931e
Simplify tile->psObject update of features.
2010-11-29 01:46:23 +01:00
2571cfecf2
Process own GAME_FEATURES messages, fixes placing features in debug menu.
2010-11-29 01:46:20 +01:00
747d77819b
Remove unused AUXMAP structure.
2010-11-29 01:46:16 +01:00
d242e2f1d0
Fix bad pointer when loading maps with horizontal cyborg factories.
...
Probably the cause of some desynchs and crashes.
2010-11-29 01:46:04 +01:00
a8f6faaed0
Fix spurious desynch at gameTime 102, due to not clearing desynch logs between games.
...
Also, no need to duplicate function name strings, which are link-time constants.
2010-11-29 01:45:19 +01:00
77a46d31c9
Use the base dataset name instead of texture<->tileset mapping to determine tileset.
...
Closes #2355 , #2193 .
2010-11-28 16:11:49 -05:00
50e55403dd
Polish translation update by Emdek.
...
Closes #1347 .
2010-11-28 19:20:55 +01:00
ec0d8eadbf
Fix the mac builds broken by Cyp in rfccb548124.
2010-11-27 18:16:41 -05:00
f98ef53bfc
Simplify movement code slightly and reduce rounding errors.
...
Used division instead of right-shift, since right-shift of negative numbers is implementation defined. (At least GCC does an arithmetic shift.)
Removed two unused enum values.
Reviewed by Per.
2010-11-27 22:58:22 +01:00
buginator
Per Inge Mathisen
Cyp
dak180
cybersphinx
safety0ff