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

9879 Commits (0372b01b801b8f93a63cac949a0912621eca4563)

Author SHA1 Message Date
Cyp 1c44b38fbd Use std::swap in swapMissionPointers. 2011-02-25 19:57:40 +01:00
Cyp dc4cf90ce5 Merge branch 'master' into qt 
Conflicts:
	lib/framework/input.cpp
	lib/ivis_opengl/screen.cpp
	lib/ivis_opengl/screen.h
	lib/widget/scrap.cpp
	lib/widget/scrap.h
	macosx/Warzone.xcodeproj/project.pbxproj
	src/multiint.cpp
 2011-02-25 18:59:41 +01:00
Cyp 4a1b5fb543 Bump year. 
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
 2011-02-25 18:50:54 +01:00
Cyp ae2ce18314 Bump year. 
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
 2011-02-25 18:45:27 +01:00
Cyp 938bd28a56 Don't deselect all but 1 truck, when selecting demolish from the build menu. 2011-02-25 18:22:08 +01:00
Cyp 6aedc62db4 Fix assertion when doing line build and some non-construction droids are selected. 2011-02-25 17:53:21 +01:00
Cyp f335b2173a Fix VTOLs sometimes forgetting to rearm before flying off. 
A VTOL would be waiting for a rearming pad to become available, but also happen to be covering a rearming pad, and get asked to clear off since it wasn't actually using that pad. The VTOLs would then get confused, and fly off as if it had rearmed itself already.
 2011-02-25 02:23:35 +01:00
Cyp 2817c7142b Fix FEAT_SKYSCRAPER features on TER_CLIFFFACE tiles remaining as blocking for air units even after being destroyed. 2011-02-25 00:52:13 +01:00
cybersphinx dfcd1657a9 Portuguese and Brazilian translation update by Tucalipe. 
Closes #2489.
 2011-02-25 00:22:31 +01:00
cybersphinx 1d5fa7e5d4 French translation update by Gilles J. Seguin. 2011-02-25 00:22:31 +01:00
Cyp ef4d4bbd1d Fix ping in pre-game lobby screen. 
Ping frequency was based on gameTime, which is constant and meaningless if the game has not started.

Fixes ticket:2375.
 2011-02-24 23:15:57 +01:00
Cyp a01cc343c5 Fix scores usually being displayed as 0 in multiplayer. 
Scores were 0 due to some complicated score synchronisation code.
Fixed mainly by removing a lot of the score synchronisation code.
 2011-02-24 22:53:27 +01:00
Cyp 00cece64ae Add assertion that droid ID is not 0. 
Seems that weird stuff is possible when a droid has an ID of 0.
Finding and fixing all places that assume a droid cannot have an ID of 0 might be more correct, but adding an assertion is easier.
 2011-02-23 14:41:32 +01:00
cybersphinx 54ca45e8f4 Increase recycled experience storage. 
Also make constants for the unit limits. The experience storage is a separate
value, to be able to change unit limits without breaking savegames.
 2011-02-23 01:12:45 +01:00
Cyp daaf52c778 Fix research being free due to incorrect shift direction in aiUpdateStructure. 
Was >>32, should have been <<32, broke in 466943b783.

Cleaned up some casts a bit, too.
 2011-02-23 00:09:26 +01:00
Cyp 4fec447170 Add more syncDebug when objects are damaged. 
Also, added syncDebugObject function for tracing objects of unspecified type.
 2011-02-21 20:22:48 +01:00
Cyp e0617af5e6 Hack in the team colour when shaders aren't supported. 
Ugly, but better than nothing.
 2011-02-20 22:10:12 +01:00
Cyp e6298083f0 Deselect droids immediately, before waiting for droid repair states to be synchronised. 
Fixes ticket:2495.
 2011-02-20 17:36:10 +01:00
Per Inge Mathisen 48ff5e55d2 Fix 2 cpp check warnings reported by pabs3. 2011-02-18 15:54:39 +01:00
Cyp 733ab6e911 Fix compilation with C++0x compilers. 
Can't use nullptr, until switching to C++0x.
 2011-02-15 14:28:08 +01:00
cybersphinx 37616320bd A bit of cleanup. 
make_dir() does both the PHYSFS_mkdir() and strcpy().
 2011-02-15 02:22:23 +01:00
