Page MenuHomeWildfire Games
Feed Advanced Search

Jun 1 2022

wraitii committed rP26914: Don't reset wonder victory timer on ally defeat..
Don't reset wonder victory timer on ally defeat.
Jun 1 2022, 5:47 PM
wraitii closed D4661: Don't reset wonder victory timer on ally defeat..
Jun 1 2022, 5:47 PM
wraitii updated the diff for D4675: [TaskManager] Minor cleanup in Future + TaskManager.

Remove the TaskManager destructor change, merging once green.

Jun 1 2022, 5:42 PM
wraitii added inline comments to D4675: [TaskManager] Minor cleanup in Future + TaskManager.
Jun 1 2022, 5:40 PM
wraitii added a comment to D4673: [NetClient] Clean up g_xmppClient checking.

Looking at the details, the ip and port values inferred in the three conditional blocks are not used in the actual connection attempt. But rather those two values are only used to establish a Stun tunnel.
For that reason, I'm not convinced that QueryConnectionDetails() would be semantically accurate for the name. Instead, something like SetupStun() would more accurately reflect the intent.

You're right, I forgot how this bit worked.

Jun 1 2022, 9:20 AM
wraitii added a comment to D3877: ThreadPool extension -> Timer for recurrent task & adapt netClient..

Hey @wraitii are you planning on cleaning up and landing these changes soon? Asking since I'd like to pull in changes with the AddRecurrentTask API and can either wait for this to land, or put up a diff with an updated version of TimerThread :)

Jun 1 2022, 9:00 AM

May 31 2022

wraitii added a comment to D4672: Make the 'reset wonder timer on diplomacy change' thing a setting..

generally I think not _everything_ needs to be a setting, especially when looking at the complex setup that we have already, but since there is no consensus about what the right way is, I guess that might be ok.

May 31 2022, 11:37 AM
wraitii retitled D4661: Don't reset wonder victory timer on ally defeat. from Don't reset wonder victory timer on ally defeat. Do reseat when changing diplomacy. to Don't reset wonder victory timer on ally defeat..
May 31 2022, 10:26 AM
wraitii added a comment to D4664: Non-local condition_variable.

I need to get some more time to actually think about the implications here, but I think this looks generally workable.

May 31 2022, 10:24 AM
wraitii added a comment to D4673: [NetClient] Clean up g_xmppClient checking.

Hey, thanks for the patch. This does simplify the control-flow, particularly the last block that is kind of awkward.
I think however it would be more natural to have a QueryConnectionDetails function that encapsulates the ip/port finding logic, and call that (which can return immediately if g_xmppClient is not there), then simply setup the connection in the flow. That method should probably be a class method of CNetClient.

May 31 2022, 10:16 AM

May 30 2022

wraitii requested review of D4672: Make the 'reset wonder timer on diplomacy change' thing a setting..
May 30 2022, 7:54 PM
wraitii added a comment to D4662: Fix text alignment handling of spaces around wrapping.

What happens if there multiple spaces in the end? It needs at least tests.

May 30 2022, 7:51 PM
wraitii updated the diff for D4661: Don't reset wonder victory timer on ally defeat..

Only remove the 'player defeated' plot twist.

May 30 2022, 6:52 PM
wraitii retitled D4661: Don't reset wonder victory timer on ally defeat. from Don't reset wonder victory timer on ally defeat. Do reseat when changing diplomacy. to Don't reset wonder victory timer on ally defeat..
May 30 2022, 6:52 PM
wraitii updated the diff for D4662: Fix text alignment handling of spaces around wrapping.

*L" " to L' '

May 30 2022, 6:42 PM
wraitii added inline comments to D4662: Fix text alignment handling of spaces around wrapping.
May 30 2022, 6:41 PM
wraitii added a comment to rP26909: Fix Phab:rP26879 by adding the js files to the list of dependencies. They were….

Thanks for fixing this Stan, didn't have time

May 30 2022, 9:58 AM

May 25 2022

wraitii added a comment to D4668: Algorithms in renderer/WaterManager and iota_view.

