ef04fec1e2
French translation enhancement.
...
Closes #1145 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8612 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:50 +01:00
d91693afb2
Hardware-accelerated cursors work correctly in Mac OS X now.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8610 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:49 +01:00
6519ce48e9
Use GLuint correctly (fixes build errors and warnings caused by other fixes).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8608 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:49 +01:00
359c5be959
Revert r8605, which was made in error.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8607 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:49 +01:00
dda96a7059
Skirmish game fix:
...
Don't RemapPlayerNumber() for droids, they are a different kind of a beast. This maps the droids correctly now.
Fixes ticket:1119
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8606 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:49 +01:00
86302cf060
Correctly handle when to enable/disable player's position choices.
...
We only really care if another human is there or not. We don't care about AIs.
fixes ticket:1137
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8605 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:49 +01:00
9445f60753
Actually use GLuint instead of pretending to be GLuint.
...
patch by stiv.
Closes ticket:1148
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8604 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:48 +01:00
aabbca68d8
Move map download progress to players list, so you can still chat while it happens. Also update players list instantly, instead of every 2 seconds (except slider changes, which are updated every 0.5 seconds). Also fix taken position detection (fixes bug #1137 ).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8602 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:48 +01:00
8edc0bd26a
Allow AI difficulty slider to be dragged for longer than 2 seconds.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8600 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:48 +01:00
6607ecbe47
Rename "Options" in the in-game Esc menu to "Audio Options".
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8598 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:48 +01:00
bf366b2527
Fix a crash related to corrupt templates. Fixes bug #1012 .
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8597 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:47 +01:00
5ba89a0f93
Better "ready?" checkbox.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8594 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:47 +01:00
e185ab4492
The hash function was correcting for endianness incorrectly. This changes the code so big-endian architectures produce the same output as the little-endian architectures used to.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8592 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:47 +01:00
c6e474a482
Revert r8584/r8585 since they're causing too many problems in Linux for me to deal with right now. Fixes bugs #1121 and #1123 .
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8590 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:47 +01:00
32a6e8d722
Make sure mapTile coordinates are greater than 0, too (fix possible crash).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8588 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:47 +01:00
269c6026d2
Always proximity messages - just don't blink them on the map in skirmish. Also make sure oil resources are always shown, not just when visibleObject is called.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8586 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:47 +01:00
fa4f0798ba
Fix a bug where a long was dereferenced from an int pointer.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8584 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:46 +01:00
14f2aa3b52
New water tile by Mysteryem (CC-BY-SA-3.0).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8583 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:46 +01:00
d2a32505f1
Fix bug #1120 : Ready button broken in trunk (apparently the last commit failed for some reason).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8582 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:46 +01:00
7b6618ad03
Fix bug #1120 : Ready button broken in trunk.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8581 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:46 +01:00
271f5cc180
Fix broken Linux compiles introduced in r8569/r8570 before jaakan can post a ticket. ;)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8571 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:46 +01:00
61eff52249
Allow the last AI player to be disabled. You still can't start a game with only one player. ;) Fixes bug #1112 .
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8569 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:45 +01:00
017350b1d7
Optimize how players are rendered on the MP game setup screen, and make it clearer when AIs are disabled.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8566 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:45 +01:00
5a5e5d6510
Threaded UPnP device detection.
...
Increases the timeout to 2 seconds. Closes #1073 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8564 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:45 +01:00
a55d7f4db5
Multiplayer game setup screen changes: Sort player list by map position, show color/position of AI players, hide team selector when not in Locked Teams, widen Players box.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8559 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:45 +01:00
e8d4d378a8
Add UPnP detection results to the Crash dump.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8557 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:45 +01:00
25b9dc9ba6
Add more documentation about the Map issues and note in logs about map transfers (if exists / file size mismatch)
...
(r8548/r8549)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8555 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:45 +01:00
db28b30d64
Clear out the old level(s) list first, then rebuild the map list.
...
(r8547)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8554 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:45 +01:00
a1ec0bd358
Clarify variables by prefix of _64 for 64bit and _32 for 32bit...
...
(r8546)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8553 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:44 +01:00
875f79dd9c
Use strstr() to check for a substring
...
(r8544/r8545)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8552 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:44 +01:00
72fc19e8ee
Rebuild the map list before we check if the map is there or not.
...
(r8543)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8551 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:44 +01:00
8018d99190
Add new message of NET_HOST_DROPPED to deal with when host quits game, we should quit as well (lobby)
...
Add more debug lines when we drop/leave players
(r8538)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8550 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:44 +01:00
48fe08704a
Fix bug that caused transport not to work in campaign.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8539 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:15 +01:00
1a3cd75d71
Update .gitignore with cscope and vim temp files.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8535 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:15 +01:00
b307503d56
Slightly rework when we should and shouldn't chop strings based on if the tech level is present or not.
...
Also add more debug lines to see if this issue crops up again.
Fixes ticket:1104
(r8533)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8534 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:15 +01:00
f76f352bd0
Add error checking to socketClose()
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8532 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:15 +01:00
49f164b23f
Fix a out-of-order list
...
(r8516)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8530 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:15 +01:00
47fde06bc9
die dpid die!
...
Remove 'dpid' in some comments / strings.
(r8457)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8529 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:15 +01:00
214ef044e1
In skirmish only, do not show proximity messages for oil resources. Instead, all oil resources
...
are always visible. Also add oil resources to the radar map. See ticket:1087 for discussion.
(r8444)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8528 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:15 +01:00
0d2a13a119
Fix a strange issue on some laptops, that have mapped their numpad enter key to the normal "return/enter" key.
...
Either key can now be used to submit the text your typing.
This fixes ticket:1055
NOTE: We *still need* unicode support!
(Multibyte support, and we should NOT use char, we need to switch to wchar_t)
(r8425)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8527 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:14 +01:00
bbc04559d4
Change DATADIR to WZ_DATADIR to prevent conflicts with windows system header files.
...
(r8424)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8526 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:14 +01:00
cc76454b69
Fix the missing header file for the setPlayerColour() function.
...
(r8411)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8525 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:14 +01:00
a72cb7295a
Transmit and set local color array. Fixes picking of team color bug.
...
Transmit player map position & handle picking of players correctly. fixes ticket:1075
Enable/disable AIs on maps. fixes ticket:1065
(r8410)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8524 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:14 +01:00
7620fcbdad
Init AI colors
...
fixes ticket:1070
Also slight fix to a few comments & a debug statement
(r8409)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8523 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:14 +01:00
5541be53a5
For this BETA, only tally up the bytes sent, not tally both incoming and outgoing bytes to determine if we are under the packet threshold.
...
(r8386)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8522 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:13 +01:00
419802bf34
Relax timings yet again.
...
Remember, things still get synced faster via the isMPDirtyBit flag, so you can't compare it 1:1 with older version in trunk.
(r8382, r8383)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8521 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:13 +01:00
06e0716a14
*Change* MaxMsgSize is now 16K
...
*Change* MAX_BYTESPERSEC is now 14K (was hitting limit in 4p games old limit was 6K)
*Change* relax timings of ping & scoreboard to alleviate the bandwidth strain a bit
(r8381)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8520 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:13 +01:00
d6e70a3c00
Filter out non-ASCII in our debug line
...
(r8380)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8519 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:13 +01:00
d6261ced17
Add new debug flag "input" to be used for input (keyboard/ mouse) issues.
...
Add allot more debugging for the input routine(s) to help find keymap issues.
*Change* Add a user friendly (numpad) clarification to the keymap editor, and also color it yellow.
*Change* Rename "Multiplayer Options" to "Multiplayer Options / Alliance dialog" to clarify what this is used for.
(r8376)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8518 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:13 +01:00
0484dfa2bb
When the fonts do not load, prevent a division by zero error and inform user of problem. The problem is still fatal though, since without a font, we really should abort() out.
...
(r8375)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8517 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:13 +01:00
Christian Ohm
Guangcong Luo
Buginator