cybersphinx 3a56299517 Add a version-independent path for videos on Macs. 2011-02-14 22:57:52 +01:00
cybersphinx b29fe379f8 Remove some unused variables found by gcc 4.6. 2011-02-14 22:13:11 +01:00
Cyp 577cbbf874 Fix weird logfile date due to Jan..Dec = 0..11 in struct tm. 2011-02-14 22:08:11 +01:00
dak180 7a44272305 Set up some analyser options for potential later use. 2011-02-13 18:31:17 -05:00
safety0ff 84740c4390 Reset color to white before rendering decals rather than after having changed it. 
Fixes #2487.
 2011-02-13 15:21:41 -05:00
Cyp e862a993cb Split droid template list into game-state list and UI list. 
This simplifies things a bit and fixes a desynch.
 2011-02-13 18:57:25 +01:00
Per Inge Mathisen 37fd0bb4f1 Do not load AI data twice when loading savegames, once from scratch and once from savegame. 2011-02-12 23:17:32 +01:00
Cyp 22dbc657bd Make power generator effect addition constant instead of proportional to FPS, and halve smoke trails. 
It should now be possible to look at power generators and rearming pads without the FPS dropping significantly.
The FPS should no longer drop asymptotically to 0 when the game is paused due to lag and there is a power generator or rearming pad on-screen.
 2011-02-12 22:53:06 +01:00
Cyp bea4607858 Bump arbitrary structure limit of any structure type from 255 to 4294967295. 
255 limit was probably due to the important need to save 12 bytes of memory per structure type per player.
 2011-02-12 22:29:32 +01:00
dak180 e87b3c01a9 Merge remote-tracking branch 'refs/remotes/origin/master' 2011-02-12 12:09:34 -05:00
dak180 48e30ae04f Use StaticAnalyzer builds for the buildbots. 2011-02-12 12:01:00 -05:00
cybersphinx caee6e3da7 Change video download location to Sourceforge for the Windows installer. 2011-02-10 21:20:29 +01:00
cybersphinx 7232b97fc8 Use a tarball for quesoglc instead of svn export. 2011-02-09 22:55:23 +01:00
cybersphinx d3219d93cf Change the backup download location for the cross-build. 
Use wzhost.wz2100.net instead of fontys.nl.
 2011-02-09 21:58:41 +01:00
Cyp 67dfa3c2e1 Fix bogus "incompatible mod" kick in games with scavengers. 
Fixes ticket:2477.
 2011-02-09 18:21:40 +01:00
dak180 8989f42afe Add a category to the mac's app bundle. 2011-02-08 00:40:14 -05:00
Per Inge Mathisen c7af311007 qt branch: Soften the font colours in a few more places. 2011-02-06 22:47:43 +01:00
Per Inge Mathisen 5ea9d75ab2 qt branch: Soften font colours a bit to make them look more like master. 2011-02-06 22:41:27 +01:00
Per Inge Mathisen 47b11c81e7 qtscript: Scavenger script ported. 2011-02-06 18:19:05 +01:00
Per Inge Mathisen 78e0153e1f Merge branch 'qt' into qtscript 2011-02-06 18:06:12 +01:00
Per Inge Mathisen fccc40dfb3 Merge branch 'master' into qt 2011-02-06 16:19:53 +01:00
Per Inge Mathisen 294335e194 Clean up the IdToNN() functions. Patch reviewed by Cyp. 2011-02-06 16:14:20 +01:00
Per Inge Mathisen a9169a0339 Constify some template function string parameters. 2011-02-06 13:01:39 +01:00
cybersphinx 7d18ab826d Fix cross-build. 2011-02-06 03:38:28 +01:00
cybersphinx dc2385368c Merge branch 'master' into qt 
Conflicts:
	lib/framework/frame.cpp
	lib/framework/frame.h
 2011-02-05 18:44:00 +01:00
cybersphinx a236387ad1 Add missing include. 2011-02-05 18:35:56 +01:00
cybersphinx 1db938cd0b Set a window icon. 
lib/framework/wz2100icon.h created from the 32x32 icon from
icons/warzone2100.ico by the Gimp's C code export.

Closes #2465.
 2011-02-05 18:23:00 +01:00
cybersphinx ce3de81d64 Configurable downloads directory for the cross-build script. 
Can be set as "DOWNLOADS=/where/ever/you/want" in win32/__BUILD_CONFIG.USER.
 2011-02-05 18:00:39 +01:00
cybersphinx 7b0316696e Add cast to fix compilation with -Werror. 2011-02-05 18:00:39 +01:00