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
Cyp dd47d1f8c2 newnet: Insist harder on detecting and displaying desynchs. 2010-08-02 14:22:10 +02:00
Cyp 19c5f3ebb7 newnet: Obliterate some floats in projectile movement code. 2010-08-01 23:24:05 +02:00
Cyp a9d1296e29 newnet: Demote LOG_ERROR to LOG_NEVER, when droids are destroyed just after being sent orders, since LOG_ERROR isn't for expected behaviour. 
Also, demote LOG_WARNING to LOG_FEATURE, when features are destroyed.
 2010-08-01 22:34:48 +02:00
Cyp d5b3621844 Merge branch 'master' into newnet 
Conflicts:
	lib/netplay/netplay.c
	src/multiint.c
 2010-08-01 21:10:34 +02:00
Cyp 7c8df3a2e8 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/framework/wzapp_c.h
	src/power.c
	src/power.h
 2010-08-01 20:41:45 +02:00
Cyp 82ad8abd8f When a player drops from the joining menu, clients should remove the dropped player, and not decide whether to randomly quit based on whatever was on the stack, either. (Forward-port from 2.3.) 2010-08-01 19:41:07 +02:00
Cyp da7ff2f37f Don't allow inconsistent player positions or colours, even momentarily. (Forward-port from 2.3.) 
On swapping places or colours, sends a NET_PLAYER_INFO containing both players, instead of two separate NET_PLAYER_INFOs.
 2010-08-01 19:40:12 +02:00
Cyp 466943b783 Don't use floating point calculations in power code. 2010-08-01 18:38:11 +02:00
Cyp eed7a50018 Minor power code cleanup. 
Removed unused stuff, changed float to int in some places that don't make a difference.
 2010-08-01 18:38:11 +02:00
Cyp 7874dc608c Clean up thread-related #defines. (Backport from newnet.) 2010-08-01 15:23:06 +02:00
Cyp c96eda047c Check if blocking map pointer is valid by comparing game time to a variable that isn't inside the blocking map structure. (Backport from newnet.) 
Must have gotten confused when mixing/refactoring/blending/frying data structures, even the comment was weird. Fixes valgrind warning and probably fixes ticket:2016.
 2010-08-01 15:17:47 +02:00
Christian Ohm c778cad0f1 Polish translation update by Emdek. 
Closes #1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11336 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-01 15:14:54 +02:00
Cyp 098878ffae Merge remote branch 'origin/master' into newnet 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2010-08-01 13:52:16 +02:00
Cyp 6e26d32b5e newnet: Don't wait for players that have left the game. 2010-08-01 13:44:56 +02:00
Cyp 2e01e81da6 newnet: Show relevant players next to connection status icons. 2010-08-01 13:06:50 +02:00
Christian Ohm 324722fc93 Prevent out of bounds access of player stat arrays. 
In the 2.3 netcode, we use player 9 for features, while we only have stats for
players 0-7. Fixes #2029 and probably a truckoad of other random problems.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11323 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-08-01 10:50:33 +02:00
dak180 3d0befebc9 Fix up the build rules. 
Add the Korean .strings file.

Closes #2039.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11318 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-31 19:03:34 +02:00
dak180 943af316ec Add the Korean .strings file. 
Closes #2039.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11317 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-31 18:51:15 +02:00
Cyp 1854f49a0c newnet: Check if blocking map pointer is valid by comparing game time to a variable that isn't inside the blocking map structure. 
Must have gotten confused when mixing/refactoring/blending/frying data structures, even the comment was weird. Fixes valgrind warning and probably fixes ticket:2016.
 2010-07-31 11:42:50 +02:00
Cyp b59b089ca5 Merge remote branch 'origin/master' into newnet 
Conflicts:
	lib/netplay/nettypes.c
	src/multibot.c
 2010-07-30 22:51:33 +02:00
