Commit Graph

11068 Commits (ddd113f992f6bdc0052e71dfee8780840fa40fa2)

Author SHA1 Message Date
cybersphinx ddd113f992 Change "System message" to "Server message" for the MOTD. 2012-02-07 18:42:34 +01:00
cybersphinx f04bd71542 Only show "player x joined" message in the lobby when it is someone else. 2012-02-07 18:42:34 +01:00
cybersphinx 411e4acda3 Fix libvorbis linking.
Possibly fixes #2962.
2012-02-07 18:42:34 +01:00
Cyp 8d92594676 Make research button flash more consistently.
Flash research button, if there is a free lab and a new research becomes available, or if
a lab becomes available and there is something to research.

Stop flashing the research button, if there is nothing to research, or no free labs; for
example, due to a lab being upgraded or destroyed.

Available researches which are already being researched by an ally no longer count towards
the button flashing.

Do not randomly start flashing the research button again, even if there are still free
labs which are not researching.

Fixes ticket:1835.
2012-02-07 18:15:40 +01:00
Cyp 24d0d1b64c Always show droids in production, even if obsolete.
This allows cancelling production of obsolete droids, without cancelling all production in the factory.
2012-02-06 14:37:22 +01:00
Cyp ae59186a07 Fix another research cancellation not registering in UI.
If cancelling a research by clicking on the current research, in the research menu (not
right-clicking on the facility), then the next completed research in the same facility
would linger after completion.

Research is cancelled twice when clicking on the current research, but was incorrectly
registered as cancelling three times, confusing the facility. Also, when cancelling, the
second cancellation would fail to be registered, due to the ID of the research facility
not being sent.

Fixes ticket:3130.
2012-02-06 13:54:32 +01:00
vexed a2712860d6 Misc fixes for netcode.
Only kick people out once, not them, their color, and their color again.
2012-02-05 21:43:45 -05:00
Cyp 108b5ef10a Fix randomly disabled teams and ready buttons.
Teams of unallocated players affected team and ready-button availability.
2012-02-05 13:13:04 +01:00
Cyp 51b92cd05f Only highlight own ready button, when hovering with the mouse. 2012-02-05 12:32:46 +01:00
cybersphinx bf16894594 Update ChangeLog. 2012-02-04 23:40:02 +01:00
Per Inge Mathisen 5a6e1f70a7 qt script: Document problem with case sensitivity in script defined globals. 2012-02-04 23:11:54 +01:00
Per Inge Mathisen 083351a0f5 qtscript: Do not save c++ defined special variables to the savegame. 2012-02-04 23:07:20 +01:00
Per Inge Mathisen 2417ba4f4b Quick workaround for scavs going inactive after savegame loading. 2012-02-04 22:42:56 +01:00
Per Inge Mathisen 43fc328aea Merge branch 'bugfixes' of github.com:Warzone2100/warzone2100 into bugfixes 2012-02-04 22:07:55 +01:00
Per Inge Mathisen d11b13c422 If you save, the load, then save again, then game.scavengers value was set to false
even if you have scavengers in the game, and the scavenger script context is not
created, leading to an assert and lack of scavenger action in the game. Fixed.
2012-02-04 22:06:30 +01:00
dak180 c7f3d99d54 Update the docs for xcode builds.
Also restructure the script so it will require less changes in the future.
2012-02-04 15:25:40 -05:00
Per Inge Mathisen 94d7d61b38 qtscript: enumBlips() isn't 3.2-only anymore. 2012-02-04 21:05:16 +01:00
Per Inge Mathisen d82a0fbfbd qtscript: Improve documentation 2012-02-04 20:36:20 +01:00
Per Inge Mathisen 58160f69c5 Make sure we do not start multiple AIs for each player when loading a game. 2012-02-04 20:36:19 +01:00
Cyp b4f24bf44f Fix desynch on offering an AI an alliance.
Only triggers in the rarely-used 'Allow Alliances' game mode, in games with AIs. When
offering an AI an alliance, the AI would sometimes accept instantly, and the acceptance
was not synchronised.
2012-02-04 16:12:45 +01:00
Buginator 415f6fe590 When people are kicked, don't lock them out from all other games.
They can't join the game they were kicked from anyway.

(cherry picked from commit 370ce6c9016fc6bba390fcf498d2be770f77f240)
2012-02-04 08:45:00 +01:00
Cyp 8ab7ba79bc Make latency guesser less optimistic.
Hopefully reduces Zzz microfreezes a bit, in the case of laggy connections.

There's probably a better way of guessing latency than this, but it works for now.
2012-02-04 08:45:00 +01:00
Cyp fc708d6787 Improve screen while waiting for game to start.
Always display the chat console, instead of only flashing it while pressing Esc
repeatedly. Fix weird font sizes. Show which players have loaded so far. Show
joining status for everyone, not just the host.
2012-02-04 08:45:00 +01:00
dak180 d9010d186f Hopefully make it so conflicts in the xcode project files are automatically resolved.
This is done by making them not actually merge (it still will need to be done though just by hand on a platform where it can be tested).
2012-02-03 23:40:24 -05:00
cybersphinx 73ec38c347 Merge branch 'bugfixes'
* bugfixes:
  Check if we actually need to hide widgets before hiding them
  Fix player counts for both AI & humans & 'closed' slots in MP games
  Should fix indicator for loading, skirmish & MP screens. fixes ticket:3104
  Fix calling batch file for autorevision.sh script refs: 17596232cc
  Don't go past the map's player limits when allocating players. fixes ticket:3089
  Fix issues that were overlooked from the revert(s) in ac550acd58
  qtscript: Add a note about local variables to the documentation.
  Splice in the Changelog from 2.3.
  Set radarOnScreen to true by default.
  Add general rules script for the campaign.
  Run eventStartLevel always, not only for skirmish.
