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

11291 Commits (188b4ac5a010e8ab2c1b86b4e77728b76067f713)

Author SHA1 Message Date
cybersphinx 4f722254f0 Revert "qtscript: Do not call destroyed event twice for each object." 
This reverts commit a51de16080.
Fixes #3175.
 2012-02-28 03:20:45 +01:00
vexed 9e63fe3433 Fix transporter check for SP games. 
Add some FIXME comments when we properly fix the campaign scripts.
Expose DROID_SUPERTRANSPORTER to the script engine
Fix gifting of the Super Transporter, along with some other fixes.
Fixes ticket:3224
 2012-02-27 21:17:47 -05:00
vexed 475d1e6252 Scale the transporter & Super Transporter on the scoreboard screen. 
Fixes ticket:3210
 2012-02-25 23:07:17 -05:00
vexed 6bc90e6d2e Apply rest of the patch that was mistakenly left out of 
fcede64e42
Thanks to cybersphinx for the heads up.
 2012-02-25 22:35:38 -05:00
cybersphinx 6f5bf39951 German translation update by Kreuvf. 
Closes #3205.
 2012-02-26 04:15:11 +01:00
cybersphinx f627fd803c Russian translation update by Vadim S. Sabinich. 
Closes #3221.
 2012-02-26 04:15:11 +01:00
cybersphinx 13fba992e7 Don't remove autorevision.h on make clean. 
Otherwise building from a tarball fails after make (dist)clean.
 2012-02-26 04:15:11 +01:00
vexed fcede64e42 Create new droid type, DROID_SUPERTRANSPORTER. 
fixes ticket:3196
 2012-02-25 19:21:29 -05:00
dak180 c91f51a3cf Add an xcode project to run the tests. 
Also makes the qslint command line program.
 2012-02-25 18:12:00 -05:00
dak180 a1fc808e6b Update the MapUtilities xcode project. 2012-02-25 16:44:26 -05:00
dak180 bd44c3f8b7 Add a note to prevent repeats of c6a37b45. 2012-02-25 15:03:02 -05:00
cybersphinx ca033893da Update ChangeLog. 2012-02-21 21:21:39 +01:00
Cyp 851b25cd39 Make debug messages work in campaign mode. 
Fixes scavenger walls not exploding from scripts.

Fixes ticket:3194.
 2012-02-21 20:41:15 +01:00
vexed 1be61c6ba6 fix menu defaults 2012-02-20 19:43:00 -05:00
cybersphinx a2506e3cb8 Update ChangeLog. 2012-02-20 20:26:28 +01:00
cybersphinx 2c9886131b Turkish translation update by Ayhan Görgülü. 
Closes #3192.
 2012-02-20 20:24:18 +01:00
vexed 3438da390f Try to find which messages are not getting processed correctly. 2012-02-20 02:06:25 -05:00
dak180 8027777e9c Update the docs for xcode builds. 
Also get rid of some odd warnings
 2012-02-19 19:52:17 -05:00
cybersphinx e0bcef31c6 Update translations. 2012-02-20 00:35:31 +01:00
cybersphinx e891b7d46b Update ChangeLog. 2012-02-20 00:35:31 +01:00
cybersphinx b5a45c02b0 Search data/mp for map files in addition to data/base. 
Refs 779b4edcbd.
 2012-02-20 00:26:43 +01:00
vexed bdd5969031 Bump netcode, since I forgot in last commit. 2012-02-19 18:22:06 -05:00
vexed 9a005ac66e Let the host kick people in non alliance games. (left+right click over ready button of the player you want kicked) 
close ticket:3100
close ticket:3121
Fix kick routines that got clobbered by the merge a long time ago, and also implement a in-game kick.

Currently, you hold down the right mouse button over the channel icon of the person you want to kick, and it will kick them.

There is no more room for a new icon. :(

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11490 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit da30725d967cf7076456f56122b28ddbc3202488)

Conflicts:

	src/multiint.cpp
	src/multimenu.cpp
	src/multiplay.cpp

Allow the host to kick the AI only in 'cheat mode' in skirmish games.

Closes ticket:2139

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11596 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 7a083b154dab6b6fa8f421042db0670a671127f5)

Conflicts:

	src/multimenu.cpp

When kicking, make sure they are an actual human player before adding them to the list.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11506 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 43b180768c71853b3de97d71fa091e6a0fdfc10e)

Conflicts:

	lib/netplay/netplay.c

general networking improvements by popular request.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11568 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 052d03d19ec967d4b8cee5d79446fe5ec1f2b040)

Conflicts:

	lib/netplay/netplay.c
	src/multiint.cpp
	src/multijoin.cpp
	src/multiplay.cpp
	src/multiplay.h
	src/multisync.c

Fix client side messages.

refs ticket:2144

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11601 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 98723c00a9b7d6a46eab204ccd474df4a62fbd93)

Conflicts:

	lib/netplay/netplay.c
	src/multiint.cpp
	src/multiplay.cpp
 2012-02-19 17:49:49 -05:00
