Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Warzone2100/warzone2100
base: v3.1_beta2
...
head fork: Warzone2100/warzone2100
compare: v3.1_beta4
Commits on Feb 08, 2012
@Cyp Cyp Allow PMs to player 8 and 9.
Fixes ticket:3141.
e581b84
@perim perim Fix ticket:3137 - Nexus AIs loaded for javascript AIs 9d61693
Commits on Feb 10, 2012
@crab312 crab312 Fix incorrect speed bars for vtol.
Fixes ticket:3143
2e03931
@crab312 crab312 Fix incorrect rounding 1% HP as 0 HP (indestructible features)
Fixes ticket:3134
This fixes the problem where the map has features with 1% HP which
are incorrectly converted to 0 HP
2fc761a
@cybersphinx cybersphinx Change new PIE modes to use flags instead of connectors.
Introduced in 82e00bf:

  Roll to camera uses TYPE x1x instead of a "1 x 0" connector.

  Pitch to camera uses TYPE x2x instead of a "2 x 0" connector.

  Additive uses TYPE xx1/xx2 to dis/enable instead of a "x 1 0"/"x 2 0" connector.

Introduced in f3ba237:

  Premultiplied uses TYPE xx4 instead of a "x 3 0" connector.

Refs #3024.
97a7c6a
@cybersphinx cybersphinx qtscript: Remove OPTIONS as an alias for the COMMAND button.
Even in wzscript this was only for backwards compatibility.
eda532d
@cybersphinx cybersphinx qtscript: Document add/removeReticuleButton parameters. cb94218
@cybersphinx cybersphinx Clean up src/selection.cpp/h. 8379fb2
@cybersphinx cybersphinx Add new shortcuts for unit selection.
Ctrl+C: All cyborgs
Shift+C: All cyborgs with weapons
Shift+E: All cyborg engineers
Shift+G: All ground based attack units including hovers
Shift+M: All cyborg mechanics
Shift+P: All transporters
Shift+R: All tanks with repair turrets
Shift+S: All sensor units
Shift+T: All trucks

Original patches by JDW and Wolfbyte. Closes #3150.
37cf6b4
@cybersphinx cybersphinx qtscript: Add selection by structure type to enumStruct. 1266a79
@cybersphinx cybersphinx qtscript: Add function to enumerate base structures in away missions. 911dda3
@cybersphinx cybersphinx Fix radar/unit design in campaign for away missions. 391ffb6
@cybersphinx cybersphinx qtscript: Use lstlisting in the docs. f8b54fd
@cybersphinx cybersphinx qtscript: Add an html target using hevea for the docs. dfaadbc
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  qtscript: Add an html target using hevea for the docs.
  qtscript: Use lstlisting in the docs.
  Fix radar/unit design in campaign for away missions.
  qtscript: Add function to enumerate base structures in away missions.
  qtscript: Add selection by structure type to enumStruct.
  Add new shortcuts for unit selection.
  Clean up src/selection.cpp/h.
  qtscript: Document add/removeReticuleButton parameters.
  qtscript: Remove OPTIONS as an alias for the COMMAND button.
  Change new PIE modes to use flags instead of connectors.
  Fix incorrect rounding 1% HP as 0 HP (indestructible features)
  Fix incorrect speed bars for vtol.
  Fix ticket:3137 - Nexus AIs loaded for javascript AIs
  Allow PMs to player 8 and 9.
119ac53
Commits on Feb 11, 2012
@vexed vexed Unfortunately, the Project can't stop time, so bump the year. 3e15039
@vexed vexed Add a A_O_R to prevent crashing on null pointer 46d1e62
@vexed vexed Fix ping times for clients. broken in 74261ad 65e7c82
Commits on Feb 12, 2012
@Cyp Cyp Fix unit speeds.
Units now actually move at the speeds given in the design menu, which in the case of
VTOLs is up to 2.5 times faster, and which in the case of land units up to 1.2 times
faster on one particular terrain type, instead of moving at a maximum of
DROID::baseSpeed, which is the speed before terrain modifiers.

Introduced in 4b08dd0.

Fixes ticket:3140.
5a39253
@dak180 dak180 In reference to 3e15039 bump the year in the mac files.
Also update the copying.* files included in the mac builds.
04bc8b8
@dak180 dak180 Update Vorbis to 1.3.3. a369971
@Cyp Cyp Remove legacy synch code.
Some of it would run in the case of desynchs, but didn't help with anything.
24db01a
@Cyp Cyp Synchronise enabling of debug mode. 68639f7
Commits on Feb 13, 2012
@Cyp Cyp 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.
ea37769
@Cyp Cyp Fix lassat firing too many times when clicking fast.
Fixes ticket:3163.
ea8d833
Commits on Feb 15, 2012
@cybersphinx cybersphinx Only copy javascript doc if we build out of tree.
Also run hevea twice to get cross-references right.
f1fd685
Commits on Feb 16, 2012
@vexed vexed Add a 'Need more resources' indicator in the power bar when needed. 845d423
@vexed vexed Tone down the text color of the level name/time b5ab238
@vexed vexed Clean up includes from 24db01a abd869b
@vexed vexed 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 d1c9349)