2012-02-04 05:32:40 +01:00
vexed 91853401ad Check if we actually need to hide widgets before hiding them 2012-02-03 21:13:57 -05:00
vexed 32a7fe731c Fix player counts for both AI & humans & 'closed' slots in MP games 2012-02-03 21:13:56 -05:00
vexed 7859582f13 Should fix indicator for loading, skirmish & MP screens. fixes ticket:3104 2012-02-03 21:13:55 -05:00
vexed 0e107e7197 Fix calling batch file for autorevision.sh script refs: 17596232cc 2012-02-03 21:13:54 -05:00
vexed 7f7390cb7e Don't go past the map's player limits when allocating players. fixes ticket:3089 2012-02-03 21:13:53 -05:00
vexed 407220868e Fix issues that were overlooked from the revert(s) in ac550acd58 2012-02-03 21:13:52 -05:00
cybersphinx 22056fb5c3 qtscript: Add a note about local variables to the documentation. 2012-02-03 23:56:38 +01:00
cybersphinx 224c1c8d02 Splice in the Changelog from 2.3. 2012-02-03 23:38:34 +01:00
cybersphinx 1d123dffac Set radarOnScreen to true by default.
Otherwise when loading a campaign game with HQ the minimap is missing.
2012-02-03 23:38:34 +01:00
cybersphinx 4a71db9e9b Add general rules script for the campaign.
Enable design and minimap only when an HQ exists.
2012-02-03 23:38:25 +01:00
cybersphinx 78dee1c706 Run eventStartLevel always, not only for skirmish. 2012-02-03 00:43:56 +01:00
Per Inge Mathisen 0b1fbf7e8f qtscript: Add function enumBlips(player) to get a list of non-transient radar blips. 2012-02-02 21:10:55 +01:00
dak180 6ceb3d7977 Merge branch 'bugfixes' into 'master'.
* bugfixes:
  Fix the help bundle.
  Bring back the WarzoneHelp info.plist which was lost in the shuffle.
  Get all of the scripts that are likely to change with any regularity out of the xcode project.
  OS X: Fetching new build dependency versions is not an error.
  Don't assume Xcode's build products are in the source tree.
  Add OS X help menu items for the man page and scripting docs.
2012-02-02 00:33:24 -05:00
dak180 9dfe04a7a8 Add OS X help menu items for the man page and scripting docs.
Closes #3109.

* nanotech/topic/help-menu-links:
  Add OS X help menu items for the man page and scripting docs.
2012-02-02 00:25:22 -05:00
dak180 fb7c7ccdf1 Fix the help bundle.
The info.plist file is now once again included in the bundle.
2012-02-01 23:57:39 -05:00
dak180 44d8bf7b75 Bring back the WarzoneHelp info.plist which was lost in the shuffle. 2012-02-01 23:47:18 -05:00
dak180 3c9b149a7b Misc Xcode Fixes
Xcode (4, at least) parses out the 'error:'s in the log and halts the build. This is probably not what was intended.

* nanotech/topic/xcode4-fixes:
  OS X: Fetching new build dependency versions is not an error.
  Don't assume Xcode's build products are in the source tree.
2012-02-01 23:03:27 -05:00
dak180 c5d4acf773 Get all of the scripts that are likely to change with any regularity out of the xcode project. 2012-02-01 22:24:24 -05:00
NanoTech f273c9ddf0 OS X: Fetching new build dependency versions is not an error. 2012-02-01 20:51:37 -06:00
NanoTech 1ea990ebd4 Don't assume Xcode's build products are in the source tree.
Fixes builds in Xcode 4 with the default external
derived data directory.
2012-02-01 17:04:56 -06:00
NanoTech 9c1bb0cf09 Add OS X help menu items for the man page and scripting docs. 2012-02-01 16:30:29 -06:00
cybersphinx 2a39eac322 Merge branch 'bugfixes'
* bugfixes:
  Fix cross-compilation.
  Add assert for droids added to wrong group.
  qtscript: Try harder not to crash if we fail to load our script context.
  Fix ticket:3094 unit designs in factory menu not appearing when saving and loading.
2012-02-01 23:25:27 +01:00
cybersphinx 1b0a7b7fb0 Fix cross-compilation.
Broken in 5506daef71, which was supposed
to fix #3108.
2012-02-01 23:24:32 +01:00
Per Inge Mathisen 1f83c84326 Add assert for droids added to wrong group. 2012-02-01 23:00:43 +01:00
Per Inge Mathisen e2990407db qtscript: Try harder not to crash if we fail to load our script context. 2012-02-01 22:09:26 +01:00