ead99ec654
Properly align the "private" property
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7090 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-20 15:31:23 +02:00
8d5b42fe96
Lets consistently use TABs for indentation (instead of mixing with spaces)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7089 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-20 15:31:23 +02:00
e399b2562c
Split out the protocol from the Game class into a separate BinaryProtocol(Protocol) class
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7088 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-20 15:31:23 +02:00
4aa8982d0a
* Save Game's data in a dictionary for easier access at some locations
...
- This additionally make is possible to split out the lobby protocol into a separate class later on
* Show exception's messages when exceptions occur
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7087 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-20 15:31:22 +02:00
72d1881464
Remove trailing whitespace
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7086 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-20 15:31:22 +02:00
e9446f60b4
Backport r7084 to trunk also.
...
"remove dead code left in accidentally
Move a enum to netplay.h, and fix #include files so netplay.h comes before multiint.h"
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7085 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-19 23:45:25 +02:00
12eabeab61
Set FSAA to 0 for default, since it can break cards that don't support FSAA.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7081 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-19 23:45:25 +02:00
562ade5d29
Use the correct version of the masterserver file
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7080 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-19 23:45:25 +02:00
c2e5d2462f
Adds password support to warzone.
...
Adds feedback from the lobby server.
Notes: You have to enter a password *first*, and then either host the game, or join a game.
Thanks to elio for the new icons!
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7079 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-19 23:45:25 +02:00
ef5f761f20
Use static const char string[] instead of a #define
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7077 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-19 23:45:25 +02:00
bd04dd7378
Make the lobby server executable
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7073 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-19 23:45:24 +02:00
20475a41ff
Fix ticket:7033 units exploding into the wrong colours reported by Mysteryem. Also clean up effects.h a bit.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7070 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-19 23:45:24 +02:00
4504381911
Port over fix for division by zero crash in averagePing() function from netplay branch. Add some
...
stylistic fluff from netplay branch to reduce diff impact when merge time comes.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7069 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-19 23:45:24 +02:00
bf4e0e3745
Major cleanup of configfile.[ch]:
...
* Remove unnecessary "// =====..." and "//~~~~..." comment bars
* Use "bool" instead of "BOOL"
* Use ARRAY_SIZE(registry) instead of REGISTRY_HASH_SIZE to get the amount of hash entries
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7068 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-19 23:45:24 +02:00
b92b348c3a
In lexer_input.h #include <stdio.h> for FILE*
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7067 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-18 22:39:52 +02:00
1852caeff9
Get the size of a variable using "sizeof", not using the array size that was used for that variable (as the connection between the two is only obvious in the variable's declaration)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7066 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-18 22:39:51 +02:00
e0f65b827c
Add support for Full Screen Anti-Aliasing (FSAA):
...
* Enable, at the user's request, FSAA.
- The user can specify the amount of samples (should be a power of 2) with the "FSAA" config option.
- The user can disable FSAA by setting the "FSAA" option to "0" (zero)
This closes #387 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7065 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-18 17:08:19 +02:00
12436947e8
Make tests/Makefile.am more suitable for line-based diffs
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7053 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-18 15:37:53 +02:00
b5fa41ceff
Make it possible for the lexers to use data from an STDIO FILE* stream
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7052 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-18 15:37:53 +02:00
60e9a5e540
Fix crash in limits dialog due to missing radar detector texpage entry in the right WRF file.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7041 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-18 15:37:53 +02:00
cc19067730
Merge commit 'gerard_/master'
...
* commit 'gerard_/master':
Add comments for the terrain renderer and remove a small piece of depreciated code for tile highlighting.
2009-04-18 15:37:38 +02:00
f0639db97a
Add comments for the terrain renderer and remove a small piece of depreciated code for tile highlighting.
2009-04-18 15:30:30 +02:00
7d6bfff4ee
No need to initialize strings to "\0"
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7034 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-16 19:40:47 +02:00
2da9dad740
Link betawidget with Pango
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7033 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-16 19:40:47 +02:00
ae9c2f5bb8
Commit Rebalance 0.4.2:
...
- Make Angel Missile into MRL replacement
- separate rocket/missile from cannon/rail multipliers
- make truck rushing harder
- balance cyborgs and VTOLs-
- remove requirements for basic cyborg weapon research
For full details and changelog see http://guide.wz2100.net/new/
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7027 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-15 20:36:59 +02:00
795f7e65c5
Commit patch #380 : Draw negative resistance correctly (patch submitted by Adam Olsen)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7029 4a71c877-e1ca-e34f-864e-861f7616d084
2009-04-15 20:36:59 +02:00
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
Giel van Schijndel
Buginator
Per Inge Mathisen
Git SVN Gateway
Gerard Krol
Guangcong Luo
Freddie Witherden