Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
16,626 Commits 1 Branch 28 Tags 13 GiB
6149dd3841
Commit Graph

6352 Commits

Author SHA1 Message Date
elexis
6149dd3841 Actually remove trailing whitespace for non-header files as well. 
This was SVN commit r18989.
 2016-11-23 13:02:58 +00:00
elexis
944ba16eb4 End source files with a newline. 
This was SVN commit r18988.
 2016-11-23 11:27:54 +00:00
elexis
b18f74da44 Remove trailing whitespace and whitespace in empty lines of source/ except source/third_party/. 
This was SVN commit r18987.
 2016-11-23 11:18:37 +00:00
elexis
aa7e2fce49 Don't subtract the scrollbar size from GUI dropdowns when there is no scrollbar. Patch by Imarok, reviewed by mimo, refs #3571. 
Remove unused button_width.

This was SVN commit r18984.
 2016-11-22 13:05:56 +00:00
elexis
7ff7fcd240 Support hardcoded translation comments when extracting strings from JSON files. 
Correct the function description of extractFromFile introduced in
ae10d34d99.

This was SVN commit r18963.
 2016-11-19 14:16:50 +00:00
mimo
a3c3ca79cf Save the config file even it does not exist, patch by Vladislav Belov, fixes #4146 
This was SVN commit r18960.
 2016-11-18 18:06:01 +00:00
elexis
aa26863d5c Fix an OOS on rejoin caused by ParamNode.cpp using an invalid node cache. Patch by leper, fixes #4316. 
Reuse the temple of vesta inheritance from 06bf79b7e8 which was affected
by this bug.

This was SVN commit r18942.
 2016-11-15 14:01:15 +00:00
elexis
3008533c8e Add a template manager test that reveals an inheritance error in ParamNode.cpp which can trigger an OOS on rejoin. Patch by leper, refs #4316. 
This was SVN commit r18941.
 2016-11-15 13:51:29 +00:00
elexis
2bf1dbfd13 An awesome Rejoin-test tool by wraitii and Itms, fixes #4242, refs #3460. 
Contrary to the serializationtest, initializes the secondary simstate
only once
before progressively applying updates.
Thus reproducing actual multiplayer rejoining, enabling developers to
analyze OOS reports solely from the replay file of the rejoined and a
non-rejoined client.

This was SVN commit r18940.
 2016-11-15 13:26:58 +00:00
elexis
f3ab043c91 Rename isReplay to isNonVisualReplay becuase it is false for visual replays. 
This was SVN commit r18937.
 2016-11-14 17:19:53 +00:00
elexis
948d2a4635 Clear particle emitters when ending a game so they don't leak into new games. Patch by Vladislav, fixes #4111. 
This was SVN commit r18936.
 2016-11-14 17:16:59 +00:00
elexis
3f5648767d Scroll to the selected element after the selection changes. Fixes #4254, refs #3742. 
This was SVN commit r18935.
 2016-11-14 15:28:49 +00:00
elexis
34ce0f865d Reset the cursor when opening new GUI pages. Patch by danger89, refs #539. 
Remove duplicate cursor image and duplicate hardcoded default paths.

This was SVN commit r18933.
 2016-11-14 13:23:07 +00:00
elexis
2ec3f3ebaa Add parenthesis suggested by gcc 5.4 following 3e59ac76ee, refs #4278. 
This was SVN commit r18924.
 2016-11-12 16:07:23 +00:00
mimo
3e59ac76ee fix UnitMotion when inside the obstruction, refs #4278 
This was SVN commit r18921.
 2016-11-11 13:14:30 +00:00
elexis
e55ee5048e Bump version number to Alpha 22. 
Remove "new" keyword from Alpha 21 maps.
Remove "new pathfinder" hint from Alpha 19, as reported by fcxSanya.
Show chat timestmaps by default.

This was SVN commit r18919.
 2016-11-11 01:46:12 +00:00
wraitii
12ad190a51 Allow .Deleted to work on directories. Fixes #2641. Patch by leper. 
This was SVN commit r18916.
 2016-11-10 22:52:39 +00:00
Itms
aba2e53714 Update the list of bundled languages for A21. 
This was SVN commit r18900.
 2016-11-01 16:33:33 +00:00
elexis
4898e94c81 Remove unneeded braces and whitespace in empty lines. 
This was SVN commit r18882.
 2016-10-28 16:11:59 +00:00