Conflicts:
	src/feature.c
db74b52
@vexed vexed Don't hide possible misnamed or non-existent function calls in qtscri…
…pt'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.
b18b76e
@vexed vexed 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 68639f7
9a66b4e
@vexed vexed Play the correct sounds when we are getting attacked.
Broken in f35de0d

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

Fixes ticket:3102
001ef35
@vexed vexed Merge branch 'bugfixes' into 3.1 3d36a2a
@cybersphinx cybersphinx Add a --fallback-mode option that makes the game only use OpenGL 1.5.…
… See #3166.
f7b2351
@iNoDlite iNoDlite Bring back to life old VBO hack for unlucky OpenGL 1.4 users, GLEW ed…
…ition this time. Closes #3166.

Removed some duplicated code for gfx info dump.
a7d2c06
@Cyp Cyp Allow configuring default skirmish colour to any colour, or to random. cefd417
Commits on Feb 18, 2012
@dak180 dak180 Update Png to 1.5.9. 79772c8
Commits on Feb 19, 2012
@cybersphinx cybersphinx Fix looping through selections.
Introduced in 8379fb2. Fixes #3189.
e076ad5
@cybersphinx cybersphinx Update translations. ba33e2c
@cybersphinx cybersphinx Russian translation update by rustamv.rman.
Closes #3184.
b7541ac
@sabinich sabinich Russian translation update by Vadim S. Sabinich.
See #29.
519b83f
@perim perim Set 3.1's qtscript version properly. b49039f
@crab312 crab312 Extending components limit in unit design GUI
Fixes ticket:3160
Limit of components to design increased to 128.
60fb815
@vexed vexed Fix radar/minimap size to adapt to lower resolutions better.
Fixes ticket:2694
bccb89c
@vexed vexed 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.
78dd894
@vexed vexed Try to improve the host screen to fit all 10p and move
limits & start hosting buttons to a better(?) location.

Fixes ticket:3157
ac3b802
@vexed vexed Remove broken old-1.10 mod Update NSIS for the removal 5694a6f
@vexed vexed Fix a missed file, broken in 5694a6f 1a9b109
@vexed vexed Try a alternative fix for 5694a6f cdb8c18
@vexed vexed Merge branch 'bugfixes' into 3.1 127a7df
@vexed vexed Let the host kick people in non alliance games. (left+right click ove…
…r 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 da30725)

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 7a083b1)

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 43b1807)

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 052d03d)

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 98723c0)

Conflicts:

	lib/netplay/netplay.c
	src/multiint.cpp
	src/multiplay.cpp
9a005ac
@vexed vexed Bump netcode, since I forgot in last commit. bdd5969
@cybersphinx cybersphinx Search data/mp for map files in addition to data/base.
Refs 779b4ed.
b5a45c0
@cybersphinx cybersphinx Update ChangeLog. e891b7d
@cybersphinx cybersphinx Update translations. e0bcef3
Commits on Feb 20, 2012
@dak180 dak180 Update the docs for xcode builds.
Also get rid of some odd warnings
8027777
@dak180 dak180 Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update the docs for xcode builds.
  Update translations.
  Update ChangeLog.
  Search data/mp for map files in addition to data/base.
  Bump netcode, since I forgot in last commit.
  Let the host kick people in non alliance games. (left+right click over ready button of the player you want kicked)
fa05b80
@vexed vexed Try to find which messages are not getting processed correctly. 3438da3
@vexed vexed Merge branch 'bugfixes' into 3.1 b27a5f9
@cybersphinx cybersphinx Turkish translation update by Ayhan Görgülü.
Closes #3192.
2c98861
@cybersphinx cybersphinx Update ChangeLog. a2506e3
Commits on Feb 21, 2012
@vexed vexed fix menu defaults 1be61c6
@vexed vexed Merge branch 'bugfixes' into 3.1 1ec8bdb
@Cyp Cyp Make debug messages work in campaign mode.
Fixes scavenger walls not exploding from scripts.

Fixes ticket:3194.
851b25c
@cybersphinx cybersphinx Update ChangeLog. ca03389
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  Make debug messages work in campaign mode.
7eb89ba
@vexed vexed Use lower-res textures as default. 6c9a6b6
@cybersphinx cybersphinx Update version numbers for 3.1 beta4. 41c2276