Commit Graph

14008 Commits

Author SHA1 Message Date
73de625089 Also change GameSetup.cpp.
This was SVN commit r15985.
2014-11-18 00:24:29 +00:00
9407dbe45e Remove useless parameter from CFG_GET_VALUE.
This was SVN commit r15984.
2014-11-17 23:29:49 +00:00
3e4c701ab6 ensure that there are no dupes in buildable list
This was SVN commit r15983.
2014-11-17 23:07:57 +00:00
6695f1a3e8 Remove CParser. Fixes #2589.
This was SVN commit r15981.
2014-11-17 01:04:24 +00:00
b995135138 Use an FSM to parse our config files instead of using CParser. Refs #2589.
Properly write config settings with multiple values back to files. Refs
#1810.
Print error messages if we encountered an invalid setting.

This was SVN commit r15980.
2014-11-17 01:03:59 +00:00
334f391446 Oxford comma.
(We seem to use it elsewhere in the UI, so be consistent.)

This was SVN commit r15979.
2014-11-16 23:44:40 +00:00
cbc49f43e6 The show full games filter in the lobby should be off by default.
This was SVN commit r15978.
2014-11-16 22:40:00 +00:00
947abde749 Flip the buttons in the leave game confirmation dialog to the no/yes order to match other dialogs.
Per the Apple Human Interface Guidelines the confirmation button should
be on the right. We do that for all(?) other dialogs, but not this one.

This was SVN commit r15977.
2014-11-16 22:21:57 +00:00
caed74df23 Fix line endings.
This was SVN commit r15976.
2014-11-16 22:21:06 +00:00
1b91421e5e Escape special character.
This was SVN commit r15975.
2014-11-16 22:06:18 +00:00
30b7a34112 Rename Arcadia 2 to Arcadia, because there doesn't seem to be an Arcadia 1 any more.
This was SVN commit r15974.
2014-11-16 22:03:47 +00:00
f88ee2766e use by default a random seed for the AI to make it less repetitive
This was SVN commit r15973.
2014-11-16 19:53:29 +00:00
94e6e29a34 Properly escape a character and remove a stray tag.
This was SVN commit r15972.
2014-11-16 18:00:02 +00:00
ccb5366e40 fixes #2935
This was SVN commit r15971.
2014-11-16 10:09:20 +00:00
59676dfc84 Update tools/LICENSE.txt
This was SVN commit r15970.
2014-11-16 02:10:31 +00:00
df4c07238d Change GUI tag parsing to use a FSM instead of using CParser. Refs #2589.
Parameters now have to be quoted with ".
Supports " in parameters by escaping them with \.
Tag start characters can be included in normal text by escaping them
with \.
Better error handling and a error messages to help with fixing
invalid/malformed strings.

This was SVN commit r15969.
2014-11-16 02:10:28 +00:00
d15e2f0cf6 Check for availability of XmppClient.
Move Lobby script function registration to the lobby JS interface.

This was SVN commit r15968.
2014-11-16 02:10:24 +00:00
d58189d510 Parse terrain properties without CParser. Refs #2589.
This was SVN commit r15967.
2014-11-16 02:09:02 +00:00
fc1fe174cd Amend the "Reveal All" behavior by always hiding mirages.
This was SVN commit r15966.
2014-11-14 20:29:35 +00:00
4d89820f1c Fixes build errors on Windows introduced in c813a11427 and 1a0f9b086e.
This was SVN commit r15964.
2014-11-13 22:37:43 +00:00
8a290b3204 Fix mirages not flushed properly, introduced in 9ad2fc9fac.
This was SVN commit r15963.
2014-11-13 21:04:40 +00:00
49a31c5de2 prevent events from the first turn after deserialization to be thrown away
This was SVN commit r15962.
2014-11-13 20:21:00 +00:00
c813a11427 Split ScriptRuntime and ScriptInterface code to separate files.
The runtime is becoming more and more important in the JSAPI. As a
result, we also have more functionality on the runtime level and having
the whole ScriptRuntime class hidden in ScriptInterface.cpp doesn't make
sense anymore. ScriptInterface.cpp also has become quite a large file
and pulling out the runtime part makes it a bit smaller.

Refs #2462

This was SVN commit r15961.
2014-11-13 11:19:28 +00:00
1a0f9b086e GUI cleanup.
Remove toTitleCase(). Unify iColorToString() and rgbToGuiColor().
Translate XMPP errors (displayed when connecting).