elexis
5a384f4eaf Fix an OOS on rejoin when a ptolemian lighthouse revealing the shoreline was built prior. Patch by Itms and wraitii, fixes #4277. 
Serialize the mapsize in the pathfinder and the reveal shoreline flag in
the range manager.
Reload the rangemanager data after other components have been
deserialized.
Use the SerializeCommon pattern in the pathfinder to avoid code
duplication.
Move the shoreline logic from the Vision component to the range manager.
Remove unused interface mocks from the rangemanager test following
b05879e151.

This was SVN commit r18879.
 2016-10-28 15:34:24 +00:00
elexis
44f0929ea6 Don't throw FSM update errors (type=16 state=6) when kicking clients while others haven't finished the authentication, loading screen or synchronization yet, refs #3241. 
This was SVN commit r18859.
 2016-10-23 15:44:02 +00:00
elexis
20399b72f1 Fix a bug where the networked game would never start if a client would disconnect while synchronizing, fixes #4289. 
This was SVN commit r18858.
 2016-10-23 15:13:16 +00:00
wraitii
7f8f820e35 Fix an oversight in d8c11434a8/18823, fixes #4270 . 
This was SVN commit r18835.
 2016-10-16 20:17:31 +00:00
elexis
0991c22026 Take vision range techs into account on ownership change (capturing or defeat). Solves an OOS, reviewed by wraitii, fixes #4279, refs #3989. 
This was SVN commit r18833.
 2016-10-15 18:22:10 +00:00
Itms
9c2404e40e Some tweaks in order to fix the non-graphical test modes (serialization test, etc.), and possible future non-visual players like headless game servers. 
The internal data of the component, which is serialized, should not
depend on the presence of a visual Unit.

Also remove a misleading comment about a simple initialization code.

Refs #4270

This was SVN commit r18824.
 2016-10-10 10:56:13 +00:00
Itms
ef7486c5d3 Fix a number of things in cmpVisualActor: 
* Rewrite the Update function, add more details and information in
comments, and properly serialize everything that function needs.
* Fix the broken deserialization code by using a sane helper function.
* Fix the `SelectMovementAnimation` function.

Fixes #4270.

This was SVN commit r18823.
 2016-10-10 10:49:49 +00:00
Itms
d8c11434a8 Save the animation sync offset, for consistency's sake. 
Refs #4270

This was SVN commit r18822.
 2016-10-10 10:41:36 +00:00
Itms
79b37bd4dc Improve style and whitespace in CCmpVisualActor. 
Refs #4270

This was SVN commit r18821.
 2016-10-10 10:37:58 +00:00
Itms
0030f6ad2b In CCmpVisualActor, m_Unit is not initialized when running without graphics, so we must check that pointer everytime. Also make one call consistent with the rest of the file. 
Fixes #4238, refs #3952

This was SVN commit r18812.
 2016-10-08 08:49:35 +00:00
Itms
636da605bb Following e757fb84d5: also regenerate the JS values for AI maps upon deserialization. 
Fixes #4247, refs #4191

This was SVN commit r18797.
 2016-10-01 12:29:44 +00:00
Itms
58704fa140 Remove a function relying on systems that are not optimized at all. This function is not actually used by Petra. 
If it is needed at some point, this map should be handled and updated
the same way as the passability map and territory map are.

Refs #4191

This was SVN commit r18760.
 2016-09-24 15:21:20 +00:00
Itms
e757fb84d5 More clever map updates for the AI. 
This patch fixes frequent memory issues by removing several dummy
allocations and a lot of memory footwork.

Fixes #4191

This was SVN commit r18759.
 2016-09-24 15:16:55 +00:00
Itms
172c222e9b Fix a possible source of segmentation fault in our custom version of ObjectIdCache. 
Patch by echotangoecho, refs #4053

This was SVN commit r18757.
 2016-09-24 13:48:11 +00:00
Itms
caef42084d Add missing JSAutoRequest calls. (hopefully all of them have been spotted now) 
Patch by echotangoecho, refs #4053

This was SVN commit r18730.
 2016-09-18 09:34:45 +00:00
elexis
c92e74138a Use the local timezone when localizing UTC timestamps. Patch by Imarok, fixes #3350, refs #2938. 
Thus show the correct time in the lobby, savegame and replay menu.

This was SVN commit r18725.
 2016-09-15 13:16:48 +00:00
elexis
24a488bacc Increase the maximum observer limit to 32 for the upcoming release, refs #4210. 
This was SVN commit r18719.
 2016-09-11 22:46:00 +00:00