Cyp ea690beab7 newnet: Fix maximum latency calculation, don't return 1 second unconditionally. 2010-07-29 23:30:16 +02:00
dak180 3f69367f3a Add dSYM bundles for maximum symbolication. 
http://bitbucket.org/boredzo/symbolicator can be used to symbolicate crash logs from people without dSYM bundles.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11313 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-29 23:27:39 +02:00
Buginator 32241ef77b Fix ambiguous function call to overloaded function 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11297 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:59:41 +02:00
Guangcong Luo 1bf4d64a0c Fix loading some maps in T1 mode. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11309 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:35 +02:00
Christian Ohm 7b3dce75df Simplify buildingDamaged(). 
Prevents a possible division by zero, closes #2008.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11307 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:34 +02:00
Guangcong Luo 320a218442 Fix a bug that caused T2 and T3 maps to load in T1 mode. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11304 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:34 +02:00
Guangcong Luo da445cd536 Make some text alignment fixes that got left out of r11230. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11301 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:33 +02:00
Buginator edb644a03b Fix (and add missing) headers to files. 
2009  Warzone Resurrection Project -> 2010  Warzone 2100 Project

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11298 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:33 +02:00
Christian Ohm d1343e4a7d Prevent automake.sh from complaining about astartest. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11296 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:31 +02:00
Per Inge Mathisen e4cf2297b9 Stop falsely advertising ctrl+l as an available key combo. It is not. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11291 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:30 +02:00
Christian Ohm 45de3b488c Update translations. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11285 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:30 +02:00
Christian Ohm f63667e4b5 Add an option for the rotating radar. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11284 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-28 18:58:29 +02:00
Cyp 6957b04072 astar.c → astar.cpp in .vcproj file. 2010-07-24 13:32:09 +02:00
Christian Ohm 09879b8a83 Update translations. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11277 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-24 09:56:07 +02:00
Christian Ohm fdceb3e322 Show complete game name in lobby tooltip. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11275 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-24 09:56:07 +02:00
Christian Ohm b808df33f4 Fix transporter ETA image. 
Closes #2001.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11270 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-23 12:04:37 +02:00
Cyp 1db4f15973 Change do-while to while, since it doesn't make sense to try to read a game structure when there are none in the lobby. 2010-07-22 19:19:53 +02:00
Cyp bb7f960569 Make cliffs (blocking tiles) visible on radar. 2010-07-22 19:19:52 +02:00
Cyp a16c5f7df9 Show oil wells burning in the radar instead of pulsing. 2010-07-22 19:19:52 +02:00
Christian Ohm a31beaec05 Fix "make check". 
Disable astartest, since it's broken after the rename of astar.c to astar.cpp.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11258 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-22 19:17:54 +02:00
Cyp 1b811abcea Before receiving game list from server, clear old games from list, and don't receive more than there are room for in the array. 2010-07-22 14:45:49 +02:00
Cyp 5651464175 newnet: Fix research facilities getting broken if clicking too much before researching. 
(Was broken by "Make production UI respond instantly (without waiting for game state to change).".)
 2010-07-22 09:39:44 +02:00
Christian Ohm 9a05862fba Update .gitignore 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11253 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-22 09:34:23 +02:00
Christian Ohm 9d553bccab Add missing file for r11247. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11251 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-22 09:34:23 +02:00
Christian Ohm bf3006d31c Make sure we use at least 640x480. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11248 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-22 09:34:22 +02:00
Christian Ohm e27ccca05c Windows cross-build: Make quesoglc compile on Ubuntu. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11247 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-22 09:34:22 +02:00
Cyp 694a9f8fb1 Don't spam log with "[NET_InitPlayers] Players initialized" in single-player menu. 2010-07-21 18:47:37 +02:00
Christian Ohm acff17e90c Update list of files to translate. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11242 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-07-21 18:29:56 +02:00
Cyp 1cb0cf5cf9 newnet: Add -lz to configure. (Patch by Per.) 2010-07-21 18:28:41 +02:00
Cyp 0c93c007b9 newnet: Make DORDER_RTB on a droid with DACTION_MOVETOBUILD not crash in skirmish. 
Don't know why it's only in newnet and not trunk, that the AI sends DORDER_RTB in skirmish.

Closes ticket:2010.
 2010-07-21 17:57:52 +02:00