I realise this is getting somewhat bikesheddy, but a more complete response:

May 25 2022, 6:55 PM
wraitii added inline comments to D4667: Add JS bindings for in game camera attributes.
May 25 2022, 2:25 PM
wraitii added a comment to D4668: Algorithms in renderer/WaterManager and iota_view.

General high level notes:

May 25 2022, 2:21 PM
wraitii added inline comments to D4667: Add JS bindings for in game camera attributes.
May 25 2022, 1:47 PM
wraitii added inline comments to D4667: Add JS bindings for in game camera attributes.
May 25 2022, 1:43 PM
wraitii added a comment to D4667: Add JS bindings for in game camera attributes.

I need this information in game to set a default rotation during the game. The current "reset camera" feature resets the camera rotation to the default values present in the config but these values are not available in game for the user to set.

Unrelated, but this sounds like you could just read the config values?

May 25 2022, 1:35 PM
wraitii added a comment to D4660: Native camera object.

Should I open another differential with only that changes?

May 25 2022, 9:59 AM

May 24 2022

wraitii added a comment to D2938: GL_ARB instancing to reduce draw calls.

Will there be an update on this, since it was committed for a minimap?

May 24 2022, 5:34 PM

May 23 2022

wraitii added a comment to D4663: delete some unused techs/ auras.

It sounds like this is just reporting those warnings, yeah, so I think you can go ahead

May 23 2022, 3:28 PM

May 22 2022

wraitii requested review of D4662: Fix text alignment handling of spaces around wrapping.
May 22 2022, 1:29 PM
wraitii abandoned D4652: Introduce some tests for CGUIText.

I ran into an actual bug while updating the tests following rP26889, gonna add tests in the fix for that instead.

May 22 2022, 12:45 PM
wraitii added a comment to D4661: Don't reset wonder victory timer on ally defeat..

hm actually, what about a diplomacy with no last man standing?
Imagine you're playing with a large wonder holding time and you decide to add a new ally after building a wonder. Doesn't it seem unfair that you get punished for doing so?

Mh, yes. The scenario I had in mind is the reverse: you are allied to some guy, then you remove that alliance at the last second, and you instawin because the timer isn't reset.

May 22 2022, 11:32 AM
wraitii requested review of D4661: Don't reset wonder victory timer on ally defeat..
May 22 2022, 9:32 AM
wraitii updated the diff for D4652: Introduce some tests for CGUIText.

The tests now show an asymmetry between the left & right align, which I don't think was there before. Need to investigate.

May 22 2022, 8:40 AM
wraitii added a comment to rP21441: Create winning teams for relic and wonder victory instead of letting all allies….

Has a topic or a ticket for this been made? For I could not find it.

May 22 2022, 8:20 AM

May 21 2022

wraitii added a comment to D4660: Native camera object.

There is some related code in D3507.

May 21 2022, 7:04 PM

May 19 2022

wraitii added a comment to D4653: [extreme POC] Compile AssemblyScript to WASM within Spidermonkey & run the webAssembly module.
In D4653#198209, @Stan wrote:

How about the projectile code ?

May 19 2022, 1:52 PM
wraitii added a comment to D4653: [extreme POC] Compile AssemblyScript to WASM within Spidermonkey & run the webAssembly module.
In D4653#198191, @Stan wrote:

That still sounds like something that should be tested. I wonder if the speed loss going through JS interfaces would not be mitigated by having a very fast component.

Yes, that's a bit of a question.

May 19 2022, 11:24 AM
wraitii added a comment to D4656: make ship and siege immune to poison.

(This is exactly why I push for D3886)

May 19 2022, 9:18 AM
wraitii added a comment to D4653: [extreme POC] Compile AssemblyScript to WASM within Spidermonkey & run the webAssembly module.
In D4653#198028, @Stan wrote:

So it's not worthwile at all?

May 19 2022, 9:17 AM

May 18 2022

wraitii added a comment to D4653: [extreme POC] Compile AssemblyScript to WASM within Spidermonkey & run the webAssembly module.