vexed cdb8c18d04 Try a alternative fix for 5694a6fded 2012-02-19 17:10:12 -05:00
vexed 1a9b109b89 Fix a missed file, broken in 5694a6fded 2012-02-19 16:55:14 -05:00
vexed 5694a6fded Remove broken old-1.10 mod Update NSIS for the removal 2012-02-19 16:48:33 -05:00
vexed ac3b802a44 Try to improve the host screen to fit all 10p and move 
limits & start hosting buttons to a better(?) location.

Fixes ticket:3157
 2012-02-19 16:06:54 -05:00
vexed 78dd89477c Adjust the Super Transport gfx, thanks to Mysteryem & Berg. 
Adjust speed to make it faster.
Adjust armor to make it much weaker.
Fix Research name.
This is the PIE 2 version model.
 2012-02-19 16:06:54 -05:00
vexed bccb89cf37 Fix radar/minimap size to adapt to lower resolutions better. 
Fixes ticket:2694
 2012-02-19 16:06:53 -05:00
crabster 60fb815bf3 Extending components limit in unit design GUI 
Fixes ticket:3160
Limit of components to design increased to 128.
 2012-02-20 01:01:41 +04:00
vadim s. sabinich 519b83fbd3 Russian translation update by Vadim S. Sabinich. 
See https://github.com/Warzone2100/warzone2100/pull/29.
 2012-02-19 21:27:46 +01:00
cybersphinx b7541ac45b Russian translation update by rustamv.rman. 
Closes #3184.
 2012-02-19 21:27:16 +01:00
cybersphinx ba33e2c0e4 Update translations. 2012-02-19 21:22:37 +01:00
cybersphinx e076ad57a4 Fix looping through selections. 
Introduced in 8379fb2f8b. Fixes #3189.
 2012-02-19 21:20:56 +01:00
dak180 79772c82b5 Update Png to 1.5.9. 2012-02-18 16:58:01 -05:00
Cyp cefd4179f7 Allow configuring default skirmish colour to any colour, or to random. 2012-02-17 00:09:06 +01:00
iNoDlite a7d2c06c28 Bring back to life old VBO hack for unlucky OpenGL 1.4 users, GLEW edition this time. Closes #3166. 
Removed some duplicated code for gfx info dump.
 2012-02-17 01:39:12 +04:00
cybersphinx f7b2351e1a Add a --fallback-mode option that makes the game only use OpenGL 1.5. See #3166. 2012-02-17 01:15:57 +04:00
vexed 001ef35faf Play the correct sounds when we are getting attacked. 
Broken in f35de0d513

NOTE: see aforementioned commit b18b76ea8a
on why we should be spitting out warnings/errors, not ignore these issues.

Fixes ticket:3102
 2012-02-15 21:51:46 -05:00
vexed 9a66b4e0d6 Correctly define the function for compilers that aren't broken enough to allow bool blah() == void blah() which should throw a error since we don't overload it. 
Broken in 68639f734f
 2012-02-15 21:48:08 -05:00
vexed b18b76ea8a Don't hide possible misnamed or non-existent function calls in qtscript's backend. We now give a LOG_WARNING to notify us of the possible error. NOTE: might be better to promote this to LOG_ERROR, so we can tell in-game that we have issues instead of parsing log files. 2012-02-15 21:48:07 -05:00
vexed db74b52388 Make sure we clear the tile with the feature on it after it has been destroyed. 
Not really a cherry-pick (functions changed), however, it is the same logic so wanted
to keep track of the cherry-pick.

fixes ticket:3155

2.3: Make sure we clear the tile with the feature on it after it has been destroyed.

refs ticket:2534
(cherry picked from commit d1c93494dee2f1b929776edadc3bad1f7d364491)

Conflicts:
	src/feature.c
 2012-02-15 21:48:06 -05:00
vexed abd869b079 Clean up includes from 24db01ae10 2012-02-15 21:48:05 -05:00
vexed b5ab238e23 Tone down the text color of the level name/time 2012-02-15 21:48:04 -05:00
vexed 845d423cb2 Add a 'Need more resources' indicator in the power bar when needed. 2012-02-15 21:48:03 -05:00
cybersphinx f1fd685071 Only copy javascript doc if we build out of tree. 
Also run hevea twice to get cross-references right.
 2012-02-15 23:09:18 +01:00
Cyp ea8d833e5c Fix lassat firing too many times when clicking fast. 
Fixes ticket:3163.
 2012-02-13 12:39:34 +01:00
Cyp ea37769188 Rename game debug messages to GAME_DEBUG_*. 
Also, avoid unexpected triggering of debug code.

Note that this code was actually originally part of the pre-newnet synchronisation
mechanism, but is no longer useful outside of debugging.
 2012-02-13 12:12:14 +01:00
Cyp 68639f734f Synchronise enabling of debug mode. 2012-02-13 00:45:37 +01:00
Cyp 24db01ae10 Remove legacy synch code. 
Some of it would run in the case of desynchs, but didn't help with anything.
 2012-02-12 20:16:47 +01:00