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

7877 Commits (3f97c795c02d3a4bcd38ed8bfd1426758a10e281)

Author SHA1 Message Date
dak180 4e8f1fb7f3 Add the font files and clean up some of the scripts. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11240 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-21 17:43:57 +02:00
Cyp 1a39299572 Merge remote branch 'origin/master' into newnet 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2010-07-20 23:07:26 +02:00
dak180 f7ceb6aca1 Since user comments at the top of "project.pbxproj" do not stick, be creative. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11236 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-20 23:01:36 +02:00
Cyp b5529929e7 newnet: Make production UI respond instantly (without waiting for game state to change). 
Fixes production count being displayed as "10".
 2010-07-20 22:57:19 +02:00
Cyp e246e6006e newnet: Save a few more bytes. 2010-07-20 15:40:07 +02:00
Cyp f5fe36414a newnet: Save a few bytes. 2010-07-19 18:42:19 +02:00
Cyp e826510caa newnet: Make research buttons appear to work instantly, don't allow researching same thing twice. 2010-07-19 17:17:53 +02:00
Guangcong Luo 2dcb53d326 Fix bug #1994 and apply patch #1998 - Change Mac OS X to use DejaVu Sans like in Windows/Linux, which fixes problems with text alignment. refs #1994, closes #1998 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11230 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-19 10:58:59 +02:00
Per Inge Mathisen aa0fcecc52 (from path branch) Make sure we can never end up driving in reverse while waiting for a path. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11229 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-19 10:58:59 +02:00
Per Inge Mathisen e25fc53a66 (port from path branch) No longer come to an instant halt when changing paths. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11227 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-19 10:58:59 +02:00
Cyp 269bb52c63 newnet: Display connection status icons neatly stacked, instead of overriding each other in order of importance. 2010-07-18 12:31:36 +02:00
Cyp 6a36cdd6ec newnet: Use MAX instead of MIN when computing required latency, since the host will vote half of everyone else. 
Not sure what to do in the case that a computer is too slow.
 2010-07-17 23:42:39 +02:00
Cyp a79e816965 newnet: No need to return after sending research message, since all clients should be running the same code, anyway. 
Research button now blinks like it used to, when research is complete.
 2010-07-17 23:40:56 +02:00
Cyp b646ff80bb newnet: Move BITS_ON_FIRE out of effects.c, so that oil well burning times become deterministic. 
Also, set the tiles on fire, even if the projectile is not visible, and return power from destroyed power generators, even if power generator is not visible.
 2010-07-17 20:18:00 +02:00
Cyp 212115faed newnet: Delay writing NET_SHARE_GAME_QUEUE until flush. 2010-07-17 11:49:55 +02:00
Cyp 1ff5fc34c6 newnet: Enable messages before calling cluster system, since messages are turned off if projectiles destroy a droid using splash damage. 
Backtrace identifying the problem thanks to Safety0ff.

Toggling messages randomly is bad, the cluster system is bad... Two bads make a good, right?
 2010-07-17 10:47:46 +02:00
Cyp ee1ae86ea7 newnet: Use Z_PARTIAL_FLUSH instead of Z_SYNC_FLUSH to save a few bytes. 
They do the same thing, except that Z_SYNC_FLUSH adds a bit of useless padding.
 2010-07-17 02:01:08 +02:00
Cyp b704a741bf newnet: Don't poll sockets, if there is already data ready in the socket decompression state. 
Should avoid freezing with everyone waiting for players.
 2010-07-17 01:00:55 +02:00
Cyp c1ca4d2d34 newnet: Don't send lots of small packets, fix "connection error"s when listing games. 
Since there is no advantage in sending data more than once per game tick, queue up data until the game time ticks. This may result in sligtly better compression in some cases, due to not flushing non-stop.
Don't close a socket while data is queued to be sent, since this sometimes breaks listing games (where the list is queued, and the socket is closed).
 2010-07-16 21:46:00 +02:00
Cyp 8e93542537 newnet: Don't assume disconnect when no data results from decompressing, unless really disconnected. 2010-07-16 18:02:37 +02:00
Cyp 23cbd537f7 Merge remote branch 'origin/master' into newnet 
Conflicts:
	configure.ac
 2010-07-16 18:01:22 +02:00
