RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-06 23:59:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

More internal android 1.5 event work

Browse Source
This commit is contained in:
Eric Froemling 2020-06-16 02:43:52 -07:00
parent 9764e55f0a
commit 414afe598d
5 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.efrocachemap
View File

@ -4135,16 +4135,16 @@
"assets/build/windows/x64/vc_redist.x64.exe": "https://files.ballistica.net/cache/ba1/ea/19/8b8787d81abcdce158ba608cd24f", "assets/build/windows/x64/vc_redist.x64.exe": "https://files.ballistica.net/cache/ba1/ea/19/8b8787d81abcdce158ba608cd24f",
"assets/build/windows/x64/vcruntime140_1d.dll": "https://files.ballistica.net/cache/ba1/11/d8/ff6344b429b00c24d9a1930d4338", "assets/build/windows/x64/vcruntime140_1d.dll": "https://files.ballistica.net/cache/ba1/11/d8/ff6344b429b00c24d9a1930d4338",
"assets/build/windows/x64/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/20/33/0825e11e6518f87ece3009309933", "assets/build/windows/x64/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/20/33/0825e11e6518f87ece3009309933",
"build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/89/4c/40cf1444b54cde1b8bf8596612ea", "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/59/6a/634ef384e18384fa78b7a2a624f8",
"build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c8/7b/ae898aca9e1000a7ceef18e7d90a", "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d6/1b/165df7c0c0c21761cba641640d4d",
"build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/50/a8/139b0aab8e196efcdcabce873fb8", "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/e3/8b/b1770e7c2ade5a6f538260acae4d",
"build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/59/ab/fb77b5befd76e55b0ef287f09cc9", "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9f/c1/7ad792405a744d9f2fa4cf682d4b",
"build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ac/d9/f45a67d978cacfb1cf67d9f572b7", "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a5/d5/d9ed741473501d1a1541d5c100df",
"build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/9e/dc/496e106c69b04e6e287812fd513c", "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/10/e5/70bde6663088d44e126ec91cfaae",
"build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/1c/bc/b4e726affda0ccef4fbe18301f9d", "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/88/6c/b4eb60746d994cddd19813faee85",
"build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ca/03/42277cc689249139bbf713f100f9", "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/17/31/dff0defb0cc64a80d5068ed97930",
"build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/68/78/189de5c70bcaa4a854b6075ec363", "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/02/b0/83ec7dc92ec4e5b75a9d9a058cda",
"build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/7e/8d/7967bcd04e49a1b59905f1bd2a88", "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/aa/1e/bfcf2f01ae72a897333a4e4137b5",
"build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/26/ff/949c3339724acb558b731eedb62d", "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/cc/ec/50508b196f190b4a4b137d4aaf9c",
"build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/96/cd/d251d1699675f1741570fb7d2d93" "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/94/71/340f38cdbbcad105395733b9e556"
} }

1
.idea/dictionaries/ericf.xml generated
View File

@ -1355,6 +1355,7 @@
<w>outext</w> <w>outext</w>
<w>outfilename</w> <w>outfilename</w>
<w>outfilepath</w> <w>outfilepath</w>
<w>outhashpath</w>
<w>outname</w> <w>outname</w>
<w>outpath</w> <w>outpath</w>
<w>ouya</w> <w>ouya</w>

22
assets/src/ba_data/python/_ba.py
View File

@ -33,9 +33,6 @@ to make sure that it still works with all our tools
NOTE: This file was autogenerated by gendummymodule; do not edit by hand. NOTE: This file was autogenerated by gendummymodule; do not edit by hand.
""" """
# (hash we can use to see if this file is out of date)
# SOURCES_HASH=215440954657254583733032942455994403734
# I'm sorry Pylint. I know this file saddens you. Be strong. # I'm sorry Pylint. I know this file saddens you. Be strong.
# pylint: disable=useless-suppression # pylint: disable=useless-suppression
# pylint: disable=unnecessary-pass # pylint: disable=unnecessary-pass
@ -149,11 +146,11 @@ class Context:
Sets to the UI context. UI functions as well as loading of media to Sets to the UI context. UI functions as well as loading of media to
be used in said functions must happen in the UI context. be used in said functions must happen in the UI context.
a ba.Activity instance: A ba.Activity instance:
Gives the context for the provided ba.Activity. Gives the context for the provided ba.Activity.
Most all code run during a game happens in an Activity's Context. Most all code run during a game happens in an Activity's Context.
a ba.Session instance: A ba.Session instance:
Gives the context for the provided ba.Session. Gives the context for the provided ba.Session.
Generally a user should not need to run anything here. Generally a user should not need to run anything here.
@ -210,13 +207,13 @@ class ContextCall:
shutdown, whereas ba.WeakCall simply looks at whether the target shutdown, whereas ba.WeakCall simply looks at whether the target
object still exists. object still exists.
# example A: code like this can inadvertently prevent our activity # Example A: code like this can inadvertently prevent our activity
# (self) from ending until the operation completes, since the bound # (self) from ending until the operation completes, since the bound
# method we're passing (self.dosomething) contains a strong-reference # method we're passing (self.dosomething) contains a strong-reference
# to self). # to self).
start_some_long_action(callback_when_done=self.dosomething) start_some_long_action(callback_when_done=self.dosomething)
# example B: in this case our activity (self) can still die # Example B: in this case our activity (self) can still die
# properly; the callback will clear itself when the activity starts # properly; the callback will clear itself when the activity starts
# shutting down, becoming a harmless no-op and releasing the reference # shutting down, becoming a harmless no-op and releasing the reference
# to our activity. # to our activity.
@ -566,11 +563,12 @@ class Node:
Node reference (sometimes used as attr values/etc). Node reference (sometimes used as attr values/etc).
""" """
# Adding attrs as needed. # Note attributes:
# FIXME: These should be instance attrs. # NOTE: I'm just adding *all* possible node attrs here
# NOTE: Am just adding all possible node attrs here. # now now since we have a single ba.Node type; in the
# It would be nicer to make a distinct class for each # future I hope to create proper individual classes
# node type at some point so we get better type checks. # corresponding to different node types with correct
# attributes per node-type.
color: Sequence[float] = (0.0, 0.0, 0.0) color: Sequence[float] = (0.0, 0.0, 0.0)
size: Sequence[float] = (0.0, 0.0, 0.0) size: Sequence[float] = (0.0, 0.0, 0.0)
position: Sequence[float] = (0.0, 0.0, 0.0) position: Sequence[float] = (0.0, 0.0, 0.0)