This was SVN commit r15960.
2014-11-13 01:26:36 +00:00
6e788fb15e Clean up JSON parsing code. Refs #1374.
Fix Engine.ReadJSONFile() which did throw a JS exception that was not
caught. Discovered by s0600204.
Expose Engine.ReadJSONFile() to the gui scripts.

This was SVN commit r15959.
2014-11-13 01:26:22 +00:00
e1c77bb487 Fix tests.
This was SVN commit r15958.
2014-11-12 19:51:28 +00:00
6556aa8c1e fix petra serialization
This was SVN commit r15957.
2014-11-12 18:44:43 +00:00
9ad2fc9fac Slightly improve fogging performance by avoiding the constant deletion/re-creation of mirages.
This makes the simulation update faster per entity but also makes the
number of entities greater at a given moment. The performance gain is
positive.

This was SVN commit r15956.
2014-11-12 15:56:45 +00:00
7130997df9 still more fixes on ai serialization + some cleanings
This was SVN commit r15954.
2014-11-11 22:08:28 +00:00
b596f7a893 additional fixes for petra serialization
This was SVN commit r15953.
2014-11-11 19:02:35 +00:00
13a71f6ae4 some fixes and cleaning in petra saved game support
This was SVN commit r15952.
2014-11-11 11:07:57 +00:00
6bab40c139 some bugfixes on ai serialization
This was SVN commit r15951.
2014-11-10 20:22:10 +00:00
e4774066e2 complete the support of saved games by Petra. It is playable now, but still needs cleaning and bug fixes.
This was SVN commit r15950.
2014-11-10 18:35:52 +00:00
c236e8a877 further steps towards saved games support, but still wip
This was SVN commit r15948.
2014-11-10 09:03:03 +00:00
e108b162b6 Add hotloading for translation files. Fixes #2915.
This was SVN commit r15947.
2014-11-09 16:58:14 +00:00
8b9847e007 Replace CScriptValRooted with JS::Heap<T> and custom tracer for CNetClient
Refs #2462

This was SVN commit r15946.
2014-11-09 15:16:00 +00:00
e1f354024a Persian temple upgrade
This was SVN commit r15945.
2014-11-09 11:30:50 +00:00
8e2d514228 Exact stack rooting for CParamNode
Refs #2415
Refs #2462

This was SVN commit r15944.
2014-11-09 11:08:53 +00:00
9040f8a3d3 Persian stables upgrade
This was SVN commit r15941.
2014-11-08 23:51:33 +00:00
edd9622050 wip petra support of saved games, still incomplete
This was SVN commit r15940.
2014-11-08 19:23:29 +00:00
b5c8646cea Fix actors not retained in FoW after d07d1a17f3.
Refs #2913.

This was SVN commit r15939.
2014-11-08 18:14:45 +00:00
db2f570ef6 Added several missing files of previous commit
This was SVN commit r15938.
2014-11-08 13:21:10 +00:00
e3e829c4b1 Upgraded persian fortress variation B.
Upgraded all cypress variations.
Added six tropical shrubs.

This was SVN commit r15937.
2014-11-08 13:07:45 +00:00
f4b5054815 Fix valgrind warning about uninitialized variable. Patch by Echelon9. Fixes #2878.
This was SVN commit r15936.
2014-11-08 00:37:42 +00:00
2db1f14015 Cart_fortress recentered.
This was SVN commit r15935.
2014-11-07 11:27:59 +00:00
259fcdd8ed Roman vesta temple and triumphal arch AO maps.
Added missing actor for persian barracks

This was SVN commit r15934.
2014-11-07 10:56:41 +00:00
a4b209bf2c Set text align for options to left, increase the size for labels for boolean options. Fixes #2918.
This was SVN commit r15933.
2014-11-07 01:24:13 +00:00
1d1c086e2a Allow translating some strings in the mod selector. Fixes #2919.
Also change column size so that the gd translation fits. (Verified with
long strings)

This was SVN commit r15932.
2014-11-07 00:57:09 +00:00
cbc151cb1e Persian barracks upgrade.
This was SVN commit r15931.
2014-11-07 00:29:31 +00:00
8200182399 Persian fortress variation upgrade. Second variation upgrade soon.
This was SVN commit r15930.
2014-11-06 11:29:14 +00:00