Guangcong Luo 09d73b0ba5 Apply patch #2003 - Add option for rotating with middle mouse button (LMB+RMB also works). refs #2003 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11212 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-16 03:54:27 +02:00
Safety0ff a6bb433a17 Reuse the lightmap texture and buffer since their size will not change between initTerrain and shutdownTerrain calls. 
Replace a magic number with a new constant.
Update lightmap on the first frame (gameTime = 0).
Closes #1962.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11211 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-16 03:54:27 +02:00
Per Inge Mathisen 5c48a62fd5 Convert moveGetObstacleVector() to float. Now the float-b-gone conversion of move.c is complete. Patch by Cyp. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11209 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-15 20:35:04 +02:00
Christian Ohm dc9338a3b6 Fix a few new warnings. 
Closes #1999.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11208 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-15 07:13:22 +02:00
Guangcong Luo e3b5c20533 Fix bug #1993 - crash when hosting a multiplayer game 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11207 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-15 07:13:22 +02:00
Guangcong Luo f367bc1d4f Make text line up better - most text now fits in the text box containing it. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11204 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-14 19:58:33 +02:00
Guangcong Luo 6ad59e0ec9 Fix bug #1990 - broken skirmish games 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11203 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-14 11:01:15 +02:00
Cyp cd274fcc3e newnet: Add mysterious (char *) cast to fix windows build. 2010-07-14 00:36:59 +02:00
Cyp 0c95725a23 Backport warnings from newnet branch, fix a warning that was stopping mac build. 2010-07-13 21:04:32 +02:00
Cyp 695a2b35ae Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/netplay.c
 2010-07-13 20:50:37 +02:00
Cyp 33eaa1fd65 Fix off by (almost) half of a tile when building derricks. 
Was "+ TILE_SHIFT / 2" = +3 instead of "+ TILE_UNITS / 2" = +64 when finding the centre of a tile.
This bug exists since revision 1. Closes ticket:1988.
 2010-07-13 19:55:05 +02:00
Cyp a3569a758f Make pathfinding thread safe. 
May also be faster in some cases, where lots of droids are pathfinding to different destinations at once.
 2010-07-13 18:20:05 +02:00
Cyp 9b04e261c6 newnet: Use zlib compression on sockets. Should save a few bytes. 2010-07-13 16:15:53 +02:00
Buginator 228e60f18a Prevent division by 0 when a object has 0 original hit points. 
Add a check for that condition on load, and complain about it, and assign 1 hit point to the object.

Correct some typos, clean / fix up some comments / debug lines

fixes ticket:1711
Original patch by MegabytePhreak

NOTE: the feature.txt file wasn't fixed in the commit.
2.3: r11186

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11187 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:57 +02:00
Buginator 6239cbaf46 Bump revision number for netcode, since the addition of r11182 (the map) it would fubar if all clients are not the same, and host was using said map. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11185 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:56 +02:00
Buginator 096c257052 Commit these project settings defines to disable extra checking which causes a huge performance hit. (VS2k8 was already committed in r9639, this was forgotten.) 
_HAS_ITERATOR_DEBUGGING=0
http://msdn.microsoft.com/en-us/library/aa985939(VS.80).aspx
_SECURE_SCL=0
http://msdn.microsoft.com/en-us/library/aa985896(VS.80).aspx
For more info on checked iterators see:
http://msdn.microsoft.com/en-us/library/aa985965(v=VS.80).aspx
and
http://msdn.microsoft.com/en-us/library/aa985982(v=VS.80).aspx


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11184 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:56 +02:00
Per Inge Mathisen dfc9b624dd Add new map 'Pyramidal' by Mysteryem. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11182 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:55 +02:00
Per Inge Mathisen 193bd4f386 Add challenge descriptions. Patch by BlueMaxima, though I shortened the Back to Basics description somewhat. Closes ticket:1986 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11180 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-13 11:30:55 +02:00
Cyp b9a051150b newnet: Clean up thread-related #defines. 2010-07-12 17:57:35 +02:00
Cyp 65b68143e1 Merge accidental fix of bad sorting function in astar.cpp from newnet branch. 
The bug (due to missing parentheses) was accidentally fixed during a merge from trunk to newnet, due to different warning flags on the newnet branch which required an accidental bugfix to compile.
Pathfinding might give straighter paths now and/or be faster.

Completely closes ticket:1981.
 2010-07-12 08:50:26 +02:00
Cyp 7ece0a9816 newnet: Fix a signed/unsigned comparison, which compiles fine in trunk but not in newnet. 2010-07-12 08:16:17 +02:00
Cyp 4d522c1d06 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/gamelib/gtime.h
 2010-07-12 08:06:39 +02:00
Cyp 0dc1a58cd1 Fix infinite loop in pathfinding to nearest point when destination is not reachable. 
Hopefully closes ticket:1983.
 2010-07-11 23:52:13 +02:00
Per Inge Mathisen 33afe5bc3d simplipie: Make it accept multiple filenames as arguments to make mass-conversions simpler. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11171 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 23:04:18 +02:00
Cyp 25ee2493d0 Add assertion that paths are not longer than the number of tiles in the map. 2010-07-11 22:00:24 +02:00
Per Inge Mathisen 7c39eaf693 Improve logging for movement 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11163 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:56:12 +02:00
Christian Ohm aacc6f7e54 Croatian translation update by MetalWarrior95. 
Also add Saberuneko's real name, per his request.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11160 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:56:12 +02:00
Christian Ohm a5f420655a Update translations. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11159 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:56:12 +02:00
Christian Ohm 6514240f25 Don't translate language names. 
Closes #1779. Patch slightly modified to use language names from the
translations where available, and moved the defines into the .c file, since
they're only used there.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11155 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-11 21:17:36 +02:00