Recap of a talk with Mozilla SM devs today on their Matrix chat:

  • JS-WASM & JS-C++ interop can ultimately be expected to have about the same 'cost'. A dev said that the large cost was that IonCompiled code needed to dump registers in a GC-aware manner, in case the C++/Wasm call triggered a GC.
  • C++ <-> WASM interop is currently not implemented, and would have to go through JS, which I think makes the whole idea too inefficient right now. Though implementing c++ <-> wasm direct interop might be relatively easy to implement.
  • Given that we're gonna need the above in any case for the engine, this sounds like a somewhat complex path to optimisations.
May 18 2022, 12:54 PM
Stan awarded D4653: [extreme POC] Compile AssemblyScript to WASM within Spidermonkey & run the webAssembly module a Burninate token.
May 18 2022, 9:20 AM

May 17 2022

wraitii published D4653: [extreme POC] Compile AssemblyScript to WASM within Spidermonkey & run the webAssembly module for review.
May 17 2022, 10:15 PM
wraitii awarded rP26889: Fix an infinite loop when trying to word-wrap a The World Burns token.
May 17 2022, 2:44 PM
wraitii published D4652: Introduce some tests for CGUIText for review.
May 17 2022, 10:30 AM
wraitii added inline comments to D4650: Adds instancing support to backend and enables it for minimap.
May 17 2022, 9:28 AM
wraitii added inline comments to D4650: Adds instancing support to backend and enables it for minimap.
May 17 2022, 9:21 AM
wraitii added inline comments to D4650: Adds instancing support to backend and enables it for minimap.
May 17 2022, 9:15 AM

May 16 2022

wraitii added inline comments to D4650: Adds instancing support to backend and enables it for minimap.
May 16 2022, 11:07 PM
wraitii added a comment to D4530: Fix an infinite loop when trying to word-wrap.

God this code is a mess.

You're talking like other code is significantly better x)

May 16 2022, 10:55 PM
wraitii accepted D4530: Fix an infinite loop when trying to word-wrap.

God this code is a mess.

May 16 2022, 7:16 PM

May 15 2022

wraitii added inline comments to rP26881: Allo native builds on Mac OS M1 / Apple Silicon.
May 15 2022, 11:29 PM
wraitii committed rP26882: Fix SM compilation on M1, fix cross-compilation..
Fix SM compilation on M1, fix cross-compilation.
May 15 2022, 11:23 PM
wraitii closed D4647: Fix SM compilation on M1.
May 15 2022, 11:23 PM
wraitii updated the diff for D4647: Fix SM compilation on M1.

This one should work

May 15 2022, 10:54 PM
wraitii updated the diff for D4647: Fix SM compilation on M1.

Still learning lua

May 15 2022, 10:53 PM
wraitii updated the diff for D4647: Fix SM compilation on M1.

More debug

May 15 2022, 10:50 PM
wraitii updated the diff for D4647: Fix SM compilation on M1.

Debug

May 15 2022, 10:48 PM
wraitii updated the diff for D4647: Fix SM compilation on M1.

Fix premake

May 15 2022, 10:44 PM
wraitii added inline comments to D4647: Fix SM compilation on M1.
May 15 2022, 10:35 PM
wraitii added inline comments to D4647: Fix SM compilation on M1.
May 15 2022, 10:33 PM
wraitii updated the diff for D4647: Fix SM compilation on M1.

Fix cross-compilation, run with ARCH/HOSTTYPE=x86_64

May 15 2022, 10:32 PM
wraitii added inline comments to D4647: Fix SM compilation on M1.
May 15 2022, 9:25 PM
wraitii updated the diff for D4647: Fix SM compilation on M1.

Proper fix this time

May 15 2022, 9:19 PM
wraitii added inline comments to D4647: Fix SM compilation on M1.
May 15 2022, 9:19 PM
wraitii updated the diff for D4647: Fix SM compilation on M1.

Fix xwwidgets

May 15 2022, 9:17 PM
wraitii added a comment to rP26881: Allo native builds on Mac OS M1 / Apple Silicon.
In rP26881#57875, @Stan wrote:

Question how do I build a X86 build on my M1 now ? I can pass arch to the libs, but not to updateworkspaces.sh, nor premake for the game

May 15 2022, 9:05 PM
wraitii requested review of D4647: Fix SM compilation on M1.
May 15 2022, 7:04 PM
wraitii added inline comments to rP26881: Allo native builds on Mac OS M1 / Apple Silicon.
May 15 2022, 6:59 PM
wraitii added inline comments to rP26881: Allo native builds on Mac OS M1 / Apple Silicon.
May 15 2022, 6:54 PM
wraitii added inline comments to rP26881: Allo native builds on Mac OS M1 / Apple Silicon.
May 15 2022, 6:48 PM
wraitii requested review of D4646: Parse autostart arguments in Javascript.
May 15 2022, 4:42 PM
wraitii abandoned D1554: 3438 - Split Autostart function into smaller pieces.

Will be invalidated by D4646, which seems easier given the rest of code changes, and since this is old/stale I'll abandon directly.

May 15 2022, 4:14 PM
wraitii updated the diff for D3807: Get a promise when starting a GUIpage.

For Demo purposes, add a RunThreaded function to run some threaded javascript. This highlights that a web-worker like API is doable, but doing it efficiently would take a little more thought.

May 15 2022, 12:19 PM
wraitii added inline comments to D3807: Get a promise when starting a GUIpage.
May 15 2022, 11:40 AM
wraitii retitled D3807: Get a promise when starting a GUIpage from [POC] Support JS promises to [WIP] Support JS promises.
May 15 2022, 11:38 AM
wraitii updated the diff for D3807: Get a promise when starting a GUIpage.

Rework, upgrade & make actually functional.

May 15 2022, 11:29 AM
wraitii committed rP26881: Allo native builds on Mac OS M1 / Apple Silicon.
Allo native builds on Mac OS M1 / Apple Silicon
May 15 2022, 8:47 AM
wraitii closed D4607: Fix build on MacOS Darwin arm64 / aarch64 (M1 / Apple Silicon).
May 15 2022, 8:46 AM
wraitii committed rP26880: Fix rP26879.
Fix rP26879
May 15 2022, 8:37 AM
wraitii committed rP26879: Fix non-visual autostart, as well as client/host autostart..
Fix non-visual autostart, as well as client/host autostart.
May 15 2022, 8:35 AM
wraitii closed D4628: Fix non-visual autostart, as well as client/host autostart..
May 15 2022, 8:35 AM

May 14 2022

wraitii added inline comments to D4628: Fix non-visual autostart, as well as client/host autostart..
May 14 2022, 7:53 PM
wraitii added a comment to D4575: Implement ES6 Module Loading.
  • If used in the GUI, we'll need to do some work to expose the init function, unless we have a non-module file to describe page entry points. Something like import { init } from './HotkeysPage.mjs'; globalThis.init = init; works, but it's kind of ugly.
May 14 2022, 1:16 PM
wraitii added a comment to D4575: Implement ES6 Module Loading.

Tested this quickly today:

  • The '.mjs' syntax might be useful to differentiate in the engine. So maybe let's keep that.
  • If used in the GUI, we'll need to do some work to expose the init function, unless we have a non-module file to describe page entry points. Something like import { init } from './HotkeysPage.mjs'; globalThis.init = init; works, but it's kind of ugly.
May 14 2022, 10:11 AM
wraitii updated the diff for D4628: Fix non-visual autostart, as well as client/host autostart..

Fix last comments.

May 14 2022, 9:48 AM
wraitii added inline comments to D4628: Fix non-visual autostart, as well as client/host autostart..
May 14 2022, 9:45 AM
wraitii updated the diff for D4607: Fix build on MacOS Darwin arm64 / aarch64 (M1 / Apple Silicon).

Change #elifdef to #elif defined()

May 14 2022, 9:34 AM

May 13 2022

wraitii added a comment to D4572: [macOS] Spidermonkey fix .

