Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,913 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

5913 Commits (b9b1a4bac74d321f9cf0d97b5cd552b6ce6b8362)

Author SHA1 Message Date
Giel van Schijndel 7261e3392a Update the lobbybot such that it can work both with 2.0,2.1 and 2.2 lobbies, defaulting to 2.1 (as that's the current release) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7101 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:32 +02:00
Giel van Schijndel d001fdbafc Notify the user when communication with the lobby fails 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7100 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:32 +02:00
Giel van Schijndel 88ddefb584 * Move the setup code of the lobby bot into a class of its own (Bot) 
* Change to an event driven model for handling IRC commands
  - Add all IRC commands to a single class (BotCommands)
  - In class irc_connection.readAndHandle() call the corresponding function in BotCommands for the received IRC command


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7099 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:32 +02:00
Gerard Krol 2786cfc1e9 Add the --squash flag to gitsvngateway. With --squash it will not try to unravel any merges but instead commit it as one change. 2009-04-20 19:53:13 +02:00
Gerard Krol ff92f1c80b When constructing a building, producing a droid or researching something, power is now used gradually instead of being accrued before the process starts. 
As repairing droids was almost free anyway, it does no longer use any power now.
 2009-04-20 19:23:11 +02:00
Gerard Krol ef94330f3a When starting construction buildings will only have 10% of their final health. This will go up during construction. 2009-04-20 19:22:41 +02:00
Giel van Schijndel 5694b99b90 Set a timeout on the lobby client to prevent blocking on connections to the lobby 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7095 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:24 +02:00
Giel van Schijndel 846a21b8a7 Make sure that the change_notifier thread gets terminated when the user hits CTRL-C 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7094 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:24 +02:00
Giel van Schijndel f8f33d5424 * Interpolate __author__ in the "info" (about-style) message 
* Use functions to join channels and send messages
 * Notify a user requesting for services from the bot in the wrong channel


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7093 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:24 +02:00
Giel van Schijndel 64666c8889 Ignore build products from unit tests 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7092 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:23 +02:00
Giel van Schijndel acd07fc7b4 * Add functions for retrieving the masterserver's hostname and port and game hosting port 
* Use these functions to save configuration values (instead of duplicating them)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7091 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:23 +02:00
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Buginator 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
Buginator 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
Buginator 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
Buginator 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
Giel van Schijndel 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
Giel van Schijndel 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Per Inge Mathisen 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
Git SVN Gateway 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
Gerard Krol 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
Giel van Schijndel 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
Giel van Schijndel 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
Gerard Krol 127b4fbdda Give power back when canceling the production of a droid. Also make the code that determines production speed more independent of the framerate. 2009-04-16 12:15:57 +02:00
Gerard Krol f817bf01a0 Remove power debug message. 2009-04-16 12:15:57 +02:00
Gerard Krol 24a648756e Revert "Add display of the power produced, requested and efficiency to the interface." 
This reverts commit 41112b859d2e34a909611d71950dbe2229689826.
 2009-04-16 12:15:57 +02:00
Gerard Krol 4c30bbd5fc The code that finishes all buildings that are under construction when starting an away mission now uses the new build system. 2009-04-16 12:15:57 +02:00
Gerard Krol 2597f3b47a Remove the aiUpdateMissionStructure function, and add a bool as parameter to aiUpdateStructure so that it can perform those tasks. 2009-04-16 12:15:56 +02:00
Gerard Krol 79af9ea1e0 Fix assert that would also wrongly assert when no power was extracted. 2009-04-16 12:15:56 +02:00
Gerard Krol d4b9ff2232 Fix an issue where demolishing a building would result in a negative amount of power. 2009-04-16 12:15:56 +02:00
Gerard Krol 4185b66bfb No longer assert when "building demolition" as it is perfectly reasonable to help demolish a building. 2009-04-16 12:15:56 +02:00
Gerard Krol 8a288780c2 Make demolishing a structure act like "unbuild". Repairing is free again! Free! At last! 2009-04-16 12:15:55 +02:00
Gerard Krol beabf63bcf Add display of the power produced, requested and efficiency to the interface. 2009-04-16 12:15:55 +02:00
Gerard Krol 86aa5568e7 Fix some bugs and tune the throttle. 2009-04-16 12:15:55 +02:00
Gerard Krol 7b3854e5a1 Research now uses power during research instead of accruing it. 2009-04-16 12:15:55 +02:00
Gerard Krol 3e32660b7a Show the build progress of a droid. 2009-04-16 12:15:54 +02:00
Gerard Krol 0153aeda01 Building droids now uses power during construction. 2009-04-16 12:15:54 +02:00
Gerard Krol 8407715e34 Remove extractedPower. 2009-04-16 12:15:54 +02:00