Skip to content

Commit

Permalink
langs and polishing
Browse files Browse the repository at this point in the history
  • Loading branch information
efroemling committed Oct 22, 2023
1 parent 64032d0 commit a2ff9ab
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 40 deletions.
66 changes: 33 additions & 33 deletions .efrocachemap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### 1.7.28 (build 21489, api 8, 2023-10-21)
### 1.7.28 (build 21491, api 8, 2023-10-22)

- Massively cleaned up code related to rendering and window systems (OpenGL,
SDL, etc). This code had been growing into a nasty tangle for 15 years
Expand Down Expand Up @@ -148,6 +148,12 @@
result in fewer ugly pops and warning messages when the app is quit.
- Tidied up some keyboard shortcuts to be more platform-appropriate. For
example, toggling fullscreen on Windows is now Alt+Enter or F11.
- Fancy rebuilt Mac build should now automatically sync its frame rate to the
display its running on (using CVDisplayLinks, not VSync).
- Mac build is now relying solely on Apple's Game Controller Framework, which
seems pretty awesome these days. It should support most stuff SDL does and
with less configuring involved. Please holler if you come across something
that doesn't work.

### 1.7.27 (build 21282, api 8, 2023-08-30)

Expand Down
2 changes: 1 addition & 1 deletion src/assets/ba_data/python/baenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 21489
TARGET_BALLISTICA_BUILD = 21491
TARGET_BALLISTICA_VERSION = '1.7.28'


Expand Down
2 changes: 1 addition & 1 deletion src/ballistica/shared/ballistica.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
namespace ballistica {

// These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 21489;
const int kEngineBuildNumber = 21491;
const char* kEngineVersion = "1.7.28";
const int kEngineApiVersion = 8;

Expand Down
21 changes: 17 additions & 4 deletions tools/efrotools/pcommands.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,8 @@ def xcodebuild() -> None:
XCodeBuild(projroot=str(pcommand.PROJROOT), args=sys.argv[2:]).run()


def xcoderun() -> None:
"""Run an xcode build in the terminal."""
def _xcodepath(executable: bool) -> str:
import os
import subprocess
from efro.error import CleanError
from efrotools.xcodebuild import project_build_path

Expand All @@ -114,12 +112,27 @@ def xcoderun() -> None:
project_path = os.path.abspath(sys.argv[2])
scheme = sys.argv[3]
configuration = sys.argv[4]
path = project_build_path(
return project_build_path(
projroot=str(pcommand.PROJROOT),
project_path=project_path,
scheme=scheme,
configuration=configuration,
executable=executable,
)


def xcodeshow() -> None:
"""Open folder containing xcode build in the finder."""
import subprocess

subprocess.run(['open', _xcodepath(executable=False)], check=True)


def xcoderun() -> None:
"""Run an xcode build in the terminal."""
import subprocess

path = _xcodepath(executable=True)
subprocess.run(path, check=True)


Expand Down
1 change: 1 addition & 0 deletions tools/pcommand
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ from efrotools.pcommands import (
try_repeat,
xcodebuild,
xcoderun,
xcodeshow,
tweak_empty_py_files,
make_ensure,
make_target_debug,
Expand Down

0 comments on commit a2ff9ab

Please sign in to comment.