elexis
e0c30745f9 Template manager cleanup. Patch by leper, refs #2951. 
Move an early return to the top of the function.
Add an early return in case an error was determined.
Remove unneeded variables ok and templatePath.
Replace includeSubdirectories boolean with a flags int to merge
duplicate vfs::ForEachFile calls.

This was SVN commit r18696.
 2016-09-04 15:28:36 +00:00
elexis
c2078bd0c6 Supress an error warning that isn't valid for unsortable ordered lists and hide sorting sprites if sorting is disabled. Based on patch by Imarok, refs #3905. 
This was SVN commit r18694.
 2016-09-03 22:22:11 +00:00
Itms
8284cc4302 SpiderMonkey 38 upgrade: 35/35 
Some comments for the next SpiderMonkey upgrade. That's all folks, fixes
#3708

This was SVN commit r18689.
 2016-09-02 16:55:13 +00:00
Itms
2a33c4476f SpiderMonkey 38 upgrade: 34/35 
Use the C++ API for Maps. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1121332

This was SVN commit r18688.
 2016-09-02 16:54:00 +00:00
Itms
0cc23c1964 SpiderMonkey 38 upgrade: 33/35 
Remove a workaround. Note that this removal is incomplete. Based on
patch by leper.

This was SVN commit r18687.
 2016-09-02 16:53:22 +00:00
Itms
9b794593db SpiderMonkey 38 upgrade: 32/35 
JS_GetStringCharsAndLength was removed, use
JS_Get{Latin1,TwoByte}StringCharsAndLength instead.

Actually handle strings in both the Latin1 and TwoByte cases since we
need to.
This saves some space when serializing and also when running as they are
stored that way in the vm.
Also handle the error case.

Patch by leper.
For more information:
https://blog.mozilla.org/javascript/2014/07/21/slimmer-and-faster-javascript-strings-in-firefox/
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1037869

This was SVN commit r18686.
 2016-09-02 16:51:09 +00:00
Itms
72ec5d9767 SpiderMonkey 38 upgrade: 31/35 
Remove workaround for crash when using multiple ctxts per runtime, this
was fixed upstream. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=890243 and
https://bugzilla.mozilla.org/show_bug.cgi?id=905926

This was SVN commit r18685.
 2016-09-02 16:50:07 +00:00
Itms
f06eb5536b SpiderMonkey 38 upgrade: 30/35 
Upstream added a compartment option to preserve JIT code during
non-shrinking GCs, so use it. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1068697

This was SVN commit r18684.
 2016-09-02 16:48:41 +00:00
Itms
27c434e2bd SpiderMonkey 38 upgrade: 29/35 
We now have better error messages, so fix the tests to account for that.
Patch by leper.

This was SVN commit r18683.
 2016-09-02 16:47:33 +00:00
Itms
fe52bf0457 SpiderMonkey 38 upgrade: 28/35 
The GC API changed to have explicit start and step methods, and the
start/shrink cases now take the gc kind as a parameter. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1099152

This was SVN commit r18682.
 2016-09-02 16:46:39 +00:00
Itms
80c8c2c3d6 SpiderMonkey 38 upgrade: 27/35 
JS_NewRuntime had the useHelperThreads param removed and a
maxNurseryBytes param added. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=941805 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1034621

This was SVN commit r18681.
 2016-09-02 16:45:45 +00:00
Itms
58cace1156 SpiderMonkey 38 upgrade: 26/35 
JS_Define{,UC}Property{,ById} has the attrs parameter moved in front of
the getter and setter params. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=959787
https://bugzilla.mozilla.org/show_bug.cgi?id=1088002 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1211607

This was SVN commit r18680.
 2016-09-02 16:44:33 +00:00
Itms
99534a15f1 SpiderMonkey 38 upgrade: 25/35 
Remove the proto parameter from JS_DefineObject. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1127494

This was SVN commit r18679.
 2016-09-02 16:41:36 +00:00
Itms
ffd4207c30 SpiderMonkey 38 upgrade: 24/35 
Work around upstream API breakage by moving from a define to a const
member and not using the namespace explicitly.

This is caused by https://bugzilla.mozilla.org/show_bug.cgi?id=896116
and this patch by leper was submitted at
https://bugzilla.mozilla.org/show_bug.cgi?id=1236373

This was SVN commit r18678.
 2016-09-02 16:40:01 +00:00