Commit Graph

5618 Commits (d5cdfd7adbd0865d08a405f06643ef96a167169b)

Author SHA1 Message Date
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
Gerard Krol 9c17ee746e The power system is now throttle based and droids no longer accrue power. 2009-04-16 12:15:53 +02:00
Gerard Krol e529ec3c20 Correctly show the construction progress in the build menu interface. 2009-04-16 12:15:53 +02:00
Gerard Krol 7b9f7adb36 Make the lowest 10% health of a structure "free" to repair or demolish. This prevents creating power by starting construction and immedeately deconstructing the building. 2009-04-16 12:15:53 +02:00
Gerard Krol 1c2a320a33 Fully repairing a building now costs half the power you needed to construct it initially. 2009-04-16 12:15:53 +02:00
Gerard Krol 82e8c48732 Constructor droids no longer attempt to repair a building that is being demolished. 2009-04-16 12:15:52 +02:00
Gerard Krol 800c764340 Demolish now damages a structure and returns power during deconstruction. 2009-04-16 12:15:52 +02:00
Gerard Krol c74bde8c4b Do not remove abandoned buildings anymore. Rewrite the function when people start abusing it. 2009-04-16 12:15:52 +02:00
Gerard Krol c6690fa894 Only automatically repair completed buildings, and do not help build automatically anymore (was bugged). 2009-04-16 12:15:51 +02:00
Gerard Krol 72da02cf97 Power is now used directly when building, no power is accrued anymore. 2009-04-16 12:15:51 +02:00
Gerard Krol 510d8d7735 Construction droids now go help build a building instead of trying to repair it. 2009-04-16 12:15:51 +02:00
Guangcong Luo 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
Guangcong Luo 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
Freddie Witherden 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
Giel van Schijndel 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
Per Inge Mathisen 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
Gerard Krol 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
Buginator 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
Buginator 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
Buginator 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
Buginator 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
Buginator 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
Buginator 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
Guangcong Luo 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Guangcong Luo 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
Guangcong Luo 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
Guangcong Luo 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
Guangcong Luo 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
Buginator 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Guangcong Luo 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
Elio Gubser 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
Buginator 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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