f4e366cf33
Fix some indentation issues in button.[ch].
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7025 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-15 20:36:59 +02:00
4beca8d487
Make the IRC bot executable
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7024 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-15 20:36:58 +02:00
742fecefc8
Make Warzone use regular textures to display the videos. Removes requirement for texture
...
rectangle extension. It uses one texture with a fixed size for videos (the old code allocated
a new texture once per frame). The texture size is set at 512x512, which is enough
for the current 320x240 videos. In addition the message about the radar not working is
removed and some extra checks added. Patch by Christian Ohm.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7021 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-15 20:36:58 +02:00
ab377a74dd
Use a default map of Sk-Rush to prevent victory from being declared after 10 seconds when starting a multiplayer skirmish game with the default config values.
2009-04-15 20:34:11 +02:00
f4574ef688
Change config directory for the trunk.
...
Yes, everything is now set to default values.
Do *NOT* copy over your old "config" file and "keymap.map" file from your old config directory!
You can copy these directories though:
savegame (holds your savegames)
maps (the ONLY place non default maps should be)
multiplay (player stats)
music (...)
See what a working svn host can do? ;)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7019 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:08 +02:00
e1c91576c9
Game server port is now 2100
...
Master server port is now 9990
Updated masterserver python program as well.
merge: r6994
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7018 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:07 +02:00
70ae5430ec
Fix the backdrop for when people get kicked.
...
Reported by another Random Whiny User
merge: r7012
And typo fix merge: r7007
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7017 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:07 +02:00
79d8c664e8
Fix the player count to reflect the actual number of players that is shown on the game list, which got screwed up when people were kicked, or left the lobby.
...
merge r7013
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7016 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:07 +02:00
96bdc06fdd
Fix a C99 issue that prevented compiles on MSVC.
...
Broken in r6998
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7015 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:07 +02:00
7a6fa22b1e
Version checking code.
...
If client connects to host, and they don't respond (within 7secs) to the version packet, then it will auto-kick them.
If client sends wrong version in the version packet, then it will auto-kick them.
Also adds kick message support, for the different types of kicks that we do.
merged from r6992
NOTE: trunk won't connect with 2.2. This is *on purpose*, just testing version checking code for now.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7014 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:06 +02:00
dda2e8539a
Allow queuing of DORDER_SCOUT (shift+click)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7009 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:06 +02:00
b56294cb1c
Make sure file handle to netlog file is set and reset to NULL when netlog is not active.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7006 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:06 +02:00
46c70aa134
Don't crash if we fail to open the netlog file. Reported by Zarel.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7002 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:06 +02:00
854c6a6218
Fix line accidentally removed in r6996
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7000 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:05 +02:00
8dab7fb36c
Fix incorrect connection error display introduced in r6998
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6999 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:05 +02:00
fac8b8ffb9
Commit patch #366 : Show "Connection error" in case of connection error
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6998 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:05 +02:00
e05e06dc80
Fixes a crash that should never happen in multiplayer, but still somehow did. Also cleaned up recvTextMessage().
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6996 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:05 +02:00
ae197163ec
Fixes issue when a person starts a MP game, and aborts out (that is, starts a MP game, but then does *not* hit 'ready' and instead, aborts back to main menu).
...
If they then tried to start a SP game or load a SP game, it would crash, since it was still in MP mode.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6989 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:04 +02:00
071ed52da0
Improved text for energy bar display. Patch by Adam Olsen in ticket:372
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6987 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:04 +02:00
aad6bc5341
Fix assert failure when trying to "build" demolition. Caused by either failure to reset
...
target stats when previous order was build and next is demolish, or when a droid is
told to help demolish a building (hard to do because demolish is so fast, but possible).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6986 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:04 +02:00
5943e1fba1
Clean up intGetObject and improve its assert message.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6985 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:04 +02:00
acec2d7c6a
Improve assert message in scrOrderGroupLoc when an order goes out of map bounds.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6984 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:04 +02:00
5ee8538680
Improve assert message when getting the gridRemove crash.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6983 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:03 +02:00
c0358510d8
Add missing include
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6982 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-12 14:12:03 +02:00
5c2aa2ba92
Commit patch #351 : Hide resolutions smaller than Warzone supports.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6980 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
c18559d219
release patterns when quit
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6979 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
c89229667b
The video file (sequences.wz) is now added to the search path.
...
It will find the video files in data/sequences.wz (the same location as the other .wz files that we use.)
Thanks to per for the renaming of the file on GNA.
fixes & closes ticket:322
backported from r6975
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6978 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
509a618185
Test
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6974 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
e6e9be70b7
Update changelog
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6973 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
8b9ed44a6f
New radar detector turret graphics by elio
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6972 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-08 14:04:26 +02:00
cd7edf0f88
Use a more sofisticated regular expression for channel messages to ensure we only match messages that are intented for us (i.e. the lobby IRC bot)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6968 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:12 +02:00
74c3180bc3
Use a regular expression to extract messages intended for us (i.e. the lobby bot) instead of string manipulation with split & find
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6967 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:12 +02:00
9dfa15c8f1
Move the bot to #warzone2100-games and change it's real name to indicate it's Warzone 2100 origin & purpose
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6966 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:12 +02:00
3fea9dcbc3
Allow announcing to work properly still
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6965 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
eb27d5987e
Comment on why the endian swapping is performed (while on the protocol level it shouldn't be needed)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6964 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
693a2ab4b7
Use a contextmanager and python's with-statement to manage the socket's lifetime, this guarantees exception safety
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6963 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
05b1e21416
Externalise code specific to querying the lobby server into a separate module
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6962 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
acfa601182
Fix syntax error in lobby IRC bot
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6961 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
020b66a959
Don't use an IRC specific string representation of games
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6960 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
d02d2a01ab
Committing on behalf of and with Gerard's permission:
...
The initial version of the IRC bot for Warzone's lobby with the GPLv2 added.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6959 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:11 +02:00
21d89f2bb5
Test commit
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6958 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-07 12:23:10 +02:00
5a2ff6f410
Allow structure baseplates to have transparency.
2009-04-07 12:18:14 +02:00
3b7fbcd837
Fix an array out of bounds error (off by one) that could occur when picking up an artifact during a multiplayer game.
2009-04-06 14:25:23 +02:00
6bdbda9343
Allow code passing and retrieving of enums as vararg parameters in C++ as well.
...
In C++ enums are treated differently from integers in some cases, causing GCC to emit some rather nasty abort()-like code (x86/x64 instruction "ud2a") when used as the type for va_arg().
This was the compiler message generated:
{{{
stack.c:339: warning: ‘INTERP_TYPE’ is promoted to ‘int’ when passed through ‘...’
stack.c:339: note: (so you should pass ‘int’ not ‘INTERP_TYPE’ to ‘va_arg’)
stack.c:339: note: if this code is reached, the program will abort
}}}
NOTE: Compiling as C++ now works (as does the produced code), using: {{{./configure CC=g++ CFLAGS=-fpermissive --enable-debug=relaxed}}}
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6957 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:10 +02:00
9353874ef9
adds the base button class and imageButton class
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6956 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:09 +02:00
cfe68c3602
Add radar detector turret to the game. It will detect and target enemy sensors up to twice their
...
range away. Both land and air droids can be assigned to it. See ticket #340 for more discussion.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6955 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:09 +02:00
4ab0f78bf4
Fix some indentation problems in hBox.[ch].
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6954 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:09 +02:00
defbe884a7
fixed small bug in size fit algorithm
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6953 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:09 +02:00
959838440d
fix for the same reason as r6951
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6952 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:09 +02:00
e1478d46e8
don't use the helper macros before we set classInfo, as this would result in undefinied behaviour.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6951 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-06 13:09:08 +02:00
Freddie Witherden
Giel van Schijndel
Per Inge Mathisen
Gerard Krol
Buginator
Guangcong Luo
Elio Gubser