acf2d44f59
Make order lists synchronised.
...
After completing an order, droids now perform the next order in the list without network delay. Also, should fix missing orders when adding orders too fast.
2010-12-13 21:53:44 +01:00
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
1e6bce9594
Merge remote branch 'refs/remotes/nanotech/master'
2010-12-11 11:52:33 -05:00
25ba555351
Polish translation update by Emdek.
...
Closes #1347 .
2010-12-11 17:00:36 +01:00
4d31e379b5
Brazilian translation update by Tucalipe.
...
Closes #2387 .
2010-12-11 16:53:55 +01:00
dd4391990d
Get rid of a few unnecessary Makefile.ams.
2010-12-11 16:41:57 +01:00
f378c9eb2d
Move download.pl from build_tools to win32.
2010-12-11 16:21:08 +01:00
f5db3a4b93
Update translations.
2010-12-11 16:05:29 +01:00
7a672cab30
Fix includes for generated files.
2010-12-11 15:58:39 +01:00
3ccc629eab
Replace legacy Carbon dialogs with Cocoa NSAlerts.
...
Also don't link the main binary with Carbon at all anymore.
2010-12-10 23:39:22 -06:00
8dc031917f
Update the libpng download url.
2010-12-10 18:29:36 -06:00
28e3d447ee
Merge commit '71d5f82078c251ac75125e60b7a63931516dfea2'
2010-12-10 15:18:48 -05:00
2ee40a6f91
Update Ogg to 1.2.2.
2010-12-10 15:08:30 -05:00
71d5f82078
Remove all traces of the utterly useless apsOilList.
...
This deletion spree was inspired by the fact that the condition psStruct->type == REF_RESOURCE_EXTRACTOR can never be true for structures, since OBJ_STRUCTURE ≠ REF_RESOURCE_EXTRACTOR.
2010-12-10 16:38:25 +01:00
6f1584d262
update .gitignore again
...
refs ticket:2340
(cherry picked from commit 0a0fdadcb216ca21a6fcd95905d63a9dce6e5d1f)
2010-12-09 22:33:02 -05:00
b1495d43b6
Trap the ASCII_NEWLINE to only work in non MP games, to prevent abuse.
2010-12-09 00:52:44 -05:00
d7af165df6
Try to prevent stuttering when scrolling, by re-adding a dedicated timer just for scrolling.
...
Don't ask why deltaRealTime isn't good enough for scrolling.
2010-12-09 03:34:54 +01:00
f6867f8775
Unify the two completely different subsystems for droids picking up oil barrels and droids picking up artefacts.
...
Fixes a desynch on picking up artefacts.
2010-12-08 18:07:02 +01:00
e39b23a437
Implement syncDebugFeature, to check that features are also in synch.
2010-12-08 18:06:33 +01:00
f5893a7fe5
Don't include backtraces in syncDebug CRCs.
...
This should allow using syncDebugBacktrace() without causing a desynch if some clients don't support them or print them differently.
2010-12-08 18:00:08 +01:00
707e7d45ee
Update the player list on player name change.
...
fixes ticket:2338
2010-12-07 20:19:15 -05:00
c687c16ee9
Tell people they will see glitches, instead of thinking that they have selective
...
color blindness for units / structures and don't have a openGL 2.0 card.
2010-12-07 20:17:50 -05:00
f38d2d9d1a
Don't pass a out of range reseachIndex to prevent array corruption.
...
Why it became out of range in the first place is unknown.
Closes ticket:2377
2010-12-07 19:09:27 -05:00
adea03a17c
semperfi: Make several global variables local.
2010-12-07 22:10:21 +01:00
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
3161d5aabf
Remove float from this side of the pond.
...
map_TileHeight() uses ints.
2010-12-06 21:51:31 -05:00
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
33d309ce92
Clarify the the numbers below the flag are for position, not player numbers. (cherry picked from commit 2b39ab4dea0860ac3251f94c15215b6084ad5b35)
...
Conflicts:
src/multiint.c
2010-12-06 21:14:04 -05:00
fe824ed1c0
Changelog: Show tooltips for player & tech level buttons.
...
We can't show tooltips on a unrelated context / form.
The side-efect of this is that if tabs are used, then the items rendered on
the first 'page' of the form don't get rendered on each addition page.
(cherry picked from commit 0c77b898c2ba0e6087099f9cc67e56755c83115c)
2010-12-06 21:14:02 -05:00
c560f8a3e9
Fix typo
2010-12-06 21:14:00 -05:00
70d8c8d100
Fix SP color picking so it correctly uses the user's saved preferences (cherry picked from commit 29107a96d78b9b2ee1d24ee926f827b8b6467ea5)
...
Conflicts:
src/frontend.c
2010-12-06 21:13:58 -05:00
03444f5cc5
Fix the single player color saving / loading. (cherry picked from commit 86cd2249e16019f03732160e3c6f8b33c0f8877e)
...
Conflicts:
src/frontend.c
2010-12-06 21:13:56 -05:00
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
Cyp
dak180
cybersphinx
NanoTech
buginator
Per Inge Mathisen