2
assets/src/ba_data/python/bastd/maps.py
View File

@ -735,7 +735,7 @@ class ThePad(ba.Map):
class DoomShroom(ba.Map): class DoomShroom(ba.Map):
"""A giant mushroom. Of doom.""" """A giant mushroom. Of doom!"""
from bastd.mapdata import doom_shroom as defs from bastd.mapdata import doom_shroom as defs

10
docs/ba_module.md
View File

@ -1,5 +1,5 @@
<!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND --> <!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND -->
<h4><em>last updated on 2020-06-15 for Ballistica version 1.5.5 build 20069</em></h4> <h4><em>last updated on 2020-06-16 for Ballistica version 1.5.5 build 20070</em></h4>
<p>This page documents the Python classes and functions in the 'ba' module, <p>This page documents the Python classes and functions in the 'ba' module,
which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p> which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p>
<hr> <hr>
@ -1514,11 +1514,11 @@ is passed, which can be one of the following strings/objects:</p>
Sets to the UI context. UI functions as well as loading of media to Sets to the UI context. UI functions as well as loading of media to
be used in said functions must happen in the UI context.</p> be used in said functions must happen in the UI context.</p>
<p>a <a href="#class_ba_Activity">ba.Activity</a> instance: <p>A <a href="#class_ba_Activity">ba.Activity</a> instance:
Gives the context for the provided <a href="#class_ba_Activity">ba.Activity</a>. Gives the context for the provided <a href="#class_ba_Activity">ba.Activity</a>.
Most all code run during a game happens in an Activity's Context.</p> Most all code run during a game happens in an Activity's Context.</p>
<p>a <a href="#class_ba_Session">ba.Session</a> instance: <p>A <a href="#class_ba_Session">ba.Session</a> instance:
Gives the context for the provided <a href="#class_ba_Session">ba.Session</a>. Gives the context for the provided <a href="#class_ba_Session">ba.Session</a>.
Generally a user should not need to run anything here.</p> Generally a user should not need to run anything here.</p>
@ -1565,13 +1565,13 @@ ContextCall has the added bonus that it will not run during context
shutdown, whereas <a href="#class_ba_WeakCall">ba.WeakCall</a> simply looks at whether the target shutdown, whereas <a href="#class_ba_WeakCall">ba.WeakCall</a> simply looks at whether the target
object still exists.</p> object still exists.</p>
<pre><span><em><small># example A: code like this can inadvertently prevent our activity</small></em></span> <pre><span><em><small># Example A: code like this can inadvertently prevent our activity</small></em></span>
<span><em><small># (self) from ending until the operation completes, since the bound</small></em></span> <span><em><small># (self) from ending until the operation completes, since the bound</small></em></span>
<span><em><small># method we're passing (self.dosomething) contains a strong-reference</small></em></span> <span><em><small># method we're passing (self.dosomething) contains a strong-reference</small></em></span>
<span><em><small># to self).</small></em></span> <span><em><small># to self).</small></em></span>
start_some_long_action(callback_when_done=self.dosomething)</pre> start_some_long_action(callback_when_done=self.dosomething)</pre>
<pre><span><em><small># example B: in this case our activity (self) can still die</small></em></span> <pre><span><em><small># Example B: in this case our activity (self) can still die</small></em></span>
<span><em><small># properly; the callback will clear itself when the activity starts</small></em></span> <span><em><small># properly; the callback will clear itself when the activity starts</small></em></span>
<span><em><small># shutting down, becoming a harmless no-op and releasing the reference</small></em></span> <span><em><small># shutting down, becoming a harmless no-op and releasing the reference</small></em></span>
<span><em><small># to our activity.</small></em></span> <span><em><small># to our activity.</small></em></span>