0b1a35cd39
IRC lobby bot: improve production of game list
...
* Make sure to loop over all games only once instead of copying them
- This might prevent a race condition
- It definitly cleans up that piece of code
* Make sure to list the Warzone version as well in game listings
* Only show 2.2 games (instead of 2.1 games)
* Bump the bot's version number from 0.0.1 to 0.0.2
* Change 'Warzone Resurrection Project' to 'Warzone 2100 Project'
Original patch written by Buginator, rewritten by myself to be 'Pythonic'
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8653 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:54 +01:00
d808f72d8e
Don't add UPnP redirects in single player skirmish.
...
Closes #1174 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8647 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
cd3ce412a3
Fix typos, reported by Paul Wise.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8646 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
9dc3cac6d6
[Having problems committing, so I'm seeing if I can commit this one file at a time] Continue fixing bug #1170 : compile warning.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8643 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
38d9b086f6
[Having problems committing, so I'm seeing if I can commit this one file at a time] Fix bug #1170 : compile warning.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8642 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
f6992d5719
sendTextMessage improvements - uses the position numbers again, and sends "(private to Player) message" instead of "0message". Also adds a shortcut for alliance chat: Use ".message" to send "(allies) message" to allies only.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8639 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
5d411cdd32
Add the multiplayer alliances menu to the Intelligence menu - makes it easier for players to discover it, and helps players who don't have a Num-Enter button.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8637 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
1858a569e7
Remove an assert for something that happens commonly while in cheat mode.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8635 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:53 +01:00
36dd15bd0d
AI scripts: Fix parentheses in some expressions where canDroidReach was added.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8634 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:52 +01:00
c5533ee514
Make AIs go for closest oil first. Closes ticket:1166
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8633 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:52 +01:00
2b7875a22b
Check the order queue every once in a while, when executing an order that never ends.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8630 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:52 +01:00
6096e96ba4
Orders that never end (i.e. PATROL and CIRCLE) count as "not doing anything" for the purposes of queueing orders.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8628 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:52 +01:00
bddf8c2aa6
Added DORDER_SCOUT to orderDroidList's list of queueable orders - it was there in 2.3-branch but not in trunk for some reason. Might fix bug #1161 , but probably won't.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8627 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:52 +01:00
cffeacf6f5
Fix a bug that caused transporter not to disembark when auto-repairing. Also allow disembark order to be queued (shift+alt+click).
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8625 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
5fa5d34a50
Use the jam cursor for scouting.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8622 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
f935d97a0d
revert r8606.
...
This patch needs more work to work on both v7 and v36 game differences.
open ticket:1119 again :S
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8621 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
b99b245e7f
Turns out that we can't use GLee.h for all our openGL header needs, since GLee.h defines Status, and we also use that, so until we fix that either in GLee.h or our codebase, going to revert r8615/r8616
...
FIXME! (to be done later)
closes ticket:153
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8618 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
c6747b1606
Don't use SDL_opengl.h, instead, use GLee.h to handle all our openGL needs.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8617 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
3665f20498
Use the correct header file when using openGL, instead of the more complex #if/else/endif block.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8616 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
6bfd7012cf
Update translations
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8613 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:51 +01:00
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
Giel van Schijndel
Christian Ohm
Guangcong Luo
Per Inge Mathisen
Buginator