This is included in D4607 & seems to bug for other people as well (see phosit on IRC today). I think it might be a Python 3.10 thing instead of a mac thing.

May 13 2022, 6:48 PM
wraitii updated the diff for D4607: Fix build on MacOS Darwin arm64 / aarch64 (M1 / Apple Silicon).

Reworked using an upstream patch of mine (but largely the same fixes). Tested to work on my mac.

May 13 2022, 6:48 PM

May 11 2022

wraitii updated the diff for D4628: Fix non-visual autostart, as well as client/host autostart..

Raise error, handle errors in the C++ (fail to autostart)

May 11 2022, 6:16 PM
wraitii added inline comments to D4628: Fix non-visual autostart, as well as client/host autostart..
May 11 2022, 5:58 PM
wraitii added a comment to D4575: Implement ES6 Module Loading.

Do you have something specific in mind as to not really interchangeable?? I think they generally are.

May 11 2022, 5:35 PM
wraitii added a comment to D4575: Implement ES6 Module Loading.
In D4575#197559, @smiley wrote:

Either /, ./ or ../ at the start I guess. None of those would mean start at the current directory.

In general I'd rather not have a leading / unless it's necessary for disambiguating. In frontend development, absolute paths usually refer to node_modules and the root source directory is aliased to something (I think @ is most common).
However, we don't have node_modules and likely never will, and C++ vfsPath just start at the VFS root in general. I think it makes sense to have three types of paths:

  • Absolute paths (from VFS root), no specific syntax.
  • Paths that start with ./, which are relative paths.
  • Paths that start with ../ any number of time, which are also relative paths.
May 11 2022, 5:28 PM
wraitii added a comment to rP26867: Fix map errors from GetTemplate not being available in the sim.

For the record -> This is intended as a temporary fix that nevertheless won't result in massive technical debt if it remains like that for the next 15 years, which I think is somewhat likely given that despite several tries, nobody's found a much better way yet.

May 11 2022, 5:18 PM
wraitii added a comment to D4575: Implement ES6 Module Loading.
In D4575#195007, @smiley wrote:

Notice that it won't be possible to resolve out of VFS root.

Definitely the only sane move.

May 11 2022, 3:42 PM
wraitii added a comment to D4575: Implement ES6 Module Loading.

Read-through review:

  • I think we should use .js over .mjs in the interest of tooling support, and I'm not convinced that .mjs will actually take off.
  • There's a bunch of duplication with LoadGlobalScript & such in ScriptInterface.cpp. I think it's time to merge those together in a single ScriptCompile file or something.
    • In particular, there's a question of entry points -> Once we're compiling as modules, we can import submodules, but we can't import modules from non-modules bits.
  • Your tests are missing an absolute path, and I think it's broken in the current implementation. I think it should work, and should start from the VFS root as one would expect. Relative paths are quickly unwieldy when you get into folders-of-folders.
May 11 2022, 3:40 PM

May 10 2022

wraitii updated the diff for D4628: Fix non-visual autostart, as well as client/host autostart..

Always load the network JSI functions.

May 10 2022, 6:48 PM
wraitii added inline comments to D4628: Fix non-visual autostart, as well as client/host autostart..
May 10 2022, 6:43 PM
wraitii added inline comments to D4575: Implement ES6 Module Loading.
May 10 2022, 6:37 PM
wraitii added a comment to D4643: Assign credit for units killed by cmpGarisonHolder.EjectOrKill.

Think this approach is workable, will let freagarach take over :)

May 10 2022, 12:23 PM
wraitii added a comment to D4643: Assign credit for units killed by cmpGarisonHolder.EjectOrKill.

So If I add changeOrigin to Reduce and to RegisterHealthChanged then I could add it to the HealthChanged message.
Does this sound good? If so should I pass attackerOwner along with it?

May 10 2022, 11:37 AM
wraitii added a comment to D4643: Assign credit for units killed by cmpGarisonHolder.EjectOrKill.

Hm, hadn't though of loot. Your right, that's more annoying.

May 10 2022, 11:11 AM